buildlink1 -> buildlink2

11 files changed, 37 insertions, 43 deletions

diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index 082adcc9a5d..899da006ddd 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/01 02:31:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2002/11/14 23:50:45 jlam Exp $
 #
 
 DISTNAME=		binkd094
@@ -13,8 +13,8 @@ MAINTAINER=		tv@pobox.com
 HOMEPAGE=		http://www.corbina.net/~maloff/binkd/
 COMMENT=		FidoNet-over-IP transport program utilizing BINKP protocol
 
-USE_BUILDLINK_ONLY=	yes
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		# defined
+GNU_CONFIGURE=		# defined
 
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64
 
diff --git a/comms/dl-ezkit/Makefile b/comms/dl-ezkit/Makefile
index a497ef3c108..6742f8cf23b 100644
--- a/comms/dl-ezkit/Makefile
+++ b/comms/dl-ezkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/19 03:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/14 23:50:51 jlam Exp $
 
 PKGNAME=        dl-ezkit-0.8.1
 DISTNAME=	dl-ezkit-0.8.1-bsd
@@ -12,7 +12,7 @@ COMMENT=	coff file downloader for the EZ-KIT Lite using the RS232
 WRKSRC=		${WRKDIR}/dl-ezkit
 MAKEFILE=	Makefile.bsd
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dl ${PREFIX}/bin/
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 823bde3c21d..9ba83532a6d 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/19 04:48:35 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/14 23:51:54 jlam Exp $
 
 DISTNAME=	efax-0.9
 CATEGORIES=	comms
@@ -8,9 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cce.com/efax/
 COMMENT=	collection of small programs for sending and receiving faxes
 
-USE_BUILDLINK_ONLY=	# defined
-
-.include "../../mk/bsd.prefs.mk"
+USE_BUILDLINK2=	# defined
 
 post-patch:
 	${SED} -e 's:@PREFIX@:${PREFIX}:g;				\
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index a1df5aba690..6daa8b65519 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/08/01 02:31:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2002/11/14 23:55:33 jlam Exp $
 #
 
 DISTNAME=	fidogate-4.4.5
@@ -9,14 +9,15 @@ MAINTAINER=	tv@pobox.com
 HOMEPAGE=	http://www.fidogate.org/
 COMMENT=	FidoNet (FTN) <-> Internet mail and news gateway
 
-USE_BUILDLINK_ONLY=	yes
-USE_GMAKE=		yes
+USE_BUILDLINK2=		# defined
+USE_GMAKE=		# defined
+MAKE_ENV=		DEBUG="${CFLAGS} -Werror"
+BUILDLINK_SETENV.CC=	CC="cc ${_STRIPFLAG_CC}"
 
 INFO_FILES=	fidogate.info
-MAKE_ENV=	DEBUG="${CFLAGS} -Werror" CC="${CC} ${_STRIPFLAG_CC}"
 
-EGDIR=		${PREFIX}/share/examples
-CONF_FILES=	${EGDIR}/fidogate/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
+EGDIR=		${PREFIX}/share/examples/fidogate
+CONF_FILES=	${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
 RCD_SCRIPTS=	fidogate
 
 post-extract:
@@ -40,7 +41,7 @@ pre-build:
 pre-install:
 	${INSTALL_DATA_DIR} \
 		${PKG_SYSCONFDIR}/fidogate \
-		${EGDIR}/fidogate \
+		${EGDIR} \
 		${PREFIX}/lib/fidogate \
 		${PREFIX}/lib/fidogate/bin \
 		${PREFIX}/share/doc/fidogate \
@@ -58,9 +59,9 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/maintenance/rc.fidogate \
 		${PREFIX}/etc/rc.d/fidogate
 	${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate/
-	${INSTALL_DATA} ${WRKSRC}/fidogate.conf ${EGDIR}/fidogate/
+	${INSTALL_DATA} ${WRKSRC}/fidogate.conf ${EGDIR}
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/ifcico-cm/Makefile b/comms/ifcico-cm/Makefile
index ad8f948c1a5..90dd6848802 100644
--- a/comms/ifcico-cm/Makefile
+++ b/comms/ifcico-cm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/01 02:31:22 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/14 23:55:27 jlam Exp $
 #
 
 DISTNAME=	ifcico-3.0.cm.alpha-4.1
@@ -10,7 +10,7 @@ MAINTAINER=	tv@pobox.com
 HOMEPAGE=	http://cmeerw.org/ifcico/
 COMMENT=	FidoNet transport program using FTS protocols via dial or TCP
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 
 post-build:
 	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config >${WRKDIR}/config.dist
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 208e7635081..5a5e5398dbd 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/08/19 04:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/14 23:57:00 jlam Exp $
 
 DISTNAME=	modemd-970221
 PKGNAME=	modemd-19970221
@@ -8,8 +8,8 @@ MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
 MAINTAINER=	tsarna@netbsd.org
 COMMENT=	Replacement getty for dialup ttys and a modem server
 
-USE_BUILDLINK_ONLY=	yes
-MANCOMPRESSED_IF_MANZ=	yes
+USE_BUILDLINK2=		# defined
+MANCOMPRESSED_IF_MANZ=	# defined
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/modemd
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 62bdeda7261..e879ccc44b1 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/08/19 18:39:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/11/14 23:58:33 jlam Exp $
 
 DISTNAME=	plp_1_8
 PKGNAME=	plp-1.8
@@ -9,11 +9,10 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.proudman51.freeserve.co.uk/psion/
 COMMENT=	Tools to talk to the PSION organiser
 
-USE_BUILDLINK_ONLY=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-
-MAKE_ENV+=	REALCXX="${CXX}"
+USE_BUILDLINK2=	# defined
+USE_CXX=	# defined
+USE_GMAKE=	# defined
+USE_LIBTOOL=	# defined
 
 do-install:
 	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/utils/libplputils.la ${PREFIX}/lib
diff --git a/comms/plp/distinfo b/comms/plp/distinfo
index 09e86d9ca58..d6adff2b12b 100644
--- a/comms/plp/distinfo
+++ b/comms/plp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/17 17:41:24 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/11/14 23:58:33 jlam Exp $
 
 SHA1 (plp_1_8.tar.gz) = cad586353091895b6efc556d2cb5fa16891a3749
 Size (plp_1_8.tar.gz) = 58424 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 41314372a3f5f5723393c0cf42c20d4257b170b6
 SHA1 (patch-ac) = 794a00264cd61d31b61a2f05d81424e05f2e065e
 SHA1 (patch-ad) = 5831a7043380f3cc1dcccc029e54874003475632
 SHA1 (patch-ae) = 4ed426d60618302fa5d996d45d2b5be69e3e7faf
-SHA1 (patch-af) = d1e5d8a23472544eade2fc4d4d2aeee1f9dc5ba5
+SHA1 (patch-af) = f8c668a5891e51637f2b0cdaf7036c8632b3965d
 SHA1 (patch-ag) = 354183a25f00d951e5cbc25e64b11b1daac21939
 SHA1 (patch-ah) = e0a90f7f8f70ab94f252af28d0d6ecbb878265df
 SHA1 (patch-ai) = 88ec3fd405e7b19003d91e37dbcf739f948e7c03
diff --git a/comms/plp/patches/patch-af b/comms/plp/patches/patch-af
index 694e10a7025..f46971843f0 100644
--- a/comms/plp/patches/patch-af
+++ b/comms/plp/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2001/08/19 18:39:51 jlam Exp $
+$NetBSD: patch-af,v 1.6 2002/11/14 23:58:34 jlam Exp $
 
 --- Makefile.orig	Tue Nov  2 16:05:02 1999
 +++ Makefile
@@ -9,7 +9,7 @@ $NetBSD: patch-af,v 1.5 2001/08/19 18:39:51 jlam Exp $
 -CFLAGS= -Wall -g -O2
 -CC=g++ $(CFLAGS) $(INCLUDE)
 +CFLAGS+= -Wall -g -O2
-+CC=$(LIBTOOL) --mode=compile $(REALCXX) $(CFLAGS) $(INCLUDE)
++CC=$(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDE)
  
  # Linker and flags
 -LIBDIR=-L../utils
@@ -21,7 +21,7 @@ $NetBSD: patch-af,v 1.5 2001/08/19 18:39:51 jlam Exp $
 -# Archiver
 -AR=ar -cr
 +LIBS=../utils/libplputils.la
-+LD=$(LIBTOOL) --mode=link $(REALCXX) $(LDFLAGS)
++LD=$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS)
  
  #######################################
  # You shouldn't need to look any further..
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index 16f51147514..e96acc318c0 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/08/19 18:48:26 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/14 23:58:54 jlam Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/08/13 09:20:41 itojun Exp $
 
 DISTNAME=	snooper-19991202
@@ -10,10 +10,10 @@ COMMENT=	serial line protocol analyzer (need two serial interfaces)
 
 WRKSRC=		${WRKDIR}/snooper/build
 GNU_CONFIGURE=	yes
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=	yes
 
 pre-build:
-	cd ${WRKSRC} ; ${MAKE_PROGRAM} depend
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snooper
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 265d543efa8..37ad01a1983 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/03/05 23:34:27 skrll Exp $
+# $NetBSD: Makefile,v 1.34 2002/11/15 00:00:41 jlam Exp $
 #
 
 DISTNAME=		giflib-4.1.0
@@ -17,17 +17,13 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS=		--without-x
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 
 DOCDIR=			${PREFIX}/share/doc/giflib
 HTMLDIR=		${PREFIX}/share/doc/html/giflib
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=		CC="${CC} -I${LOCALBASE}/include"
-.endif
-
 post-patch:
 	${RM} ${WRKSRC}/doc/gif2x11.html