diff options
49 files changed, 142 insertions, 131 deletions
diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile index 4a104fc64ee..258d371816b 100644 --- a/audio/kdemultimedia/Makefile +++ b/audio/kdemultimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:13 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:35 agc Exp $ DISTNAME= kdemultimedia-1.1.2 CATEGORIES= audio kde @@ -15,7 +15,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile index f55c15d58f1..1d49a9e363f 100644 --- a/audio/musicbox/Makefile +++ b/audio/musicbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:14 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:36 agc Exp $ DISTNAME= musicbox-1.01p2 CATEGORIES= audio @@ -14,7 +14,7 @@ USE_X11= yes WRKSRC= ${WRKDIR}/musicbox-1.01 -PATH= `${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH +PATH= `${MAKE} show-qt1-prefix`/qt1/bin:$$PATH do-install: ${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 29442ea6842..f6c19c53886 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/10 15:08:14 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:37 agc Exp $ # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp # @@ -19,10 +19,10 @@ CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" USE_GMAKE= yes USE_X11BASE= yes -CONFIGURE_ARGS+= "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" \ +CONFIGURE_ARGS+= "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" -CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" -CONFIGURE_ENV+= "MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc" +CONFIGURE_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1" +CONFIGURE_ENV+= "MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index a74173c12e3..5e011eac0de 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/11 09:17:08 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:37 agc Exp $ # DISTNAME= xsidplay-1_3_9 @@ -20,12 +20,12 @@ USE_GMAKE= yes CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \ --with-sidplay-library=${LOCALBASE}/lib \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1/lib -LDFLAGS+= -Wl,-R`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib +LDFLAGS+= -Wl,-R`${MAKE} show-qt1-prefix`/qt1/lib CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= "MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc" +CONFIGURE_ENV+= "MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc" do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index c6d1003f021..bee33aafcce 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/10 16:03:47 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/11 14:53:37 agc Exp $ # DISTNAME= vipec-2.0.1 @@ -14,9 +14,9 @@ GNU_CONFIGURE= yes USE_PKGLIBTOOL= yes USE_X11= yes -CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{ print $$2 }'`/qt2" \ +CONFIGURE_ENV+= "QTDIR=`${MAKE} show-qt2-prefix`/qt2" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS+= "--with-qt-dir=`${PKG_INFO} -qp qt2 | ${AWK} '{ print $$2 }'`/qt2" +CONFIGURE_ARGS+= "--with-qt-dir=`${MAKE} show-qt2-prefix`/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 072b55b3681..ff74dac20fb 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/10 10:40:39 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:38 agc Exp $ # DISTNAME= jpilot-0.98.1 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES USE_X11= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE} post-install: diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile index 03610e5e55c..152965dc6b8 100644 --- a/converters/kdesupport/Makefile +++ b/converters/kdesupport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2000/07/10 15:08:15 agc Exp $ +# $NetBSD: Makefile,v 1.30 2000/07/11 14:53:38 agc Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp # @@ -19,6 +19,6 @@ CONFIGURE_ARGS= "--without-gnu-ld" \ "--without-libgdbm" \ "--without-libuulib" \ "--without-sprite-field" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index eca198a13c7..1376cb3b29c 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:15 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:38 agc Exp $ # DISTNAME= cervisia-0.5.0 @@ -14,9 +14,9 @@ DEPENDS+= cvs-1.10:../../devel/cvs USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" -CONFIGURE_ARGS+=--with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \ - --with-qt-libraries=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib \ +CONFIGURE_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1" +CONFIGURE_ARGS+=--with-qt-includes=`${MAKE} show-qt1-prefix`/qt1/include \ + --with-qt-libraries=`${MAKE} show-qt1-prefix`/qt1/lib \ --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index bcc339301c2..f05580517dc 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/10 15:08:16 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:39 agc Exp $ DISTNAME= kdbg-1.0.1 CATEGORIES= devel kde @@ -18,8 +18,8 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - --with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \ +CONFIGURE_ARGS= --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ + --with-qt-includes=`${MAKE} show-qt1-prefix`/qt1/include \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 692b53e57a1..d2ad6b16ed2 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/07/10 15:08:16 agc Exp $ +# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:39 agc Exp $ DISTNAME= kdevelop-1.2 CATEGORIES= devel kde @@ -22,9 +22,9 @@ USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" +CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=`${MAKE} show-qt1-prefix`/qt1" .include "../../mk/bsd.pkg.mk" diff --git a/games/amor/Makefile b/games/amor/Makefile index 7af3f4b7a27..a985a96ca26 100644 --- a/games/amor/Makefile +++ b/games/amor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:16 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:39 agc Exp $ # DISTNAME= amor-0.6 @@ -13,7 +13,7 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 -CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 +CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 05584ba1b4c..778d685f908 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/10 13:29:38 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:40 agc Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -11,9 +11,9 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'` +CONFIGURE_ARGS+= --with-gtk-prefix=`${MAKE} show-gtk+-prefix` CONFIGURE_ARGS+= --without-included-gettext -CONFIGURE_ENV+= GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config" +CONFIGURE_ENV+= GTK_CONFIG="`${MAKE} show-gtk+-prefix`/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 80e776a03a5..5c02eb85368 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2000/07/10 15:08:17 agc Exp $ +# $NetBSD: Makefile,v 1.38 2000/07/11 14:53:40 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -18,7 +18,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile index 04d8adadcdb..6bb35579958 100644 --- a/games/kdetoys/Makefile +++ b/games/kdetoys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:17 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:40 agc Exp $ DISTNAME= kdetoys-1.1.2 CATEGORIES= games kde @@ -17,10 +17,10 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ + QTDIR=`${MAKE} show-qt1-prefix`/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 714171a96e7..486c2427865 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/07/10 16:03:48 agc Exp $ +# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:41 agc Exp $ # DISTNAME= nethack-3.3.0 @@ -21,8 +21,8 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= x11tiles nethack INSTALL_TARGET= binfiles -PATH= `${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2/bin:$$PATH -MAKE_ENV+= GTYPE=-qt QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2 +PATH= `${MAKE} show-qt2-prefix`/qt2/bin:$$PATH +MAKE_ENV+= GTYPE=-qt QTDIR=`${MAKE} show-qt2-prefix`/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 0d78d4feb8a..d6e1610d13c 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/10 13:29:39 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:41 agc Exp $ # DISTNAME= xarchon-0.50 @@ -14,8 +14,8 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= esound-*:../../audio/esound GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-xpm-prefix=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'` \ - --with-gtk-prefix=`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'` \ +CONFIGURE_ARGS+=--with-xpm-prefix=`${MAKE} show-xpm-prefix` \ + --with-gtk-prefix=`${MAKE} show-gtk+-prefix` \ --with-esd-prefix=${LOCALBASE} .include "../../mk/bsd.prefs.mk" diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile index 49e5bf664d8..87720e5fe0b 100644 --- a/graphics/gimp-current/Makefile +++ b/graphics/gimp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2000/07/10 10:40:40 agc Exp $ +# $NetBSD: Makefile,v 1.20 2000/07/11 14:53:41 agc Exp $ DISTNAME= gimp-1.1.24 CATEGORIES= graphics @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile index de0ff526786..2059ae32f0f 100644 --- a/graphics/gimp-helpbrowser/Makefile +++ b/graphics/gimp-helpbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:40 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:41 agc Exp $ DISTNAME= gimp-1.1.24 PKGNAME= ${DISTNAME:S/-/-helpbrowser-/} @@ -18,7 +18,7 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 2e64d5b34e9..4809998fd7f 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2000/07/10 10:40:41 agc Exp $ +# $NetBSD: Makefile,v 1.54 2000/07/11 14:53:42 agc Exp $ DISTNAME= gimp-1.0.4 CATEGORIES= graphics @@ -28,7 +28,7 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INFO_FILES= pdb.info diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 7ba067d7de1..112a8b2d6ea 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:41 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/11 14:53:42 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,7 @@ DEPENDS+= povray-*:../../graphics/povray USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config" \ +CONFIGURE_ENV= GTK_CONFIG="`${MAKE} show-gtk+-prefix`/bin/gtk-config" \ CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" ALL_TARGET= install-strip diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index a3439ffff8d..7f876580111 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2000/07/10 15:08:17 agc Exp $ +# $NetBSD: Makefile,v 1.29 2000/07/11 14:53:42 agc Exp $ # DISTNAME= kdegraphics-1.1.2 @@ -16,7 +16,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 1d1cf949753..f4e110edd32 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/11 09:31:33 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:42 agc Exp $ # DISTNAME= libwmf-0.1.17 @@ -22,7 +22,7 @@ USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-png="${LOCALBASE}" CONFIGURE_ARGS+= --with-ttf="${LOCALBASE}" -CONFIGURE_ARGS+= --with-xpm="`${PKG_INFO} -qp xpm | ${AWK} '{ print $$2 }'`" +CONFIGURE_ARGS+= --with-xpm="`${MAKE} show-xpm-prefix`" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index e8dc30aeaa0..397c7941d17 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2000/07/10 15:08:18 agc Exp $ +# $NetBSD: Makefile,v 1.38 2000/07/11 14:53:43 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -16,7 +16,7 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" +CONFIGURE_ARGS= "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3385efe7e74..e7631cc5f72 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.500 2000/07/07 18:14:39 dmcmahill Exp $ \ +# $NetBSD: bsd.pkg.mk,v 1.501 2000/07/11 14:53:43 agc Exp $ \ # # This file is in the public domain. # @@ -1182,6 +1182,17 @@ show-downlevel: .endif .endif +show-gtk+-prefix: _SHOW_PREFIX_USE +show-imlib-prefix: _SHOW_PREFIX_USE +show-kdebase-prefix: _SHOW_PREFIX_USE +show-qt1-prefix: _SHOW_PREFIX_USE +show-qt2-prefix: _SHOW_PREFIX_USE +show-xpm-prefix: _SHOW_PREFIX_USE + +_SHOW_PREFIX_USE: .USE + @${PKG_INFO} -qp ${.TARGET:S/^show-//:S/-prefix//} 2>/dev/null | \ + ${AWK} 'BEGIN { p="${X11PREFIX}" } { p = $$2 } END { printf("%s\n", p) }' + .if !target(show-pkgsrc-dir) show-pkgsrc-dir: .if defined(IGNORE) diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index ec4b57ca7a0..575f24b0146 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2000/07/10 10:40:41 agc Exp $ +# $NetBSD: Makefile,v 1.27 2000/07/11 14:53:43 agc Exp $ # DISTNAME= ethereal-0.8.10 @@ -13,6 +13,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{ print $$2 }'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index accacba8e70..460c956cfe8 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:42 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:44 agc Exp $ # DISTNAME= gtk-gnutella-0.12 @@ -14,6 +14,6 @@ DEPENDS= gtk+-1.2.*:../../x11/gtk USE_GMAKE= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" .include "../../mk/bsd.pkg.mk" diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index a74c8c6db29..d6b329b0399 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2000/07/10 15:08:18 agc Exp $ +# $NetBSD: Makefile,v 1.45 2000/07/11 14:53:44 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -24,7 +24,7 @@ USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CONFIGURE_ENV= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ diff --git a/net/kmap/Makefile b/net/kmap/Makefile index bdfdbb24e98..1749ea4c7cd 100644 --- a/net/kmap/Makefile +++ b/net/kmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/07/10 15:08:18 agc Exp $ +# $NetBSD: Makefile,v 1.4 2000/07/11 14:53:44 agc Exp $ # DISTNAME= kmap-0.5.6 @@ -13,8 +13,8 @@ DEPENDS+= nmap-2.12:../../net/nmap USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 -CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 +CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 post-patch: cd ${WRKSRC}/kmap ; \ diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index bfe96da5864..1271c37ae15 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/07/11 09:58:57 agc Exp $ +# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:44 agc Exp $ DISTNAME= kxicq-03132000 CATEGORIES= net kde @@ -16,11 +16,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{print $$2}'`/qt1 + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 CONFIGURE_ENV+= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R`${PKG_INFO} -qp qt1 | ${AWK} '{print $$2}'`/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" + all_libraries="-Wl,-R`${MAKE} show-qt1-prefix`/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 a7ffed0682f..2f32eaf987c 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/10 10:40:42 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:45 agc Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -15,7 +15,7 @@ DEPENDS+= tiff-*:../../graphics/tiff USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" # 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 d0c30243100..14fec8b451e 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/11 09:31:33 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:45 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_X11= yes CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm \ - --with-xpm-includes="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include" \ - --with-xpm-library="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib" + --with-xpm-includes="`${MAKE} show-xpm-prefix`/include" \ + --with-xpm-library="`${MAKE} show-xpm-prefix`/lib" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index e3c0ec19980..16052331400 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:18 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,8 +16,8 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 -CONFIGURE_ENV+= MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 +CONFIGURE_ENV+= MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc +CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 8cab35135c6..6b2ae5543c4 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/11 10:10:55 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -14,13 +14,13 @@ DEPENDS+= kde-1.1.2:../../x11/kde USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`/share/kde \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ +CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \ + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ + QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ + MOC=`${MAKE} show-qt1-prefix`/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 28d699f59ab..db0908e5c92 100644 --- a/x11/asclock-gtk/Makefile +++ b/x11/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/11 10:19:37 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:45 agc Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -18,7 +18,7 @@ PLIST_SRC= ${PKGDIR}/PLIST \ ${PKGDIR}/PLIST.themes ALL_TARGET= asclock -MAKE_ENV+= CONFIG_PATH="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/" # for gtk-config +MAKE_ENV+= CONFIG_PATH="`${MAKE} show-gtk+-prefix`/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 45911500e2d..43fcb7039b7 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/07/10 16:03:49 agc Exp $ +# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:46 agc Exp $ # DISTNAME= ebuilder-0.56c @@ -13,7 +13,7 @@ DEPENDS+= qt2-*:../../x11/qt DEPENDS+= png-*:../../graphics/png USE_X11= yes -MAKE_ENV= QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2 +MAKE_ENV= QTDIR=`${MAKE} show-qt2-prefix`/qt2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index 728419b612f..deeecb11848 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/07/11 09:31:33 agc Exp $ +# $NetBSD: Makefile,v 1.24 2000/07/11 14:53:46 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-extras CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2 CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11 -CONFIGURE_ARGS+= --with-xpm-includes=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include +CONFIGURE_ARGS+= --with-xpm-includes=`${MAKE} show-xpm-prefix`/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 4ebe8b2daa5..f0d0f7402e1 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/11 10:30:43 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:46 agc Exp $ DISTNAME= gdm-2.0beta4 PKGNAME= gdm-2.0b4 @@ -62,7 +62,7 @@ post-build: cd ${WRKSRC}/config; \ ${RM} -f KDE Xsession; \ ${ECHO} '#! ${SH}' >KDE; \ - ${ECHO} "export KDEDIR=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`" >>KDE; \ + ${ECHO} "export KDEDIR=`${MAKE} show-kdebase-prefix`" >>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 2a070e6c4a5..fbc9fb06a33 100644 --- a/x11/gtkglarea/Makefile +++ b/x11/gtkglarea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/07/10 10:40:42 agc Exp $ +# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:46 agc Exp $ DISTNAME= gtkglarea-1.2.1 CATEGORIES= x11 graphics @@ -15,7 +15,7 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE} CONFIGURE_ARGS+= --with-lib-MesaGL diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 515af565e76..411ec5ba3c3 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2000/07/10 15:08:19 agc Exp $ +# $NetBSD: Makefile,v 1.65 2000/07/11 14:53:46 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -25,7 +25,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 4945474b650..29f61622722 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2000/07/10 15:08:19 agc Exp $ +# $NetBSD: Makefile,v 1.48 2000/07/11 14:53:47 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -22,7 +22,7 @@ USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.prefs.mk" diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index be2dcf52b9a..8912853fc3d 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:20 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:47 agc Exp $ # DISTNAME= khostchooser-0.3 @@ -19,11 +19,11 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ + QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ + MOC=`${MAKE} show-qt1-prefix`/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 9f7b0c8deeb..974d824639c 100644 --- a/x11/korganizer/Makefile +++ b/x11/korganizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:20 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:47 agc Exp $ DISTNAME= korganizer-1.1.2 CATEGORIES= kde @@ -15,10 +15,10 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ + QTDIR=`${MAKE} show-qt1-prefix`/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 7891f2f0f38..afca386c00c 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/11 10:58:34 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/11 14:53:47 agc Exp $ # DISTNAME= kworldwatch-0.6 @@ -15,14 +15,14 @@ CONFLICTS+= kdetoys-* USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`/share/kde \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - --with-qt-libraries='`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib -L${LOCALBASE}/lib' \ +CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \ + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ + --with-qt-libraries='`${MAKE} show-qt1-prefix`/qt1/lib -L${LOCALBASE}/lib' \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'` \ - MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ +CONFIGURE_ENV= KDEDIR=`${MAKE} show-kdebase-prefix` \ + MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \ + QTDIR=`${MAKE} show-qt1-prefix`/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 163d0fdc2af..e3f59feb406 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/07/10 16:03:49 agc Exp $ +# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:47 agc Exp $ # DISTNAME= qtarch-2.0-1 @@ -16,7 +16,7 @@ DEPENDS+= png-*:../../graphics/png USE_X11= yes USE_GMAKE= yes -MAKE_ENV= QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2 +MAKE_ENV= QTDIR=`${MAKE} show-qt2-prefix`/qt2 PATH= ${QTDIR}/bin:$$PATH do-install: diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile index c30ff5b9fa6..c79943c187b 100644 --- a/x11/qwspritefield/Makefile +++ b/x11/qwspritefield/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:21 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:48 agc Exp $ DISTNAME= QwSpriteField1.6 PKGNAME= qwspritefield-1.6 @@ -18,14 +18,14 @@ WRKSRC= ${WRKDIR}/QwSpriteField QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h -PATH= `${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin:$$PATH +PATH= `${MAKE} show-qt1-prefix`/qt1/bin:$$PATH -MAKE_ENV+= "QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" +MAKE_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1" do-install: @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \ ${PREFIX}/lib - @qt1dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`; \ + @qt1dir=`${MAKE} show-qt1-prefix`; \ 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 eddb999c514..d1726239673 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/07/11 09:31:33 agc Exp $ +# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:48 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-frills \ --enable-keepscrolling \ --enable-mousewheel \ - --with-xpm-includes=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include/X11 \ - --with-xpm-library=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib + --with-xpm-includes=`${MAKE} show-xpm-prefix`/include/X11 \ + --with-xpm-library=`${MAKE} show-xpm-prefix`/lib .include "../../mk/bsd.pkg.mk" diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile index 34993044714..d02a4870658 100644 --- a/x11/scwm/Makefile +++ b/x11/scwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/10 10:40:43 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:48 agc Exp $ # DISTNAME= scwm-0.9 @@ -15,7 +15,7 @@ DEPENDS+= readline-4.0:../../devel/readline DEPENDS+= xpm-3.4k:../../graphics/xpm CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \ - --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ + --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \ --enable-multibyte USE_X11BASE= yes diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index c02271a6342..4c9ee39803b 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/11 10:39:05 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/11 14:53:48 agc Exp $ DISTNAME= xfce-3.3.1 CATEGORIES= x11 @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= XFCE_LOCALE_DIR=${PREFIX}/share/locale CONFIGURE_ARGS+=--without-included-gettext \ --datadir=${PREFIX}/share \ - --with-imlib=`${PKG_INFO} -qp imlib | ${AWK} '{print $$2}'` \ - --with-xpm=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'` + --with-imlib=`${MAKE} show-imlib-prefix` \ + --with-xpm=`${MAKE} show-xpm-prefix` USE_GMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index a57e27ef7fa..5815bd7bce3 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/11 10:40:27 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/11 14:53:48 agc Exp $ # DISTNAME= xglobe-0.5 @@ -24,7 +24,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_X11BASE= YES USE_GMAKE= YES -MAKE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +MAKE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 post-install: ${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe |