Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

18 files changed, 41 insertions, 41 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index ccbd66a6a8a..af1e45da76f 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/02/18 15:14:07 seb Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 21:49:38 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -14,8 +14,7 @@ DEPENDS=	m4-1.4:../../devel/m4
 
 CONFLICTS=		autoconf-devel-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
-
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		AWK="${AWK}"
 M4=			${PREFIX}/bin/gm4
@@ -23,6 +22,6 @@ M4=			${PREFIX}/bin/gm4
 INFO_FILES=		autoconf.info standards.info
 TEXINFO_OVERRIDE=	YES
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index ba72b01c85d..3686d15c183 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/05/29 14:45:58 yyamano Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/25 21:49:39 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
 #
 
@@ -14,14 +14,14 @@ COMMENT=	GNU Standards-compliant Makefile generator
 
 DEPENDS=	autoconf>=2.13:../../devel/autoconf
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV=		PERL=${PERL5}
-_STRIPFLAG_INSTALL=		# none
+_STRIPFLAG_INSTALL=	# none
 
-INFO_FILES=	automake.info
+INFO_FILES=		automake.info
 TEXINFO_OVERRIDE=	YES
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index a0e1a9fa9a9..5fc0591b963 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/02/18 15:14:10 seb Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 21:49:39 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/indent/indent.html
 COMMENT=	GNU version of pretty-printer for C source code
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--program-prefix=g
 
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 91495728a53..dafc62a9e54 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/08/19 18:39:16 seb Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/25 21:49:40 jlam Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/make/make.html
 COMMENT=	GNU version of 'make' utility
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-prefix="g"
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
@@ -36,6 +36,6 @@ post-install:
 	${CHMOD} g-s ${PREFIX}/bin/gmake
 	${CHGRP} ${BINGRP} ${PREFIX}/bin/gmake
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index 0b87b81c5e9..26bbd55c7dc 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/12 23:26:25 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:40 jlam Exp $
 
 SHA1 (make-3.79.1.tar.gz) = d3cdff9f91a9cda71af8b2df2a94f9b844fa9704
 Size (make-3.79.1.tar.gz) = 1030393 bytes
diff --git a/devel/gmake/patches/patch-ae b/devel/gmake/patches/patch-ae
index 1a8b47e4a8b..c9fd8588c32 100644
--- a/devel/gmake/patches/patch-ae
+++ b/devel/gmake/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/12 23:26:26 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 21:49:41 jlam Exp $
 
 --- config.sub.orig	Fri Jun 23 09:30:45 2000
 +++ config.sub	Wed Jun  5 19:09:07 2002
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index e58dc018035..0e9e30a125c 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/24 00:39:06 mjl Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 21:49:41 jlam Exp $
 #
 
 DISTNAME=		gmp-4.1
@@ -11,7 +11,7 @@ COMMENT=		Library for arbitrary precision arithmetic
 
 BUILD_DEPENDS+=		m4-1.4:../../devel/m4
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-cxx --without-readline
 USE_LIBTOOL=		YES
diff --git a/devel/gmp/PLIST b/devel/gmp/PLIST
index 832e186873b..85313335c72 100644
--- a/devel/gmp/PLIST
+++ b/devel/gmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/24 00:39:06 mjl Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 21:49:42 jlam Exp $
 include/gmp.h
 include/gmpxx.h
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gmp.info
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index bf584979b73..5fbb4bfd231 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/08/24 00:39:06 mjl Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 21:49:42 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index 1b7daa60dfc..e456ad7bd98 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/24 00:39:06 mjl Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:49:43 jlam Exp $
 
 SHA1 (gmp-4.1.tar.gz) = 6385fdfda2da9bd8c47256f5766b917f767c181b
 Size (gmp-4.1.tar.gz) = 2145387 bytes
diff --git a/devel/gmp/patches/patch-ga b/devel/gmp/patches/patch-ga
index 7cdd5c4d35e..9eeddc4628b 100644
--- a/devel/gmp/patches/patch-ga
+++ b/devel/gmp/patches/patch-ga
@@ -1,4 +1,4 @@
-$NetBSD: patch-ga,v 1.1 2002/08/24 00:39:07 mjl Exp $
+$NetBSD: patch-ga,v 1.2 2002/08/25 21:49:43 jlam Exp $
 
 This is a patch for 4.1 from the GNU MP Homepage, it should be
 removed in future versions
diff --git a/devel/gmp/patches/patch-gb b/devel/gmp/patches/patch-gb
index d65b0ad2a25..9ed1fd35e1f 100644
--- a/devel/gmp/patches/patch-gb
+++ b/devel/gmp/patches/patch-gb
@@ -1,4 +1,4 @@
-$NetBSD: patch-gb,v 1.1 2002/08/24 00:39:07 mjl Exp $
+$NetBSD: patch-gb,v 1.2 2002/08/25 21:49:44 jlam Exp $
 
 This is a patch for 4.1 from the GNU MP Homepage, it should be
 removed in future versions
diff --git a/devel/gmp/patches/patch-gc b/devel/gmp/patches/patch-gc
index 00a77a4bff8..bb138ee94d1 100644
--- a/devel/gmp/patches/patch-gc
+++ b/devel/gmp/patches/patch-gc
@@ -1,4 +1,4 @@
-$NetBSD: patch-gc,v 1.1 2002/08/24 00:39:08 mjl Exp $
+$NetBSD: patch-gc,v 1.2 2002/08/25 21:49:44 jlam Exp $
 
 This is a patch for 4.1 from the GNU MP Homepage, it should be
 removed in future versions
diff --git a/devel/gmp/patches/patch-gd b/devel/gmp/patches/patch-gd
index c2a30d496e8..a5fcf6edff1 100644
--- a/devel/gmp/patches/patch-gd
+++ b/devel/gmp/patches/patch-gd
@@ -1,4 +1,4 @@
-$NetBSD: patch-gd,v 1.1 2002/08/24 00:39:08 mjl Exp $
+$NetBSD: patch-gd,v 1.2 2002/08/25 21:49:45 jlam Exp $
 
 This is a patch for 4.1 from the GNU MP Homepage, it should be
 removed in future versions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index d3a9ed7b16c..4322a0f7512 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:14 seb Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 21:49:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=   ${MASTER_SITE_GNU:=m4/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	GNU version of Unix m4 macro-processor
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--program-prefix=g
 INFO_FILES=		m4.info
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index eed22801585..28e698bbc5c 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.4 2002/07/02 19:14:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:46 jlam Exp $
 
-DISTNAME=		BSD-Resource-1.15
-PKGNAME=		p5-${DISTNAME}
-SVR4_PKGNAME=		p5bsd
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=BSD/}
+DISTNAME=	BSD-Resource-1.15
+PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5bsd
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=BSD/}
 
-MAINTAINER=		packages@NetBSD.org
-HOMEPAGE=		http://iki.fi/jhi/
-COMMENT=		BSD::Resource - Perl interface to BSD process resources library
+MAINTAINER=	packages@NetBSD.org
+HOMEPAGE=	http://iki.fi/jhi/
+COMMENT=	BSD::Resource - Perl interface to BSD process resources library
 
-USE_BUILDLINK_ONLY=	YES
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/BSD/Resource/.packlist
+USE_BUILDLINK2=	YES
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/BSD/Resource/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-BSD-Resource/distinfo b/devel/p5-BSD-Resource/distinfo
index aa26844a9f1..680ee7408dd 100644
--- a/devel/p5-BSD-Resource/distinfo
+++ b/devel/p5-BSD-Resource/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/02 19:14:57 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:46 jlam Exp $
 
 SHA1 (BSD-Resource-1.15.tar.gz) = 03f50e1322aa70a9b2dbe82c1b00a7a45f714379
 Size (BSD-Resource-1.15.tar.gz) = 16618 bytes
diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index 2775e9e2281..d9b8fc5b0bb 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:21 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:47 jlam Exp $
 
 DISTNAME=		stl
 PKGNAME=		sgi-stl-3.3
@@ -12,6 +12,7 @@ COMMENT=		SGI Standard Template Library
 DIST_SUBDIR=		${PKGNAME}
 WRKSRC=			${WRKDIR}
 
+USE_BUILDLINK2=		# defined
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined