diff options
38 files changed, 82 insertions, 153 deletions
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index fa94492055a..ecacd813eac 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/19 15:55:08 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:49 jlam Exp $ DISTNAME= aumix-2.7 CATEGORIES= audio @@ -14,12 +14,7 @@ COMMENT= Set mix levels BUILD_USES_MSGFMT= yes -#USE_CURSES= yes -#USE_LIBINTL= yes - USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-own-labels CONFIGURE_ARGS+= --enable-nls diff --git a/audio/esound/Makefile b/audio/esound/Makefile index ab061ae97a0..2a327a2c41d 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/06/26 16:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/06/29 04:54:49 jlam Exp $ DISTNAME= esound-0.2.22 CATEGORIES= audio @@ -13,7 +13,6 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES REPLACE_BUILDLINK= esd-config .include "../../audio/libaudiofile/buildlink.mk" diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index fe98f68d7db..499f26dd6b8 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2001/06/19 07:08:06 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2001/06/29 04:54:49 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp DISTNAME= gqmpeg-0.8.3 @@ -14,24 +14,19 @@ BUILD_USES_MSGFMT= yes DEPENDS+= mpg123-0.59r:../../audio/mpg123 -#USE_LIBINTL= YES +USE_BUILDLINK_ONLY= YES USE_X11BASE= YES - GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --enable-japanese CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES - -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" - # in case gnome isn't installed, we need to create the directories pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Multimedia ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index e3f8283792a..1775d7ea58a 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/26 16:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/29 04:54:49 jlam Exp $ DISTNAME= libmikmod-3.1.9 CATEGORIES= audio @@ -14,7 +14,6 @@ GNU_CONFIGURE= # defined USE_LIBTOOL= # defined USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined REPLACE_BUILDLINK= libmikmod-config CONFIGURE_ARGS+= --disable-threads diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index 66cf4bb1fef..dc35414e9cc 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/06/19 16:04:18 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2001/06/29 04:54:50 jlam Exp $ # DISTNAME= mikmod-3.1.6-a @@ -12,10 +12,7 @@ COMMENT= MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files USE_GMAKE= yes GNU_CONFIGURE= yes -#USE_CURSES= yes - USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes .include "../../audio/libmikmod/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" diff --git a/comms/jpilot-expense/Makefile b/comms/jpilot-expense/Makefile index 086444524a6..8d5a46b2fbe 100644 --- a/comms/jpilot-expense/Makefile +++ b/comms/jpilot-expense/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/28 13:21:35 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/06/29 04:54:50 jlam Exp $ DISTNAME= jpilot-0.99 PKGNAME= jpilot-expense-0.99 @@ -13,8 +13,6 @@ COMMENT= Expense synchronization plugin for J-Pilot DEPENDS+= jpilot>=0.99:../../comms/jpilot USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined - USE_X11= # defined USE_LIBTOOL= # defined diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index 26f3a8b6ea8..522cd0b29a9 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/27 18:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/29 04:54:50 jlam Exp $ DISTNAME= jpilot-syncmal_0.60 PKGNAME= jpilot-syncmal-0.60 @@ -14,8 +14,6 @@ COMMENT= MAL synchronization plugin for J-Pilot DEPENDS+= jpilot>=0.99:../../comms/jpilot USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined - GNU_CONFIGURE= # defined USE_X11= # defined USE_GMAKE= # defined diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile index 9182414650b..21b2acf39e2 100644 --- a/comms/jpilot-synctime/Makefile +++ b/comms/jpilot-synctime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/06/27 18:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/29 04:54:50 jlam Exp $ DISTNAME= jpilot-0.99 PKGNAME= jpilot-synctime-0.99 @@ -13,8 +13,6 @@ COMMENT= Time synchronization plugin for J-Pilot DEPENDS+= jpilot>=0.99:../../comms/jpilot USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined - USE_X11= # defined USE_LIBTOOL= # defined diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 7e3a46404d7..ef82279bf4f 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/06/27 18:07:53 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2001/06/29 04:54:50 jlam Exp $ # DISTNAME= jpilot-0.99 @@ -15,12 +15,9 @@ BUILD_USES_MSGFMT= # defined CONFLICTS+= jpilot-libplugin-* USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined - GNU_CONFIGURE= # defined USE_LIBTOOL= # defined USE_X11= # defined -#USE_LIBINTL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_DIR}" diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index bd9690ba2c7..b8243688bde 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/06/26 16:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/06/29 04:54:51 jlam Exp $ # DISTNAME= SDL-1.2.0 @@ -15,12 +15,10 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm BUILDLINK_DEPENDS.pth= pth>=1.4.0 USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES REPLACE_BUILDLINK= sdl-config GNU_CONFIGURE= YES USE_GMAKE= YES -#USE_MESA= YES USE_X11= YES USE_LIBTOOL= YES diff --git a/devel/SDL_ttf/Makefile b/devel/SDL_ttf/Makefile index 32cdf96a6ac..a1dde358d96 100644 --- a/devel/SDL_ttf/Makefile +++ b/devel/SDL_ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/26 21:42:52 zuntum Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/29 04:54:51 jlam Exp $ # DISTNAME= SDL_ttf-2.0.3 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/ COMMENT= use TrueType fonts in your SDL applications USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 11c361ff03e..269489687e2 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/25 21:36:52 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:51 jlam Exp $ DISTNAME= gcvs-1.0a7 CATEGORIES= devel @@ -11,7 +11,6 @@ COMMENT= GTK interface for CVS CONFLICTS= cvs-[0-9]* USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile index 1401fa7a5e6..2ac4a12913f 100644 --- a/devel/maketool/Makefile +++ b/devel/maketool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/06/26 14:01:53 zuntum Exp $ +# $NetBSD: Makefile,v 1.15 2001/06/29 04:54:51 jlam Exp $ # DISTNAME= maketool-0.6.1 @@ -11,14 +11,13 @@ HOMEPAGE= http://www.alphalink.com.au/~gnb/maketool/ COMMENT= Graphical front end to GNU make USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES BUILD_USES_MSGFMT= YES USE_GMAKE= yes -USE_LIBINTL= yes USE_X11= yes GNU_CONFIGURE= yes +.include "../../devel/gettext-lib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile index 3b941fe56cb..0a767e922d2 100644 --- a/devel/pilrc/Makefile +++ b/devel/pilrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/28 06:09:24 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:51 jlam Exp $ # DISTNAME= pilrc-2.8p4 @@ -21,9 +21,7 @@ COMMENT= generate resources for PalmOS applications from textual description #EXTRACT_CMD= unzip -aq ${DOWNLOADED_DISTFILE} USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES - -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES DOCDIR= ${PREFIX}/share/doc/html/pilrc diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile index 5be47617551..0bc87532cb0 100644 --- a/devel/smpeg/Makefile +++ b/devel/smpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/28 21:48:15 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:52 jlam Exp $ # DISTNAME= smpeg-0.4.3 @@ -17,7 +17,6 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes REPLACE_BUILDLINK= smpeg-config CPPFLAGS+= -Dunix=1 diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 6d9dea019ef..dc504a3d2f1 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:30 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2001/06/29 04:54:52 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -24,16 +24,14 @@ COMMENT= Open Source cross-platform word processor BUILD_DEPENDS+= unzip-*:../../archivers/unzip DEPENDS+= ispell-base-*:../../textproc/ispell-base -DEPENDS+= gtk+-1.2.*:../../x11/gtk + +USE_BUILDLINK_ONLY= # defined USE_X11= # defined USE_XPM= # defined USE_GMAKE= # defined ALL_TARGET= compile canonical -.include "../../converters/libiconv/buildlink.mk" -.include "../../graphics/png/buildlink.mk" - OS_CFLAGS= ${CFLAGS} .if exists(/usr/include/inttypes.h) @@ -62,4 +60,7 @@ post-install: ${LN} -sf ../../../lib/american.hash \ ${PREFIX}/share/AbiSuite/dictionary/american.hash +.include "../../converters/libiconv/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index db2cc3e593b..13e284f440d 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/06/20 20:03:04 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/06/29 04:54:52 jlam Exp $ .include "../vim-share/Makefile.common" @@ -13,7 +13,6 @@ DISTFILES+= ${DISTNAME}-rt${EXTRACT_SUFX} USE_X11= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes CONFIGURE_ARGS+= --enable-gui=gtk CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 78ce3063f3f..430d3a30286 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/06/28 22:22:32 zuntum Exp $ +# $NetBSD: Makefile,v 1.20 2001/06/29 04:54:52 jlam Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -9,7 +9,6 @@ HOMEPAGE= http://soback.kornet21.net/~artist/baduk/baduki.html COMMENT= Go playing program based on xamigo USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES USE_X11= YES GNU_CONFIGURE= YES BUILD_USES_MSGFMT= YES diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 75ee3f77d40..46bf25bcf7a 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/20 08:07:38 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:53 jlam Exp $ DISTNAME= dopewars-1.5.0 CATEGORIES= games @@ -12,9 +12,6 @@ HOMEPAGE= http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ COMMENT= Make a fortune dealing drugs on the streets of New York USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES - -#USE_LIBINTL= YES USE_GMAKE= YES GNU_CONFIGURE= YES diff --git a/games/fire/Makefile b/games/fire/Makefile index 2069de944b7..b47023d2589 100644 --- a/games/fire/Makefile +++ b/games/fire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/26 10:08:31 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $ # DISTNAME= fire-1.0 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.libsdl.org/projects/fire/index.html COMMENT= organic fireworks demo USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES GNU_CONFIGURE= YES USE_X11= YES diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index 844066317b8..c8f9ee94ebd 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/21 05:06:16 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/29 04:54:53 jlam Exp $ .include "../../games/freeciv-share/Makefile.common" @@ -10,7 +10,6 @@ DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share USE_X11= # defined USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --disable-make-data diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index 806db02c7b5..39e9a370126 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/26 10:15:26 zuntum Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/29 04:54:53 jlam Exp $ # DISTNAME= lbreakout-001018 @@ -10,10 +10,9 @@ HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= breakout-style arcade game USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES USE_X11= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--disable-sound +CONFIGURE_ARGS+= --disable-sound .include "../../devel/SDL/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/newvox/Makefile b/games/newvox/Makefile index db9100e389c..a96d949f7ee 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/26 10:15:25 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $ # DISTNAME= newvox-1.0 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.libsdl.org/projects/newvox/index.html COMMENT= voxel-style landscape rendering fly-by USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES GNU_CONFIGURE= YES USE_X11= YES diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index 4f74ee05ce4..cfe08f7e048 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/26 21:22:20 zuntum Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:54 jlam Exp $ # DISTNAME= avifile-0.6.20010618 @@ -27,7 +27,6 @@ WRKSRC= ${WRKDIR}/avifile-0.6 ONLY_FOR_PLATFORM= NetBSD-*-i386 USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES USE_X11= YES USE_GMAKE= YES USE_LIBTOOL= YES diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile index 3bb80459edd..b17f422835f 100644 --- a/graphics/avifile/Makefile +++ b/graphics/avifile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/26 08:53:32 zuntum Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:54 jlam Exp $ DISTNAME= avifile-0.53.5 CATEGORIES= graphics @@ -15,7 +15,6 @@ DEPENDS= win32-codecs>=010122:../../graphics/win32-codecs ONLY_FOR_PLATFORM= NetBSD-*-i386 USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES USE_GMAKE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/dumpmpeg/Makefile b/graphics/dumpmpeg/Makefile index a909ede72a4..3f72147ed03 100644 --- a/graphics/dumpmpeg/Makefile +++ b/graphics/dumpmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/28 22:05:27 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:54 jlam Exp $ # DISTNAME= dumpmpeg-0.6 @@ -10,7 +10,6 @@ HOMEPAGE= http://sourceforge.net/projects/dumpmpeg COMMENT= Splits mpeg stream into single images USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES GNU_CONFIGURE= YES .include "../../devel/smpeg/buildlink.mk" diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 2259105aeb8..d38a085de66 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/26 22:02:26 zuntum Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:54 jlam Exp $ # DISTNAME= freetype-2.0.3 @@ -16,7 +16,6 @@ HOMEPAGE= http://www.freetype.org/ COMMENT= font rendering engine and library API USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES REPLACE_BUILDLINK= freetype-config CHECK_FREETYPE2= YES USE_GMAKE= YES diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index d4ff6f647fc..9649ec891bc 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2001/06/18 21:40:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2001/06/29 04:54:54 jlam Exp $ # DISTNAME= gdk-pixbuf-0.10.1 @@ -17,14 +17,8 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined -USE_CONFIG_WRAPPER= # defined USE_BUILDLINK_ONLY= # defined -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" - M4= ${LOCALBASE}/bin/gm4 PLIST_SUBST+= LOCALBASE=${LOCALBASE} @@ -35,3 +29,8 @@ pre-configure: cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoconf && \ ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/automake + +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 53ac6fc75a1..be8b2771467 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/06/23 19:26:56 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/06/29 04:54:55 jlam Exp $ # DISTNAME= gqview-0.10.1 @@ -11,9 +11,7 @@ COMMENT= another gtk-based graphic file viewer BUILD_USES_MSGFMT= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes -#USE_LIBINTL= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 7e0da066eeb..6c7c0a2ad89 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2001/06/19 04:32:29 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2001/06/29 04:54:55 jlam Exp $ # DISTNAME= imlib-1.9.8.1 @@ -20,17 +20,6 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} USE_GMAKE= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes - -.include "../../mk/bsd.prefs.mk" - -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/libungif/buildlink.mk" -.include "../../graphics/netpbm/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" CPPFLAGS+= -DENABLE_NLS CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" @@ -52,4 +41,11 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \ ${LOCALBASE}/share/aclocal/imlib.m4 +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/libungif/buildlink.mk" +.include "../../graphics/netpbm/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 81995309dc9..75f24cd0efc 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2001/06/26 16:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2001/06/29 04:54:55 jlam Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -22,7 +22,6 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/popt/ltconfig LTCONFIG_OVERRIDE+= ${WRKSRC}/libIDL/ltconfig GNU_CONFIGURE= YES -USE_CONFIG_WRAPPER= YES USE_BUILDLINK_ONLY= YES REPLACE_BUILDLINK= libIDL/libIDLConf.sh @@ -33,12 +32,10 @@ PLIST_SUBST+= ORBIT_MAJOR=${ORBIT_MAJOR} ORBIT_MINOR=${ORBIT_MINOR} INFO_FILES= libIDL.info -.include "../../mk/bsd.prefs.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" - pre-configure: cd ${WRKSRC}/popt && ${LOCALBASE}/bin/autoreconf --include-deps --force +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/glib/buildlink.mk" +.include "../../security/tcp_wrappers/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 6a10255df69..fcc06788a8d 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/06/20 04:56:28 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/06/29 04:54:55 jlam Exp $ # $FreeBSD: ports/net/mtr/Makefile,v 1.16 1999/10/28 08:06:00 mharo Exp $ DISTNAME= mtr-0.42 @@ -12,9 +12,7 @@ COMMENT= Traceroute and ping in a single graphical network diagnostic tool GNU_CONFIGURE= yes USE_GMAKE= yes - USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes do-install: ${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 0f4ce6609e9..777e37bf63a 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/06/28 17:01:03 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/29 04:54:55 jlam Exp $ # DISTNAME= gpa-0.4.1 @@ -12,7 +12,6 @@ COMMENT= GUI frontend to gnupg DEPENDS+= gnupg>=1.0.0:../../security/gnupg GNU_CONFIGURE= YES -USE_CONFIG_WRAPPER= YES USE_BUILDLINK_ONLY= YES .include "../../x11/gtk/buildlink.mk" diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile index 5e1a63e54ff..ef05632f204 100644 --- a/wm/amaterus/Makefile +++ b/wm/amaterus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/06/28 16:15:17 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/29 04:54:56 jlam Exp $ DISTNAME= amaterus-0.34.1 CATEGORIES= wm @@ -10,7 +10,6 @@ COMMENT= GTK+ window manager GNU_CONFIGURE= YES USE_BUILDLINK_ONLY= YES -USE_CONFIG_WRAPPER= YES USE_X11= YES post-install: diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index b5a1a339e0a..c0e6aeb5e37 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/19 04:52:16 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/06/29 04:54:56 jlam Exp $ DISTNAME= cadaver-0.17.0 CATEGORIES= www @@ -8,11 +8,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.webdav.org/cadaver/ COMMENT= command-line WebDAV client -#USE_SSL= # defined -#USE_LIBINTL= # defined USE_GMAKE= # defined USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined ALL_TARGET= cadaver GNU_CONFIGURE= # defined @@ -21,12 +18,6 @@ CONFIGURE_ARGS+= --with-include-neon CONFIGURE_ARGS+= --enable-libxml CONFIGURE_ARGS+= --enable-netrc -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/libgetopt/buildlink.mk" -.include "../../devel/readline/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" - # We don't need curses, just termcap. CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no LIBS+= -ltermcap @@ -44,4 +35,9 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/doc/cadaver.1 ${PREFIX}/man/man1 +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/libgetopt/buildlink.mk" +.include "../../devel/readline/buildlink.mk" +.include "../../security/openssl/buildlink.mk" +.include "../../textproc/libxml/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 80b93c7fad7..98f0ef5ad15 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/19 04:55:49 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:56 jlam Exp $ DISTNAME= sitecopy-0.10.15 CATEGORIES= www @@ -8,22 +8,14 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.lyra.org/sitecopy/ COMMENT= utility for synchronizing remote and local web sites -#USE_SSL= # defined -#USE_LIBINTL= # defined USE_GMAKE= # defined USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-included-neon CONFIGURE_ARGS+= --enable-libxml -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/libgetopt/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" - # The build process doesn't correctly find the header for GNU fnmatch, which # is provided in ${WRKSRC}/lib. Help the compiler by linking the header # to ${WRKSRC} and explicitly passing -I. to the compiler. @@ -34,4 +26,8 @@ pre-build: ${RM} -f ${WRKSRC}/fnmatch.h ${LN} -sf ${WRKSRC}/lib/fnmatch.h ${WRKSRC}/fnmatch.h +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/libgetopt/buildlink.mk" +.include "../../security/openssl/buildlink.mk" +.include "../../textproc/libxml/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 0c809cb408c..62f83f58cd9 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2001/06/26 16:30:58 jlam Exp $ +# $NetBSD: Makefile,v 1.67 2001/06/29 04:54:56 jlam Exp $ DISTNAME= gnome-libs-1.2.13 CATEGORIES= x11 gnome @@ -23,18 +23,10 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} \ PKGLOCALEDIR=${PKGLOCALEDIR} -USE_CONFIG_WRAPPER= YES USE_BUILDLINK_ONLY= YES REPLACE_BUILDLINK= gnomeConf.sh REPLACE_BUILDLINK+= gnome-config -.include "../../audio/esound/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../net/ORBit/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" - LOCALSTATEDIR= /var/gnome PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ LOCALEDIR=${LOCALEDIR} \ @@ -73,4 +65,10 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ ${LOCALBASE}/share/aclocal/libart.m4 +.include "../../audio/esound/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/imlib/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../net/ORBit/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 641f32ab530..0c26238acf0 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2001/06/26 16:30:58 jlam Exp $ +# $NetBSD: Makefile,v 1.64 2001/06/29 04:54:56 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -15,10 +15,8 @@ BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 BUILD_USES_MSGFMT= yes USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes REPLACE_BUILDLINK= gtk-config -#USE_LIBINTL= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11BASE= yes @@ -30,9 +28,6 @@ CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}" INFO_FILES= gdk.info gtk.info -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" - MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" PLIST_SUBST+= LOCALBASE=${LOCALBASE} @@ -69,4 +64,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \ ${LOCALBASE}/share/aclocal/gtk.m4 +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/glib/buildlink.mk" .include "../../mk/bsd.pkg.mk" |