Allow building a gmake without a dependency on gettext, libiconv,

libtool, etc. if GMAKE_LOCALE=no.  This allows "bootstrapping" lang/gcc
or lang/gcc3-c more automatically.  Bump the PKGREVISION.

3 files changed, 35 insertions, 23 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 4227602121b..30eb0292c5b 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2004/02/09 12:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2004/03/25 23:31:22 jlam Exp $
 
 DISTNAME=	make-3.80
 PKGNAME=	gmake-3.80
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=make/}
 
@@ -12,9 +12,8 @@ COMMENT=	GNU version of 'make' utility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
-GNU_CONFIGURE=		YES
-USE_PKGLOCALEDIR=	YES
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
 TEXINFO_REQD=		4.0
 INFO_FILES=		make.info
 
@@ -37,6 +36,19 @@ PLIST_SUBST+=		GMAKE_LINK=""
 PLIST_SUBST+=		GMAKE_LINK="@comment "
 .endif
 
+PLIST_SRC=		${PKGDIR}/PLIST
+
+GMAKE_LOCALE?=		yes
+BUILD_DEFS+=		GMAKE_LOCALE
+.if !empty(GMAKE_LOCALE:M[yY][eE][sS])
+USE_PKGLOCALEDIR=	yes
+PLIST_SRC+=		${PKGDIR}/PLIST.locale
+.  include "../../devel/gettext-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-libintl
+CONFIGURE_ARGS+=	--without-libiconv
+.endif
+
 post-install:
 	${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
 	${CHGRP} ${BINGRP} ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
@@ -44,5 +56,4 @@ post-install:
 	${LN} -sf ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
 .endif
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/PLIST b/devel/gmake/PLIST
index 21045addc84..63b74f42503 100644
--- a/devel/gmake/PLIST
+++ b/devel/gmake/PLIST
@@ -1,20 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/15 21:58:52 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/03/25 23:31:22 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}make
 ${GMAKE_LINK}bin/gmake
 man/man1/${GNU_PROGRAM_PREFIX}make.1
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/make.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/make.mo
diff --git a/devel/gmake/PLIST.locale b/devel/gmake/PLIST.locale
new file mode 100644
index 00000000000..ab5490589fb
--- /dev/null
+++ b/devel/gmake/PLIST.locale
@@ -0,0 +1,17 @@
+@comment $NetBSD: PLIST.locale,v 1.1 2004/03/25 23:31:22 jlam Exp $
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/make.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/make.mo