From bae2639e49cd3cf3ee78c2ed8e82c3a277c91404 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 21:48:57 +0000
Subject: Merge packages from the buildlink2 branch back into the main trunk
 that have been converted to USE_BUILDLINK2.

---
 devel/gmake/Makefile         | 6 +++---
 devel/gmake/distinfo         | 2 +-
 devel/gmake/patches/patch-ae | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'devel/gmake')

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
-- 
cgit v1.2.3