From 86e943ecb8455d6b1c6365d2a6b25cd30d4a1fe1 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 10 Oct 2002 12:50:32 +0000 Subject: buildlink1 -> buildlink2. --- audio/wmsmixer/Makefile | 5 +++-- editors/nvi/Makefile | 8 ++++---- games/xpat2/Makefile | 8 ++++---- games/xsoldier/Makefile | 5 +++-- graphics/xbmbrowser/Makefile | 7 ++++--- time/asclock-xlib/Makefile | 5 +++-- wm/tvtwm/Makefile | 5 +++-- x11/Xaw-Xpm/Makefile | 5 +++-- 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile index a742b172b7b..963903e0d8a 100644 --- a/audio/wmsmixer/Makefile +++ b/audio/wmsmixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/21 15:33:55 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/10 12:50:32 wiz Exp $ # DISTNAME= wmsmixer-0.5 @@ -9,6 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.hibernaculum.net/wmsmixer.html COMMENT= Another mixer designed for WindowMaker (dockapp) +USE_BUILDLINK2= YES USE_IMAKE= YES NO_INSTALL_MANPAGES= YES @@ -21,5 +22,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/home.wmsmixer ${PREFIX}/share/examples/wmsmixer ${INSTALL_DATA} ${WRKSRC}/README.wmmixer ${PREFIX}/share/doc/wmsmixer/README.wmsmixer -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index 275030941cc..6396da6a5d8 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/05/24 00:16:09 seb Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/10 12:52:47 wiz Exp $ # DISTNAME= nvi-1.81.5 @@ -12,14 +12,14 @@ COMMENT= Berkeley nvi with additional features GNU_CONFIGURE= YES CONFIGURE_SCRIPT= ../dist/configure -CONFIGURE_ARGS+= --with-db3=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-db3=${BUILDLINK_PREFIX.db3} CONFIGURE_ARGS+= --program-transform-name='s,^,n,' USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix -.include "../../databases/db3/buildlink.mk" +.include "../../databases/db3/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index 56f1038e477..bf4aea685e1 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/12/02 06:56:40 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/10 12:56:00 wiz Exp $ # FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp DISTNAME= xpat2-1.06 @@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/solitaires/} MAINTAINER= kuebart@mathematik.uni-ulm.de COMMENT= X11 solitaire game with 14 variations +USE_BUILDLINK2= YES USE_X11BASE= YES # This package uses imake, but invokes it directly as part of the build @@ -15,8 +16,7 @@ USE_X11BASE= YES # #USE_IMAKE= YES -EVAL_PREFIX= XPMDIR=xpm -MAKE_ENV+= XPMDIR="${XPMDIR}" XMKMF="${XMKMF}" +MAKE_ENV+= XPMDIR="${BUILDLINK_PREFIX.xpm}" XMKMF="${XMKMF}" SUPPORT_FILES_PERMS= /dev/null /var/games/xpat.log games games 0644 MAKE_DIRS= /var/games @@ -25,6 +25,6 @@ post-install: ${CHOWN} root.games ${PREFIX}/bin/xpat2 ${CHMOD} 2555 ${PREFIX}/bin/xpat2 -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile index 8f75c82b060..81a146220a8 100644 --- a/games/xsoldier/Makefile +++ b/games/xsoldier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/12/02 06:56:40 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/10 12:52:08 wiz Exp $ # DISTNAME= xsoldier-0.96 @@ -9,6 +9,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.surfline.ne.jp/hachi/xsoldier.html COMMENT= Updated xgalaga type game with awesome graphics +USE_BUILDLINK2= YES USE_IMAKE= YES NO_INSTALL_MANPAGES= YES @@ -21,6 +22,6 @@ SUPPORT_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \ post-patch: ${TOUCH} ${WRKSRC}/xsoldier.man -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index 3125bd0a026..5de0da76370 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/12/11 15:43:15 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/10/10 12:55:38 wiz Exp $ # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp # @@ -10,8 +10,9 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} MAINTAINER= packages@netbsd.org COMMENT= View complete directories of X bitmaps and X pixmaps -USE_IMAKE= YES +USE_BUILDLINK2= YES USE_GMAKE= YES +USE_IMAKE= YES -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile index bcd70bb24c0..fd7a34786ec 100644 --- a/time/asclock-xlib/Makefile +++ b/time/asclock-xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/08/22 17:38:59 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/10 12:54:18 wiz Exp $ # DISTNAME= asclock-xlib-2.0.11 @@ -12,6 +12,7 @@ COMMENT= dockable clock and calendar with themes for X11 NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL +USE_BUILDLINK2= YES USE_IMAKE= YES USE_X11BASE= YES @@ -32,5 +33,5 @@ post-install: ${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-xlib ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-xlib -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile index 15e45aeb27d..9648c96180d 100644 --- a/wm/tvtwm/Makefile +++ b/wm/tvtwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/08/22 17:39:00 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/10 12:57:44 wiz Exp $ DISTNAME= tvtwm.pl11 PKGNAME= tvtwm-11 @@ -9,7 +9,8 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=window_managers/} MAINTAINER= packages@netbsd.org COMMENT= Classic twm with virtual desktop support +USE_BUILDLINK2= YES USE_IMAKE= YES -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index 1bbd5688435..965cdecca98 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/09/27 23:18:58 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/10/10 12:58:44 wiz Exp $ # DISTNAME= Xaw-XPM-1.1 @@ -13,6 +13,7 @@ COMMENT= Enhanced 3-D widgets based on the Athena Widget set and Xaw3d CONFLICTS= Xaw3d-[0-9]* +USE_BUILDLINK2= YES USE_IMAKE= YES PLIST_SRC= ${WRKDIR}/.PLIST_SRC @@ -25,5 +26,5 @@ post-install: ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} cd ${PREFIX} && ${LS} lib/libXaw3d* >> ${PLIST_SRC} -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3