make qt1 install in its own directory instead of renaming its installed
components. This allows users of Qt to specify QTDIR=/path/to/qt instead of having to patch all configure scripts and makefiles to look for alternate names. This is the recommended approach from Troll Tech (Qt authors). update pkgs which use qt1 to reflect this.
This commit is contained in:
dmcmahill
parent
409b187529
commit
07c67df8fd
31 changed files with 698 additions and 799 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2000/03/23 21:34:20 dmcmahill Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:20 dmcmahill Exp $
|
||||
|
||||
DISTNAME= musicbox-1.01p2
|
||||
CATEGORIES= audio
|
||||
|
|
@ -14,6 +14,8 @@ USE_X11= yes
|
|||
|
||||
WRKSRC= ${WRKDIR}/musicbox-1.01
|
||||
|
||||
PATH= ${X11BASE}/qt1/bin:$$PATH
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
|
||||
${MKDIR} ${PREFIX}/share/doc/musicbox
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-sum,v 1.2 2000/03/23 21:34:21 dmcmahill Exp $
|
||||
$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
|
||||
MD5 (patch-aa) = 8cbf3f832ebda9a18652d96307147ecc
|
||||
MD5 (patch-aa) = 32bfeca94d688734b1b9ef9ac9ae4d35
|
||||
MD5 (patch-ab) = 67daa6701175e11d0e772cbe43676f4d
|
||||
MD5 (patch-ac) = c85da557cf69d463f19b213ca774cac1
|
||||
MD5 (patch-ad) = d88bfc82b85f2615b1feb2fbe6701140
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
$NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
|
||||
$NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
|
||||
--- Makefile.orig Wed Nov 12 14:01:58 1997
|
||||
+++ Makefile Wed Mar 22 18:32:06 2000
|
||||
+++ Makefile Sun Mar 26 11:00:40 2000
|
||||
@@ -1,13 +1,17 @@
|
||||
# change following for your environment
|
||||
-INC = /usr/X11R6/include/X11/qt
|
||||
-LIB = /usr/X11R6/lib
|
||||
-MOC = moc
|
||||
+#INC = /usr/X11R6/include/X11/qt
|
||||
+INC = ${X11BASE}/include/qt1
|
||||
+LIB = ${X11BASE}/lib
|
||||
+MOC = moc1
|
||||
+INC = -I${X11BASE}/include -I${X11BASE}/qt1/include
|
||||
+LIB = -L${X11BASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
|
||||
MOC = moc
|
||||
|
||||
# if you use freebsd
|
||||
-CFLAGS = -DFreeBSD
|
||||
|
|
@ -28,83 +27,83 @@ $NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
|
|||
|
||||
all: ${ALL}
|
||||
- ${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
|
||||
+ ${GCC} ${ALL} -o ${PKG} -L${LIB} -Wl,-R${LIB} -lqt1 -lX11 -lXext -lossaudio
|
||||
+ ${GCC} ${ALL} -o ${PKG} ${LIB} -lqt -lX11 -lXext -lossaudio
|
||||
|
||||
-player.o:
|
||||
- ${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
|
||||
+player.o: player.cpp
|
||||
+ ${GCC} -c player.cpp -o player.o ${CFLAGS} -I${INC}
|
||||
+ ${GCC} -c player.cpp -o player.o ${CFLAGS} ${INC}
|
||||
|
||||
mplayer.o: mplayer.cpp
|
||||
- ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -I${INC}
|
||||
+ ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} ${INC}
|
||||
|
||||
mplayer.cpp:
|
||||
@@ -31,13 +35,13 @@
|
||||
|
||||
ListView.o:
|
||||
- ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC}
|
||||
+ ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -I${INC}
|
||||
+ ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} ${INC}
|
||||
|
||||
mListView.o: mListView.cpp
|
||||
- ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -I${INC}
|
||||
+ ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} ${INC}
|
||||
|
||||
mListView.cpp:
|
||||
${MOC} ListView.h -o mListView.cpp
|
||||
clock.o:
|
||||
- ${GCC} -c clock.cpp -o clock.o -L${LIB} -I${INC}
|
||||
+ ${GCC} -c clock.cpp -o clock.o -I${INC}
|
||||
+ ${GCC} -c clock.cpp -o clock.o ${INC}
|
||||
|
||||
mclock.cpp:
|
||||
@@ -45,5 +49,5 @@
|
||||
|
||||
mclock.o: mclock.cpp
|
||||
- ${GCC} -c mclock.cpp -o mclock.o -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mclock.cpp -o mclock.o -I${INC}
|
||||
+ ${GCC} -c mclock.cpp -o mclock.o ${INC}
|
||||
|
||||
mfilebrowse.cpp:
|
||||
@@ -51,14 +55,14 @@
|
||||
|
||||
filebrowse.o :
|
||||
- ${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
|
||||
+ ${GCC} -c filebrowse.cpp -o filebrowse.o -I${INC}
|
||||
+ ${GCC} -c filebrowse.cpp -o filebrowse.o ${INC}
|
||||
|
||||
mfilebrowse.o: mfilebrowse.cpp
|
||||
- ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -I${INC}
|
||||
+ ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o ${INC}
|
||||
|
||||
diskbrowse.o:
|
||||
- ${GCC} -c diskbrowse.cpp -o $@ -L${LIB} -I${INC}
|
||||
+ ${GCC} -c diskbrowse.cpp -o $@ -I${INC}
|
||||
+ ${GCC} -c diskbrowse.cpp -o $@ ${INC}
|
||||
|
||||
mdiskbrowse.o: mdiskbrowse.cpp
|
||||
- ${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mdiskbrowse.cpp -o $@ -I${INC}
|
||||
+ ${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
|
||||
|
||||
mdiskbrowse.cpp:
|
||||
@@ -66,8 +70,8 @@
|
||||
|
||||
qktstreelist.o:
|
||||
- ${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
|
||||
+ ${GCC} -c qktstreelist.cpp -o $@ -I${INC}
|
||||
+ ${GCC} -c qktstreelist.cpp -o $@ ${INC}
|
||||
|
||||
mqktstreelist.o: mqktstreelist.cpp
|
||||
- ${GCC} -c mqktstreelist.cpp -o $@ -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mqktstreelist.cpp -o $@ -I${INC}
|
||||
+ ${GCC} -c mqktstreelist.cpp -o $@ ${INC}
|
||||
|
||||
mqktstreelist.cpp:
|
||||
@@ -75,5 +79,5 @@
|
||||
|
||||
MultiListBox.o:
|
||||
- ${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
|
||||
+ ${GCC} -c MultiListBox.cpp -o $@ -I${INC}
|
||||
+ ${GCC} -c MultiListBox.cpp -o $@ ${INC}
|
||||
|
||||
mMultiListBox.cpp:
|
||||
@@ -81,5 +85,5 @@
|
||||
|
||||
mMultiListBox.o: mMultiListBox.cpp
|
||||
- ${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
|
||||
+ ${GCC} -c mMultiListBox.cpp -o $@ -I${INC}
|
||||
+ ${GCC} -c mMultiListBox.cpp -o $@ ${INC}
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2000/03/23 23:27:24 dmcmahill Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
# FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
|
||||
#
|
||||
|
||||
|
|
@ -19,11 +19,10 @@ CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}"
|
|||
USE_GMAKE= yes
|
||||
USE_X11BASE= yes
|
||||
|
||||
CONFIGURE_ARGS+= --with-qt-includes=${X11BASE}/include/qt1 \
|
||||
--with-qt-libs=${X11BASE}/lib \
|
||||
CONFIGURE_ARGS+= "--with-qt-dir=${X11BASE}/qt1" \
|
||||
|
||||
tst:
|
||||
echo ${INSTALL}
|
||||
CONFIGURE_ENV+= "QTDIR=${X11BASE}/qt1"
|
||||
CONFIGURE_ENV+= "MOC=${X11BASE}/qt1/bin/moc"
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: patch-sum,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
|
||||
$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
|
||||
MD5 (patch-aa) = 01e268f9ad2bf936744ad1acc50175d2
|
||||
MD5 (patch-ab) = 6c6eca722a46d0151c1b2392945e1136
|
||||
MD5 (patch-ac) = e4c19506ef2163d2b1ac239d300b44b6
|
||||
MD5 (patch-ad) = 4b477706bbaf6ecd6218ef94279de0de
|
||||
MD5 (patch-ae) = 327f4dcfc2767bccc95c161c99dd9264
|
||||
MD5 (patch-ae) = 22bc923503d26fe3b2634323907ddb8f
|
||||
MD5 (patch-af) = bf81124d051be2e04ff6be01c1f71e13
|
||||
MD5 (patch-ag) = 825e22e159d0c3ea81833489c8598758
|
||||
MD5 (patch-ah) = debf433414670c9accf1a4500663d293
|
||||
MD5 (patch-ai) = 97bcd152234e208d46f48a1d2f125e61
|
||||
MD5 (patch-ah) = 10ca40d39c0a1f868516a0374a469d8f
|
||||
MD5 (patch-ai) = 88ab8bd5ed85ac6378b2bb9cdc0d0d9e
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
|
||||
$NetBSD: patch-ae,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
|
||||
--- Makefile.in.orig Tue Feb 10 17:37:20 1998
|
||||
+++ Makefile.in Wed Mar 22 18:48:42 2000
|
||||
+++ Makefile.in Sun Mar 26 13:58:33 2000
|
||||
@@ -15,5 +15,6 @@
|
||||
CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK}
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
|
@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
|
|||
backs/backs.o
|
||||
|
||||
-LIBS = @QT_LDFLAGS@ -lm -lqt
|
||||
+LIBS = @QT_LDFLAGS@ -lm -lqt1 -Wl,-rpath,$(X11BASE)/lib -lX11 -lXext
|
||||
+LIBS = @QT_LDFLAGS@ -lm -L${X11BASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib -L${X11BASE}/lib -Wl,-R,$(X11BASE)/lib -lqt -lX11 -lXext
|
||||
|
||||
all: xamp
|
||||
@@ -60,5 +61,5 @@
|
||||
|
|
@ -24,10 +24,3 @@ $NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
|
|||
+ $(CXX) -o xamp $(OBJ) $(LDFLAGS) $(LIBS) -lossaudio
|
||||
|
||||
install:
|
||||
@@ -94,5 +95,5 @@
|
||||
|
||||
qembed.cpp:
|
||||
- $(CXX) qembed.cpp -o qembed -lqt
|
||||
+ $(CXX) qembed.cpp -o qembed -lqt1
|
||||
.SUFFIXES: .cpp
|
||||
.cpp.o:
|
||||
|
|
|
|||
|
|
@ -1,19 +1,7 @@
|
|||
$NetBSD: patch-ah,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
|
||||
$NetBSD: patch-ah,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
|
||||
--- configure.in.orig Sun Oct 5 12:42:34 1997
|
||||
+++ configure.in Wed Mar 22 18:49:34 2000
|
||||
@@ -9,9 +9,9 @@
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
-AC_PATH_PROG(MOC, moc, /usr/bin/moc)
|
||||
+AC_PATH_PROG(MOC, moc1, /usr/bin/moc1)
|
||||
AC_PROG_INSTALL(INSTALL, /usr/bin/install)
|
||||
|
||||
dnl Checks for libraries.
|
||||
-AC_HAVE_LIBRARY(qt,,,-lX11)
|
||||
+AC_HAVE_LIBRARY(qt1,,,-lX11)
|
||||
|
||||
dnl Checks for header files.
|
||||
+++ configure.in Sun Mar 26 13:59:52 2000
|
||||
@@ -58,5 +58,5 @@
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,37 +1,14 @@
|
|||
$NetBSD: patch-ai,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
|
||||
$NetBSD: patch-ai,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
|
||||
|
||||
--- configure.orig Sun Oct 26 11:55:34 1997
|
||||
+++ configure Thu Mar 23 18:12:08 2000
|
||||
@@ -841,6 +841,6 @@
|
||||
fi
|
||||
+++ configure Sun Mar 26 14:37:02 2000
|
||||
@@ -971,5 +971,5 @@
|
||||
|
||||
-# Extract the first word of "moc", so it can be a program name with args.
|
||||
-set dummy moc; ac_word=$2
|
||||
+# Extract the first word of "moc1", so it can be a program name with args.
|
||||
+set dummy moc1; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:841: checking for $ac_word" >&5
|
||||
@@ -862,5 +862,5 @@
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
- test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc"
|
||||
+ test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc1"
|
||||
;;
|
||||
esac
|
||||
@@ -970,5 +970,5 @@
|
||||
#try to guess qt locations
|
||||
qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
|
||||
-test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
|
||||
+test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR/include/qt $QTDIR $qt_incdirs"
|
||||
|
||||
-qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
|
||||
+qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt1 $x_includes $QTINC"
|
||||
test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
|
||||
|
||||
@@ -993,5 +993,5 @@
|
||||
for i in $qt_libdirs;
|
||||
do
|
||||
- for j in libqt.so libqt.a libqt.sl;
|
||||
+ for j in libqt1.so libqt1.a libqt1.sl;
|
||||
do
|
||||
if test -r "$i/$j"; then
|
||||
qt_incdir=NO
|
||||
@@ -1701,5 +1701,5 @@
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.6 2000/03/23 22:07:12 dmcmahill Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2000/03/28 00:09:22 dmcmahill Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xsidplay-1_3_8
|
||||
|
|
@ -20,10 +20,10 @@ USE_GMAKE= yes
|
|||
|
||||
CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
|
||||
--with-sidplay-library=${LOCALBASE}/lib \
|
||||
--with-qt-includes=${LOCALBASE}/include/qt1 \
|
||||
--with-qt-libraries=${LOCALBASE}/lib \
|
||||
--with-qt-includes=${X11BASE}/include/qt1 \
|
||||
--with-qt-libraries=${X11BASE}/lib
|
||||
--with-qt-libraries=${X11BASE}/qt1/lib \
|
||||
--with-qt-dir=${X11BASE}/qt1
|
||||
|
||||
CONFIGURE_ENV+= "MOC=${PREFIX}/qt1/bin/moc"
|
||||
|
||||
do-install:
|
||||
@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:13 dmcmahill Exp $
|
||||
$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:22 dmcmahill Exp $
|
||||
|
||||
MD5 (patch-aa) = c9deffe4688f37d23dc4af76ac2c8106
|
||||
MD5 (patch-ab) = e868c68c0871d933f163787267b97b09
|
||||
MD5 (patch-ac) = 09cd1be09d3eaa61ed196e99d53c732a
|
||||
MD5 (patch-ad) = 41513e7ae935c2d4e4294e716d6b792e
|
||||
MD5 (patch-aa) = 5d720e1440ccbc7c73f919dd3eda5a4b
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-aa,v 1.4 2000/03/23 22:07:13 dmcmahill Exp $
|
||||
$NetBSD: patch-aa,v 1.5 2000/03/28 00:09:22 dmcmahill Exp $
|
||||
|
||||
--- src/Makefile.in.orig Fri Jul 2 12:37:40 1999
|
||||
+++ src/Makefile.in Fri Dec 17 13:31:49 1999
|
||||
|
|
@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2000/03/23 22:07:13 dmcmahill Exp $
|
|||
LIBIOS = @LIBIOS@
|
||||
LIBAUDIO = @LIBAUDIO@
|
||||
-LIBS = @LIBS@ -lqt -lX11 -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
|
||||
+LIBS = @LIBS@ -lqt1 -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
|
||||
+LIBS = @LIBS@ -L${PREFIX}/qt1/lib -Wl,-R${PREFIX}/qt1/lib -lqt -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
|
||||
|
||||
# Part of Qt.
|
||||
MOC = @MOC@
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.3 2000/03/23 22:07:13 dmcmahill Exp $
|
||||
|
||||
--- acinclude.m4.orig Thu Oct 8 20:08:24 1998
|
||||
+++ acinclude.m4 Thu Mar 23 16:38:53 2000
|
||||
@@ -283,5 +283,5 @@
|
||||
qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/lib $x_libraries $QTLIB"
|
||||
test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
|
||||
-AC_FIND_FILE(libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl, $qt_libdirs, qt_libdir)
|
||||
+AC_FIND_FILE(libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl, $qt_libdirs, qt_libdir)
|
||||
ac_qt_libraries=$qt_libdir
|
||||
|
||||
@@ -372,5 +372,5 @@
|
||||
AC_DEFUN(AC_PATH_QT_MOC,
|
||||
[
|
||||
-AC_PATH_PROG(MOC,moc,/usr/bin/moc,
|
||||
+AC_PATH_PROG(MOC,moc1,/usr/bin/moc1,
|
||||
$PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
|
||||
])
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.3 2000/03/23 22:07:14 dmcmahill Exp $
|
||||
|
||||
--- aclocal.m4.orig Thu Oct 8 20:08:24 1998
|
||||
+++ aclocal.m4 Thu Mar 23 16:39:44 2000
|
||||
@@ -295,5 +295,5 @@
|
||||
qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/lib $x_libraries $QTLIB"
|
||||
test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
|
||||
-AC_FIND_FILE(libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl, $qt_libdirs, qt_libdir)
|
||||
+AC_FIND_FILE(libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl, $qt_libdirs, qt_libdir)
|
||||
ac_qt_libraries=$qt_libdir
|
||||
|
||||
@@ -384,5 +384,5 @@
|
||||
AC_DEFUN(AC_PATH_QT_MOC,
|
||||
[
|
||||
-AC_PATH_PROG(MOC,moc,/usr/bin/moc,
|
||||
+AC_PATH_PROG(MOC,moc1,/usr/bin/moc1,
|
||||
$PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
|
||||
])
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.3 2000/03/23 22:07:14 dmcmahill Exp $
|
||||
|
||||
--- configure.orig Sun Jul 4 03:11:29 1999
|
||||
+++ configure Thu Mar 23 16:40:15 2000
|
||||
@@ -1407,5 +1407,5 @@
|
||||
for i in $qt_libdirs;
|
||||
do
|
||||
- for j in libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl;
|
||||
+ for j in libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl;
|
||||
do
|
||||
if test -r "$i/$j"; then
|
||||
@@ -1483,6 +1483,6 @@
|
||||
|
||||
|
||||
-# Extract the first word of "moc", so it can be a program name with args.
|
||||
-set dummy moc; ac_word=$2
|
||||
+# Extract the first word of "moc1", so it can be a program name with args.
|
||||
+set dummy moc1; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1489: checking for $ac_word" >&5
|
||||
@@ -1508,5 +1508,5 @@
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
- test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc"
|
||||
+ test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc1"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2000/03/23 22:07:17 dmcmahill Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
#
|
||||
|
||||
DISTNAME= vipec-1.07
|
||||
|
|
@ -12,6 +12,10 @@ DEPENDS+= qt1-1.44:../../x11/qt1
|
|||
|
||||
USE_X11= yes
|
||||
|
||||
PATH= ${X11BASE}/qt1/bin:$$PATH
|
||||
|
||||
MAKE_ENV+= "QTDIR=${X11BASE}/qt1"
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/vipec ${PREFIX}/bin
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vipec
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:17 dmcmahill Exp $
|
||||
$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
|
||||
MD5 (patch-aa) = a56454f95657188cc5d4eb3132239d76
|
||||
MD5 (patch-aa) = 28831310d38588f82020bdcf415d0a2a
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $
|
||||
$NetBSD: patch-aa,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
|
||||
--- Makefile.orig Tue May 25 02:52:00 1999
|
||||
+++ Makefile Thu Mar 23 17:01:44 2000
|
||||
|
|
@ -6,12 +6,12 @@ $NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $
|
|||
CFLAGS = -Wall -W -O2 -fno-strength-reduce
|
||||
CXXFLAGS= -Wall -W -O2 -fno-strength-reduce
|
||||
-INCPATH = -I$(QTDIR)/include
|
||||
+INCPATH = -I$(X11BASE)/include/qt1 -I$(X11BASE)/include
|
||||
+INCPATH = -I${X11BASE}/include -I$(QTDIR)/include
|
||||
LINK = g++
|
||||
LFLAGS =
|
||||
-LIBS = -L$(QTDIR)/lib -lqt -lX11 -lXext
|
||||
-MOC = moc
|
||||
+LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lqt1 -lX11 -lXext
|
||||
+MOC = moc1
|
||||
+LIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt -lX11 -lXext
|
||||
+MOC = moc
|
||||
|
||||
TAR = tar -cf
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2000/03/28 00:09:19 dmcmahill Exp $
|
||||
#
|
||||
|
||||
DISTNAME= qt-1.44
|
||||
|
|
@ -32,26 +32,33 @@ pre-build:
|
|||
cd ${WRKSRC} && ${PATCH} <${FILESDIR}/enablegif.patch
|
||||
.endif
|
||||
|
||||
QTPREFIX=${PREFIX}/qt1
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/moc1 ${PREFIX}/bin/moc1
|
||||
@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt1.la ${PREFIX}/lib/
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/include/qt1
|
||||
${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/qt1/
|
||||
${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc1.1
|
||||
${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
|
||||
${INSTALL_DATA_DIR} ${QTPREFIX}/lib
|
||||
@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib/
|
||||
${LN} -fs ${QTPREFIX}/lib/libqt.so.1.44 ${PREFIX}/lib/libqt.so.1.44
|
||||
${INSTALL_DATA_DIR} ${QTPREFIX}/include
|
||||
${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include/
|
||||
${INSTALL_MAN_DIR} ${QTPREFIX}/man/man1
|
||||
${INSTALL_MAN_DIR} ${QTPREFIX}/man/man3
|
||||
${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${QTPREFIX}/man/man1/moc.1
|
||||
@cd ${WRKSRC}/man/man3; PAGES="`ls -1 | ${SED} -e 's,\.3qt$$,,'`"; \
|
||||
(for PAGE in $$PAGES; do \
|
||||
${ECHO} installing ${PREFIX}/man/man3/$${PAGE}_1.3; \
|
||||
${ECHO} installing ${QTPREFIX}/man/man3/$${PAGE}.3; \
|
||||
set - X `head -1 $${PAGE}.3qt`; \
|
||||
if [ $$# -eq 3 ] && [ "$$2" = .so ]; then \
|
||||
${RM} -f ${PREFIX}/man/man3/$${PAGE}_1.3 ;\
|
||||
${LN} -s `basename $$3 | ${SED} s/\.3qt$$/_1\.3/` \
|
||||
${PREFIX}/man/man3/$${PAGE}_1.3; \
|
||||
${RM} -f ${QTPREFIX}/man/man3/$${PAGE}.3 ;\
|
||||
${LN} -s `basename $$3 | ${SED} s/\.3qt$$/\.3/` \
|
||||
${QTPREFIX}/man/man3/$${PAGE}.3; \
|
||||
else \
|
||||
${INSTALL_MAN} $${PAGE}.3qt \
|
||||
${PREFIX}/man/man3/$${PAGE}_1.3; \
|
||||
${QTPREFIX}/man/man3/$${PAGE}.3; \
|
||||
fi; \
|
||||
done)
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qt1
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt1/
|
||||
${INSTALL_DATA_DIR} ${QTPREFIX}/share/doc/qt
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.QT ${QTPREFIX}/share/doc/qt/
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
$NetBSD: patch-sum,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
||||
$NetBSD: patch-sum,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
|
||||
|
||||
MD5 (patch-aa) = 840a2a94511d25b7bfbd778a52dbc636
|
||||
MD5 (patch-ab) = 7567236921ea16e35ac23df69e0f066e
|
||||
MD5 (patch-ac) = 22e980dfc4349e7ce8a19201a4e75933
|
||||
MD5 (patch-ad) = 948f6448dea12a2ec2c68fd50d771a94
|
||||
MD5 (patch-aa) = 17727abcf4dc511832d1827d923e4384
|
||||
MD5 (patch-ab) = 9c16fa8fac751338409018f296400416
|
||||
MD5 (patch-ac) = ccc3cfa69b1f10de39e3e6ff76104d6d
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
|
||||
|
||||
--- configs/netbsd-g++-static.orig Fri Feb 26 12:02:07 1999
|
||||
+++ configs/netbsd-g++-static Wed Mar 22 13:46:00 2000
|
||||
+++ configs/netbsd-g++-static Sun Mar 26 09:44:53 2000
|
||||
@@ -1,4 +1,5 @@
|
||||
# Compiling
|
||||
SYSCONF_CXX = g++
|
||||
|
|
@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
-SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
||||
-SYSCONF_LIBS_QT = -lqt
|
||||
+SYSCONF_LFLAGS_QT =
|
||||
+SYSCONF_LIBS_QT = $(QTDIR)/src/libqt1.la
|
||||
+SYSCONF_LIBS_QT = $(QTDIR)/src/libqt.la
|
||||
SYSCONF_LIBS_QT_OPENGL = -lqgl
|
||||
# OpenGL
|
||||
@@ -25,37 +26,23 @@
|
||||
|
|
@ -29,8 +29,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
-SYSCONF_LFLAGS_SHOBJ = -Bshareable
|
||||
-
|
||||
# Meta-object compiler
|
||||
-SYSCONF_MOC = $(QTDIR)/bin/moc
|
||||
-
|
||||
SYSCONF_MOC = $(QTDIR)/bin/moc
|
||||
|
||||
-# Linking shared libraries
|
||||
-# - Build the $(TARGET) library, eg. lib$(TARGET).so.0.0
|
||||
-# - Place target in $(DESTDIR) - which has a trailing /
|
||||
|
|
@ -39,8 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
-SYSCONF_LINK_SHLIB = ld
|
||||
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
|
||||
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
|
||||
+SYSCONF_MOC = $(QTDIR)/bin/moc1
|
||||
|
||||
-
|
||||
-# Linking static libraries
|
||||
+# Linking libtool libraries
|
||||
# - Build the $(TARGET) library, eg. lib$(TARGET).a
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
||||
$NetBSD: patch-ab,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
|
||||
|
||||
--- src/Makefile.in.orig Fri Feb 26 12:02:22 1999
|
||||
+++ src/Makefile.in Wed Mar 22 13:52:22 2000
|
||||
+++ src/Makefile.in Sun Mar 26 09:45:44 2000
|
||||
@@ -15,5 +15,5 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
|
|
@ -9,12 +9,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
+CXX = $(SYSCONF_CXX_LIB)
|
||||
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
|
||||
LFLAGS = $(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
|
||||
@@ -23,6 +23,6 @@
|
||||
####### Target
|
||||
@@ -24,5 +24,5 @@
|
||||
|
||||
-TARGET = qt
|
||||
TARGET = qt
|
||||
-DESTDIR = ../lib/
|
||||
+TARGET = qt1
|
||||
+DESTDIR =
|
||||
VER_MAJ = 1
|
||||
VER_MIN = 44
|
||||
|
|
@ -41,10 +39,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
|
||||
|
||||
####### Build rules
|
||||
@@ -530,5 +518,5 @@
|
||||
$(SYSCONF_LINK_LIB)
|
||||
|
||||
-moc: $(SRCMOC)
|
||||
+moc1: $(SRCMOC)
|
||||
|
||||
tmake:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: patch-ac,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
||||
$NetBSD: patch-ac,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
|
||||
|
||||
--- configs/solaris-g++-static.orig Fri Feb 26 12:02:12 1999
|
||||
+++ configs/solaris-g++-static Wed Mar 22 13:46:36 2000
|
||||
+++ configs/solaris-g++-static Sun Mar 26 09:45:22 2000
|
||||
@@ -1,9 +1,10 @@
|
||||
# Compiling
|
||||
-SYSCONF_CXX = g++
|
||||
|
|
@ -16,16 +16,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
+SYSCONF_CXXFLAGS_OPENGL = -I${X11BASE}/include
|
||||
|
||||
# Compiline YACC output
|
||||
@@ -12,18 +13,18 @@
|
||||
@@ -12,5 +13,5 @@
|
||||
# Linking with support libraries
|
||||
# X11
|
||||
-SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib
|
||||
+SYSCONF_LFLAGS_X11 = -L${X11BASE}/lib
|
||||
SYSCONF_LIBS_X11 = -lX11 -lXext
|
||||
# Qt, Qt+OpenGL
|
||||
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
||||
-SYSCONF_LIBS_QT = -lqt
|
||||
+SYSCONF_LIBS_QT = -lqt1
|
||||
@@ -19,11 +20,11 @@
|
||||
SYSCONF_LIBS_QT_OPENGL = -lqgl
|
||||
# OpenGL
|
||||
-SYSCONF_LFLAGS_OPENGL =
|
||||
|
|
@ -40,13 +38,6 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
|
|||
+SYSCONF_LINK = ${LOCALBASE}/egcs/bin/g++
|
||||
SYSCONF_LFLAGS =
|
||||
SYSCONF_LIBS =
|
||||
@@ -33,5 +34,5 @@
|
||||
|
||||
# Meta-object compiler
|
||||
-SYSCONF_MOC = $(QTDIR)/bin/moc
|
||||
+SYSCONF_MOC = $(QTDIR)/bin/moc1
|
||||
|
||||
# Linking shared libraries
|
||||
@@ -40,5 +41,5 @@
|
||||
# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Qt is a toolkit for building a GUI for X in C++. The main documentation
|
||||
is in ${PREFIX}/share/doc/qt1 and is also available on the web. This
|
||||
is in ${PREFIX}/qt1/share/doc/qt and is also available on the web. This
|
||||
directory also contains a tutorial, and example programs (aclock, biff,
|
||||
connect, cursor, dclock, desktop, drawdemo, forever, hello, life, menu,
|
||||
makepic/ showpic, qmag, showimg, tetris, tictac, timestmp, widgets,
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
$NetBSD: MESSAGE,v 1.1.1.1 2000/03/23 21:27:41 dmcmahill Exp $
|
||||
$NetBSD: MESSAGE,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
|
||||
|
||||
Please note that this package is provided for those programs
|
||||
which will not work with newer versions of Qt. To allow this
|
||||
package to coexist with newer versions of Qt the manual pages
|
||||
all have "_1" appended. For example instead of 'man qwidget'
|
||||
you would use 'man qwidget_1' to get the Qt1 version of the
|
||||
manual page. The header files have been installed in
|
||||
${PREFIX}/include/qt1 and the meta object compiler (moc) has
|
||||
been installed as "moc1".
|
||||
package to coexist with newer versions of Qt, it has been installed
|
||||
in ${PREFIX}/qt1/{bin,include,lib,man}.
|
||||
|
||||
You should be able to select this version of Qt when compiling
|
||||
programs which use it by ensuring that
|
||||
|
||||
1) QTDIR is set to ${PREFIX}/qt1
|
||||
|
||||
2) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt1"
|
||||
|
||||
3) you may also have to put ${PREFIX}/qt1/bin in your PATH
|
||||
|
||||
|
|
|
|||
1116
x11/qt1/pkg/PLIST
1116
x11/qt1/pkg/PLIST
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.apps,v 1.2 2000/03/23 23:15:26 dmcmahill Exp $
|
||||
# $NetBSD: Makefile.apps,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
#
|
||||
# Makefile rules for Qwt examples
|
||||
# ===============================
|
||||
|
|
@ -15,7 +15,7 @@ CFLAGS = -O2
|
|||
INCLUDES = -I$(QWTINC) -I$(QTINC)
|
||||
LD = $(CC)
|
||||
LDFLAGS =
|
||||
LIBS = -L$(QTLIB) -W,l -R$(QTLIB) -lqt1 -lXext -lX11 -lqwt -lm
|
||||
LIBS = -L$(X11BASE) -Wl,-R$(X11BASE) -L$(QTLIB) -Wl,-R$(QTLIB) -lqt -lXext -lX11 -lqwt -lm
|
||||
|
||||
#
|
||||
# IMPLICIT RULES
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# $NetBSD: Makefile.common,v 1.2 2000/03/23 23:15:26 dmcmahill Exp $
|
||||
# $NetBSD: Makefile.common,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
#
|
||||
# Paths for Qt headers and library
|
||||
#
|
||||
|
||||
QTDIR=$(PREFIX)
|
||||
QTINC=$(QTDIR)/include/qt1
|
||||
QTDIR=$(X11BASE)/qt1
|
||||
QTINC=$(QTDIR)/include
|
||||
QTLIB=$(QTDIR)/lib
|
||||
MOC=$(QTDIR)/bin/moc1
|
||||
MOC=$(QTDIR)/bin/moc
|
||||
|
||||
#
|
||||
# Paths for Qwt headers and library
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.lib,v 1.1.1.1 1999/11/17 18:32:29 drochner Exp $
|
||||
# $NetBSD: Makefile.lib,v 1.2 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
#
|
||||
# Makefile rules for the Qwt Library
|
||||
# ==================================
|
||||
|
|
@ -11,7 +11,7 @@ include $(QWTDIR)/Makefile.common
|
|||
#
|
||||
LCXX = $(LIBTOOL) --mode=compile $(CXX)
|
||||
INCLUDES = -I../include -I$(QTINC)
|
||||
LLD = $(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib \
|
||||
LLD = $(LIBTOOL) --mode=link $(CXX) -rpath $(QTLIB) -rpath $(PREFIX)/lib -rpath ${X11BASE}/lib \
|
||||
-version-info 0:2
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.8 2000/03/23 21:31:40 dmcmahill Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2000/03/28 00:09:23 dmcmahill Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xglobe-0.2
|
||||
|
|
@ -25,7 +25,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
|||
|
||||
USE_X11BASE= YES
|
||||
USE_GMAKE= YES
|
||||
MAKE_ENV+= QTDIR=${X11BASE}
|
||||
MAKE_ENV+= QTDIR=${X11BASE}/qt1
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${X11BASE}/lib/X11/xglobe
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
$NetBSD: patch-sum,v 1.3 2000/03/23 21:31:41 dmcmahill Exp $
|
||||
$NetBSD: patch-sum,v 1.4 2000/03/28 00:09:24 dmcmahill Exp $
|
||||
|
||||
MD5 (patch-aa) = c6c01730808a9fc2084ee5bcaa05dd8c
|
||||
MD5 (patch-aa) = df9a88ec39172c32584e77d1fe19a161
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
|
||||
$NetBSD: patch-aa,v 1.6 2000/03/28 00:09:24 dmcmahill Exp $
|
||||
|
||||
--- Makefile.orig Mon Apr 19 05:21:04 1999
|
||||
+++ Makefile Wed Mar 22 16:07:59 2000
|
||||
|
|
@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
|
|||
-X11_INCLUDE_DIR = /usr/X11R6/include
|
||||
-QT_INCLUDE_DIR = /usr/lib/qt/include
|
||||
+X11_INCLUDE_DIR = ${X11BASE}/include
|
||||
+QT_INCLUDE_DIR = $(QTDIR)/include/qt1
|
||||
+QT_INCLUDE_DIR = $(QTDIR)/include
|
||||
|
||||
-QT_LIB_DIR = /usr/lib/qt/lib
|
||||
-X11_LIB_DIR = /usr/X11R6/lib
|
||||
|
|
@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
|
|||
LINK = g++
|
||||
-MOC = moc
|
||||
-INSTALL = install
|
||||
+MOC = moc1
|
||||
+MOC = ${QTDIR}/bin/moc
|
||||
+INSTALL = install -c
|
||||
|
||||
####### compile and link options
|
||||
|
|
@ -37,15 +37,15 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
|
|||
INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)
|
||||
|
||||
-LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
|
||||
+LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
|
||||
+LIB_DIRS = -L$(QT_LIB_DIR) -Wl,-R${QT_LIB_DIR} -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
|
||||
|
||||
-LIBS = -lX11 -lqt -lm
|
||||
+LIBS = -lX11 -lqt1 -lm
|
||||
+LIBS = -lX11 -lqt -lm
|
||||
# If you want to use the QImageIO lib (to support jpg and png maps) use this
|
||||
# line and comment the one above (don't forget to edit config.h as well!)
|
||||
@@ -41,4 +41,5 @@
|
||||
# If the linker complains about unresolved references try this:
|
||||
#LIBS = -lX11 -lqt -lm -lqimgio -lpng -lz
|
||||
+LIBS = -lqt1 -lm -lXext -lX11
|
||||
+LIBS = -lqt -lm -lXext -lX11
|
||||
|
||||
####### Target
|
||||
|
|
|
|||
Loading…
Reference in a new issue