From 07c67df8fdbb88d9d46d88ffe78dba3ef8941b5c Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Tue, 28 Mar 2000 00:09:19 +0000 Subject: 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. --- audio/musicbox/Makefile | 4 +++- audio/musicbox/files/patch-sum | 4 ++-- audio/musicbox/patches/patch-aa | 41 ++++++++++++++++++++--------------------- audio/xamp/Makefile | 9 ++++----- audio/xamp/files/patch-sum | 8 ++++---- audio/xamp/patches/patch-ae | 13 +++---------- audio/xamp/patches/patch-ah | 16 ++-------------- audio/xamp/patches/patch-ai | 37 +++++++------------------------------ audio/xsidplay/Makefile | 10 +++++----- audio/xsidplay/files/patch-sum | 7 ++----- audio/xsidplay/patches/patch-aa | 4 ++-- audio/xsidplay/patches/patch-ab | 18 ------------------ audio/xsidplay/patches/patch-ac | 18 ------------------ audio/xsidplay/patches/patch-ad | 27 --------------------------- 14 files changed, 54 insertions(+), 162 deletions(-) delete mode 100644 audio/xsidplay/patches/patch-ab delete mode 100644 audio/xsidplay/patches/patch-ac delete mode 100644 audio/xsidplay/patches/patch-ad (limited to 'audio') diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index 701ee051b8e..02755b2b04f 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -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 diff --git a/audio/musicbox/files/patch-sum b/audio/musicbox/files/patch-sum index 452f2705db1..ce737ff0322 100644 --- a/audio/musicbox/files/patch-sum +++ b/audio/musicbox/files/patch-sum @@ -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 diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa index 4005dd4b96d..d40d7228c38 100644 --- a/audio/musicbox/patches/patch-aa +++ b/audio/musicbox/patches/patch-aa @@ -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: diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 2359936bc36..65e970e5311 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -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 diff --git a/audio/xamp/files/patch-sum b/audio/xamp/files/patch-sum index c5386324413..9ace978bca2 100644 --- a/audio/xamp/files/patch-sum +++ b/audio/xamp/files/patch-sum @@ -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 diff --git a/audio/xamp/patches/patch-ae b/audio/xamp/patches/patch-ae index cbbba7be117..f432081c137 100644 --- a/audio/xamp/patches/patch-ae +++ b/audio/xamp/patches/patch-ae @@ -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: diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah index 8851da295c0..ca05d7af6bf 100644 --- a/audio/xamp/patches/patch-ah +++ b/audio/xamp/patches/patch-ah @@ -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 @@ ;; diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai index 6852c147eea..a88fb93da81 100644 --- a/audio/xamp/patches/patch-ai +++ b/audio/xamp/patches/patch-ai @@ -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 @@ ;; diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 3fbd7a97030..25896614765 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -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 diff --git a/audio/xsidplay/files/patch-sum b/audio/xsidplay/files/patch-sum index 29cd91ce2af..95d68dda306 100644 --- a/audio/xsidplay/files/patch-sum +++ b/audio/xsidplay/files/patch-sum @@ -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 diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa index 0b04757d2db..83c7e50c1ee 100644 --- a/audio/xsidplay/patches/patch-aa +++ b/audio/xsidplay/patches/patch-aa @@ -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@ diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab deleted file mode 100644 index f01cf2373b2..00000000000 --- a/audio/xsidplay/patches/patch-ab +++ /dev/null @@ -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) - ]) diff --git a/audio/xsidplay/patches/patch-ac b/audio/xsidplay/patches/patch-ac deleted file mode 100644 index 6c345598ae2..00000000000 --- a/audio/xsidplay/patches/patch-ac +++ /dev/null @@ -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) - ]) diff --git a/audio/xsidplay/patches/patch-ad b/audio/xsidplay/patches/patch-ad deleted file mode 100644 index af0a8bf61bd..00000000000 --- a/audio/xsidplay/patches/patch-ad +++ /dev/null @@ -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 -- cgit v1.2.3