From 485df84fe5b267a5ee80411df9eb943a049e6451 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/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 --------------------------- 6 files changed, 9 insertions(+), 75 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/xsidplay') 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