diff options
49 files changed, 220 insertions, 133 deletions
diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile index 34d955bdc36..03b6bd23edd 100644 --- a/audio/kdemultimedia/Makefile +++ b/audio/kdemultimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:13 agc Exp $ DISTNAME= kdemultimedia-1.1.2 CATEGORIES= audio kde @@ -14,8 +14,10 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index 8d84b64bbd4..109494d807c 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:19 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:14 agc Exp $ DISTNAME= musicbox-1.01p2 CATEGORIES= audio @@ -14,7 +14,8 @@ USE_X11= yes WRKSRC= ${WRKDIR}/musicbox-1.01 -PATH= `${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH +EVAL_PREFIX+= QT1DIR=qt1 +PATH= ${QT1DIR}/qt1/bin:$$PATH do-install: ${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index bc6000cfc10..19058468385 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:19 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/15 20:39:15 agc Exp $ # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp # @@ -19,10 +19,11 @@ CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" USE_GMAKE= yes USE_X11BASE= yes -CONFIGURE_ARGS+= "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ARGS+= "--with-qt-dir=${QT1DIR}/qt1" -CONFIGURE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" -CONFIGURE_ENV+= "MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc" +CONFIGURE_ENV+= "QTDIR=${QT1DIR}/qt1" +CONFIGURE_ENV+= "MOC=${QT1DIR}/qt1/bin/moc" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 2a05bd1183a..702238087d1 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:19 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:15 agc Exp $ # DISTNAME= xsidplay-1_3_9 @@ -18,14 +18,15 @@ USE_X11BASE= yes GNU_CONFIGURE= yes USE_GMAKE= yes +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \ --with-sidplay-library=${LOCALBASE}/lib \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib + --with-qt-dir=${QT1DIR}/qt1/lib -LDFLAGS+= -Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib +LDFLAGS+= -Wl,-R${QT1DIR}/qt1/lib CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= "MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc" +CONFIGURE_ENV+= "MOC=${QT1DIR}/qt1/bin/moc" do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 682ba0651d3..4238c3f4264 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/07/14 16:04:20 agc Exp $ +# $NetBSD: Makefile,v 1.15 2000/07/15 20:39:15 agc Exp $ # DISTNAME= vipec-2.0.1 @@ -14,9 +14,10 @@ GNU_CONFIGURE= yes USE_PKGLIBTOOL= yes USE_X11= yes -CONFIGURE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2" \ +EVAL_PREFIX+= QT2DIR=qt2 +CONFIGURE_ENV+= "QTDIR=${QT2DIR}/qt2" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS+= "--with-qt-dir=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2" +CONFIGURE_ARGS+= "--with-qt-dir=${QT2DIR}/qt2" post-extract: ${MV} -f ${WRKSRC}/bin/start_vipec_help ${WRKSRC}/bin/start_vipec_help.in diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 0bb6a2a4e04..db4fe09145e 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:20 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/15 20:39:15 agc Exp $ # DISTNAME= jpilot-0.98.1 @@ -16,7 +16,8 @@ USE_LIBTOOL= YES USE_X11= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE} post-install: diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile index 27090cb382b..3bfcc4b6e79 100644 --- a/converters/kdesupport/Makefile +++ b/converters/kdesupport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2000/07/14 16:04:20 agc Exp $ +# $NetBSD: Makefile,v 1.32 2000/07/15 20:39:16 agc Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp # @@ -13,12 +13,14 @@ HOMEPAGE= http://www.kde.org/ USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--without-gnu-ld" \ "--without-libjpeg" \ "--without-libgif" \ "--without-libgdbm" \ "--without-libuulib" \ "--without-sprite-field" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index 7e8f236f9bc..2da18074754 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:20 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:16 agc Exp $ # DISTNAME= cervisia-0.5.0 @@ -14,9 +14,11 @@ DEPENDS+= cvs-1.10:../../devel/cvs USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" -CONFIGURE_ARGS+=--with-qt-includes=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/include \ - --with-qt-libraries=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib \ + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= "QTDIR=${QT1DIR}/qt1" +CONFIGURE_ARGS+=--with-qt-includes=${QT1DIR}/qt1/include \ + --with-qt-libraries=${QT1DIR}/qt1/lib \ --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index e9ee74ae46a..44c08fd3b68 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:16 agc Exp $ DISTNAME= kdbg-1.0.1 CATEGORIES= devel kde @@ -18,8 +18,10 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ - --with-qt-includes=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/include \ + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ARGS= --with-qt-dir=${QT1DIR}/qt1 \ + --with-qt-includes=${QT1DIR}/qt1/include \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 18770158ec1..4aa3be5f4ad 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:17 agc Exp $ DISTNAME= kdevelop-1.2 CATEGORIES= devel kde @@ -20,11 +20,13 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + --with-qt-dir=${QT1DIR}/qt1 CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" +CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=${QT1DIR}/qt1" .include "../../mk/bsd.pkg.mk" diff --git a/games/amor/Makefile b/games/amor/Makefile index 3af880869cc..25a8cae420a 100644 --- a/games/amor/Makefile +++ b/games/amor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:17 agc Exp $ # DISTNAME= amor-0.6 @@ -13,7 +13,9 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 -CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1 +CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/games/baduki/Makefile b/games/baduki/Makefile index eece64e67ce..e66e8b53b71 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:17 agc Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -11,9 +11,11 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}` + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix=${GTKDIR} CONFIGURE_ARGS+= --without-included-gettext -CONFIGURE_ENV+= GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config" +CONFIGURE_ENV+= GTK_CONFIG="${GTKDIR}/bin/gtk-config" LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile index 18eb093e268..eae82451483 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.40 2000/07/15 20:39:18 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -17,8 +17,10 @@ DEPENDS+= qwspritefield-1.6:../../x11/qwspritefield USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile index 994cace7e86..4a7d10fa4a5 100644 --- a/games/kdetoys/Makefile +++ b/games/kdetoys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:18 agc Exp $ DISTNAME= kdetoys-1.1.2 CATEGORIES= games kde @@ -16,11 +16,13 @@ CONFLICTS= kworldwatch-* USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + QTDIR=${QT1DIR}/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index c672d483983..91dcb849592 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:22 agc Exp $ +# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:18 agc Exp $ # DISTNAME= nethack-3.3.0 @@ -21,8 +21,10 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= x11tiles nethack INSTALL_TARGET= binfiles -PATH= `${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2/bin:$$PATH -MAKE_ENV+= GTYPE=-qt QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2 + +EVAL_PREFIX+= QT2DIR=qt2 +PATH= ${QT2DIR}/qt2/bin:$$PATH +MAKE_ENV+= GTYPE=-qt QTDIR=${QT2DIR}/qt2 PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-* ALLFILES= ${DISTFILES} # don't checksum shared patches diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index b74fd53630c..3bf1dc6d51c 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:22 agc Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:19 agc Exp $ # DISTNAME= xarchon-0.50 @@ -14,8 +14,9 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= esound-*:../../audio/esound GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-xpm-prefix=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}` \ - --with-gtk-prefix=`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}` \ +EVAL_PREFIX+= GTKDIR=gtk+ XPMDIR=xpm +CONFIGURE_ARGS+=--with-xpm-prefix=${XPMDIR} \ + --with-gtk-prefix=${GTKDIR} \ --with-esd-prefix=${LOCALBASE} .include "../../mk/bsd.prefs.mk" diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile index d7148d7b648..8c761673bb9 100644 --- a/graphics/gimp-current/Makefile +++ b/graphics/gimp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2000/07/14 16:04:22 agc Exp $ +# $NetBSD: Makefile,v 1.22 2000/07/15 20:39:19 agc Exp $ DISTNAME= gimp-1.1.24 CATEGORIES= graphics @@ -23,7 +23,8 @@ USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \ +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile index 06db44bd5ce..9d5aa539035 100644 --- a/graphics/gimp-helpbrowser/Makefile +++ b/graphics/gimp-helpbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:22 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:19 agc Exp $ DISTNAME= gimp-1.1.24 PKGNAME= ${DISTNAME:S/-/-helpbrowser-/} @@ -18,7 +18,9 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \ + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 53c7be519dd..edeb0014078 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2000/07/14 16:04:22 agc Exp $ +# $NetBSD: Makefile,v 1.56 2000/07/15 20:39:20 agc Exp $ DISTNAME= gimp-1.0.4 CATEGORIES= graphics @@ -28,7 +28,9 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INFO_FILES= pdb.info diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 61508433cc0..094a7c1e115 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/14 16:04:23 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/15 20:39:20 agc Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $ DISTNAME= Giram-0.1.2 @@ -17,7 +17,9 @@ DEPENDS+= povray-*:../../graphics/povray USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/gtk-config" \ + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ENV= GTK_CONFIG="${GTKDIR}/bin/gtk-config" \ CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" ALL_TARGET= install-strip diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index b4417ecba24..f1e6d27576a 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2000/07/14 16:04:23 agc Exp $ +# $NetBSD: Makefile,v 1.31 2000/07/15 20:39:20 agc Exp $ # DISTNAME= kdegraphics-1.1.2 @@ -15,8 +15,10 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index d61fb4409c7..5ceda2dd9c2 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:23 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:21 agc Exp $ # DISTNAME= libwmf-0.1.17 @@ -20,9 +20,11 @@ WRKSRC= ${WRKDIR}/libwmf USE_X11= YES GNU_CONFIGURE= YES + +EVAL_PREFIX+= XPMDIR=xpm CONFIGURE_ARGS+= --with-png="${LOCALBASE}" CONFIGURE_ARGS+= --with-ttf="${LOCALBASE}" -CONFIGURE_ARGS+= --with-xpm="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`" +CONFIGURE_ARGS+= --with-xpm="${XPMDIR}" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index 7f4a333f2cd..49bb513a761 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:23 agc Exp $ +# $NetBSD: Makefile,v 1.40 2000/07/15 20:39:21 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -16,7 +16,9 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ARGS= "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b2adc8f3d27..809f0eb7969 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.505 2000/07/14 18:37:05 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.506 2000/07/15 20:39:21 agc Exp $ # # This file is in the public domain. # @@ -1182,8 +1182,13 @@ show-downlevel: .endif .endif -SHOW_PREFIX1= ${PKG_INFO} -qp -SHOW_PREFIX2= 2>/dev/null | ${AWK} 'BEGIN { p="${X11PREFIX}" } { p = $$2 } END { printf("%s\n", p) }' +.if defined(EVAL_PREFIX) +.for def in ${EVAL_PREFIX} +.if !defined(${def:C/=.*//}) +${def:C/=.*//} != (${ECHO} -n "${X11PREFIX} "; ${PKG_INFO} -qp ${def:C/.*=//} 2>/dev/null) | ${AWK} '{ print $$NF }' +.endif +.endfor +.endif .if !target(show-pkgsrc-dir) show-pkgsrc-dir: diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index f7ab3747887..99c5ad142d3 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2000/07/14 16:04:24 agc Exp $ +# $NetBSD: Makefile,v 1.29 2000/07/15 20:39:22 agc Exp $ # DISTNAME= ethereal-0.8.10 @@ -13,6 +13,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index ef85e609a08..a86245dee37 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:24 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:22 agc Exp $ # DISTNAME= gtk-gnutella-0.12 @@ -14,6 +14,8 @@ DEPENDS= gtk+-1.2.*:../../x11/gtk USE_GMAKE= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" .include "../../mk/bsd.pkg.mk" diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index b0fa7b6ccdf..c07a1153f6c 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2000/07/14 16:04:25 agc Exp $ +# $NetBSD: Makefile,v 1.47 2000/07/15 20:39:23 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -23,8 +23,9 @@ USE_GMAKE= yes USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CONFIGURE_ENV= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ diff --git a/net/kmap/Makefile b/net/kmap/Makefile index 1ad129d90f1..4db5216416a 100644 --- a/net/kmap/Makefile +++ b/net/kmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/14 16:04:25 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/15 20:39:23 agc Exp $ # DISTNAME= kmap-0.5.6 @@ -13,8 +13,10 @@ DEPENDS+= nmap-2.12:../../net/nmap USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 -CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1 +CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1 post-patch: cd ${WRKSRC}/kmap ; \ diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index 8cffe376a62..e0aa2872e27 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:25 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:23 agc Exp $ DISTNAME= kxicq-03132000 CATEGORIES= net kde @@ -15,12 +15,14 @@ USE_GMAKE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_LIBTOOL= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS+= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + --with-qt-dir=${QT1DIR}/qt1 CONFIGURE_ENV+= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" + all_libraries="-Wl,-R${QT1DIR}/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" post-extract: @${RM} -fr ${WRKSRC}/kxicq/ltdl diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 585549abbcd..887c70066bd 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:25 agc Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:24 agc Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -15,7 +15,9 @@ DEPENDS+= tiff-*:../../graphics/tiff USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" + +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" # XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE # and xtraceroute doesn't have a switch to tell it so (yet?), we abuse # the --with-GL-prefix switch for this. diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 543846d97d2..e842c8f131d 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:25 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:24 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -20,8 +20,9 @@ DEPENDS+= xpm-*:../../graphics/xpm GNU_CONFIGURE= yes USE_X11= yes CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support +EVAL_PREFIX+= XPMDIR=xpm CONFIGURE_ARGS+= --with-xpm \ - --with-xpm-includes="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include" \ - --with-xpm-library="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib" + --with-xpm-includes="${XPMDIR}/include" \ + --with-xpm-library="${XPMDIR}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index 7ad61c9319b..b12ddb2ddd5 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:24 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,8 +16,10 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 -CONFIGURE_ENV+= MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1 +CONFIGURE_ENV+= MOC=${QT1DIR}/qt1/bin/moc +CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 3e687b7cfb8..5a6d92c78db 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:24 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -14,13 +14,15 @@ DEPENDS+= kde-1.1.2:../../x11/kde USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + +EVAL_PREFIX+= KDEBASEDIR=kdebase QT1DIR=qt1 +CONFIGURE_ARGS+=--datadir=${KDEBASEDIR}/share/kde \ + --with-qt-dir=${QT1DIR}/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ - MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ + QTDIR=${QT1DIR}/qt1 \ + MOC=${QT1DIR}/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile index 91b92055b5e..a65c7280f71 100644 --- a/x11/asclock-gtk/Makefile +++ b/x11/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/15 20:39:25 agc Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -18,7 +18,9 @@ PLIST_SRC= ${PKGDIR}/PLIST \ ${PKGDIR}/PLIST.themes ALL_TARGET= asclock -MAKE_ENV+= CONFIG_PATH="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/" # for gtk-config + +EVAL_PREFIX+= GTKDIR=gtk+ +MAKE_ENV+= CONFIG_PATH="${GTKDIR}/bin/" # for gtk-config pre-configure: cd ${WRKSRC}; ${LN} -sf themes/classic default_theme diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 5bb88016a36..75d8e1ac4f4 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:25 agc Exp $ # DISTNAME= ebuilder-0.56c @@ -13,7 +13,9 @@ DEPENDS+= qt2-*:../../x11/qt DEPENDS+= png-*:../../graphics/png USE_X11= yes -MAKE_ENV= QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2 + +EVAL_PREFIX+= QT2DIR=qt2 +MAKE_ENV= QTDIR=${QT2DIR}/qt2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index edf8462dd71..531d3beb981 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.26 2000/07/15 20:39:25 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -22,10 +22,12 @@ CONFLICTS= fvwm-2.* USE_X11BASE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= XPMDIR=xpm CONFIGURE_ARGS+= --enable-extras CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2 CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11 -CONFIGURE_ARGS+= --with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include +CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR}/include CONFIGURE_ARGS+= --with-readline-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-rplay-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 82b61a5f9fa..859c9abb71a 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:25 agc Exp $ DISTNAME= gdm-2.0beta4 PKGNAME= gdm-2.0b4 @@ -20,6 +20,8 @@ USE_X11BASE= yes CPPFLAGS= -I${LOCALBASE}/include LIBS= -lintl LOCALSTATEDIR= /var/gnome + +EVAL_PREFIX+= KDEBASEDIR=kdebase CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LIBS}" \ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} @@ -62,7 +64,7 @@ post-build: cd ${WRKSRC}/config; \ ${RM} -f KDE Xsession; \ ${ECHO} '#! ${SH}' >KDE; \ - ${ECHO} "export KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`" >>KDE; \ + ${ECHO} "export KDEDIR=${KDEBASEDIR}" >>KDE; \ ${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE; \ ${ECHO} '#! ${SH}' >Xsession; \ ${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession; \ diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile index 5fbaca68a7c..8663271c1a0 100644 --- a/x11/gtkglarea/Makefile +++ b/x11/gtkglarea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:26 agc Exp $ DISTNAME= gtkglarea-1.2.1 CATEGORIES= x11 graphics @@ -15,7 +15,8 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" +EVAL_PREFIX+= GTKDIR=gtk+ +CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE} CONFIGURE_ARGS+= --with-lib-MesaGL diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 89c9122083d..ff206376e33 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.67 2000/07/15 20:39:26 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -24,8 +24,10 @@ DEPENDS+= libungif-*:../../graphics/libungif USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index d6ef2d9ca76..fca979d0d1f 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.50 2000/07/15 20:39:26 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -21,8 +21,10 @@ USE_GMAKE= yes USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.prefs.mk" diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 7ccf865d813..6db51437510 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:26 agc Exp $ # DISTNAME= khostchooser-0.3 @@ -18,12 +18,14 @@ WRKSRC= ${WRKDIR}/khostchooser USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + --with-qt-dir=${QT1DIR}/qt1 CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ - MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ + QTDIR=${QT1DIR}/qt1 \ + MOC=${QT1DIR}/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" diff --git a/x11/korganizer/Makefile b/x11/korganizer/Makefile index a576bd6a655..3c2c5acaf38 100644 --- a/x11/korganizer/Makefile +++ b/x11/korganizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:28 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:27 agc Exp $ DISTNAME= korganizer-1.1.2 CATEGORIES= kde @@ -14,11 +14,13 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" + "--with-qt-dir=${QT1DIR}/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + QTDIR=${QT1DIR}/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile index 72f2c24ec51..024b136b4f6 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/14 16:04:28 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/15 20:39:27 agc Exp $ # DISTNAME= kworldwatch-0.6 @@ -15,14 +15,16 @@ CONFLICTS+= kdetoys-* USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ - --with-qt-libraries='`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib -L${LOCALBASE}/lib' \ + +EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase +CONFIGURE_ARGS+=--datadir=${KDEBASEDIR}/share/kde \ + --with-qt-dir=${QT1DIR}/qt1 \ + --with-qt-libraries='${QT1DIR}/qt1/lib -L${LOCALBASE}/lib' \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}` \ - MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ - QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ +CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ + MOC=${QT1DIR}/qt1/bin/moc \ + QTDIR=${QT1DIR}/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile index 2d49b43438e..c0a12be879c 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:28 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/15 20:39:27 agc Exp $ # DISTNAME= qtarch-2.0-1 @@ -16,7 +16,8 @@ DEPENDS+= png-*:../../graphics/png USE_X11= yes USE_GMAKE= yes -MAKE_ENV= QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2 +EVAL_PREFIX+= QT2DIR=qt2 +MAKE_ENV= QTDIR=${QT2DIR}/qt2 PATH= ${QTDIR}/bin:$$PATH do-install: diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile index 99376efa014..0f8d030899f 100644 --- a/x11/qwspritefield/Makefile +++ b/x11/qwspritefield/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:28 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:27 agc Exp $ DISTNAME= QwSpriteField1.6 PKGNAME= qwspritefield-1.6 @@ -18,14 +18,15 @@ WRKSRC= ${WRKDIR}/QwSpriteField QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h -PATH= `${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH +EVAL_PREFIX+= QT1DIR=qt1 +PATH= ${QT1DIR}/qt1/bin:$$PATH -MAKE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" +MAKE_ENV+= "QTDIR=${QT1DIR}/qt1" do-install: @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \ ${PREFIX}/lib - @qt1dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`; \ + @qt1dir=${QT1DIR}; \ for file in ${QW_INCLUDES}; do \ ${INSTALL_DATA} ${WRKSRC}/${FILE} $$qt1dir/qt1/include; \ done diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 55e37f5acab..c33a138446b 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:28 agc Exp $ +# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:27 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -15,6 +15,8 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm USE_X11BASE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= XPMDIR=xpm CONFIGURE_ARGS+= --enable-utmp \ --enable-wtmp \ --enable-lastlog \ @@ -32,7 +34,7 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-frills \ --enable-keepscrolling \ --enable-mousewheel \ - --with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include/X11 \ - --with-xpm-library=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib + --with-xpm-includes=${XPMDIR}/include/X11 \ + --with-xpm-library=${XPMDIR}/lib .include "../../mk/bsd.pkg.mk" diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile index 37a582dc941..2b47ad4e3a5 100644 --- a/x11/scwm/Makefile +++ b/x11/scwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/07/15 02:36:45 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:28 agc Exp $ # DISTNAME= scwm-0.9 @@ -14,8 +14,9 @@ DEPENDS+= gtar-1.12:../../archivers/gtar DEPENDS+= readline-4.0:../../devel/readline DEPENDS+= xpm-3.4k:../../graphics/xpm +EVAL_PREFIX+= GTKDIR=gtk+ CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \ - --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \ + --with-gtk-prefix="${GTKDIR}" \ --enable-multibyte USE_X11BASE= yes diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 83e9b302bca..dfd6b006eb1 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/14 16:04:30 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/15 20:39:28 agc Exp $ DISTNAME= xfce-3.3.1 CATEGORIES= x11 @@ -16,10 +16,12 @@ USE_X11= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= XFCE_LOCALE_DIR=${PREFIX}/share/locale + +EVAL_PREFIX+= IMLIBDIR=imlib XPMDIR=xpm CONFIGURE_ARGS+=--without-included-gettext \ --datadir=${PREFIX}/share \ - --with-imlib=`${SHOW_PREFIX1} imlib ${SHOW_PREFIX2}` \ - --with-xpm=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}` + --with-imlib=${IMLIBDIR} \ + --with-xpm=${XPMDIR} USE_GMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index 444c6c1e298..77a647f1bec 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/07/14 16:04:30 agc Exp $ +# $NetBSD: Makefile,v 1.15 2000/07/15 20:39:28 agc Exp $ # DISTNAME= xglobe-0.5 @@ -24,7 +24,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_X11BASE= YES USE_GMAKE= YES -MAKE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 +EVAL_PREFIX+= QT1DIR=qt1 +MAKE_ENV+= QTDIR=${QT1DIR}/qt1 post-install: ${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe |