update to gmake-3.80

Changes since 3.79.1 are:

Version 3.80

* A new feature exists: order-only prerequisites.  These prerequisites
  affect the order in which targets are built, but they do not impact
  the rebuild/no-rebuild decision of their dependents.  That is to say,
  they allow you to require target B be built before target A, without
  requiring that target A will always be rebuilt if target B is updated.
  Patch for this feature provided by Greg McGary <greg@mcgary.org>.

* For compatibility with SysV make, GNU make now supports the peculiar
  syntax $$@, $$(@D), and $$(@F) in the prerequisites list of a rule.
  This syntax is only valid within explicit and static pattern rules: it
  cannot be used in implicit (suffix or pattern) rules.  Edouard G. Parmelan
  <egp@free.fr> provided a patch implementing this feature; however, I
  decided to implement it in a different way.

* The argument to the "ifdef" conditional is now expanded before it's
  tested, so it can be a constructed variable name.

  Similarly, the arguments to "export" (when not used in a variable
  definition context) and "unexport" are also now expanded.

* A new function is defined: $(value ...).  The argument to this
  function is the _name_ of a variable.  The result of the function is
  the value of the variable, without having been expanded.

* A new function is defined: $(eval ...).  The arguments to this
  function should expand to makefile commands, which will then be
  evaluated as if they had appeared in the makefile.  In combination
  with define/endef multiline variable definitions this is an extremely
  powerful capability.  The $(value ...) function is also sometimes
  useful here.

* A new built-in variable is defined, $(MAKEFILE_LIST).  It contains a
  list of each makefile GNU make has read, or started to read, in the
  order in which they were encountered.  So, the last filename in the
  list when a makefile is just being read (before any includes) is the
  name of the current makefile.

* A new built-in variable is defined: $(.VARIABLES).  When it is
  expanded it returns a complete list of variable names defined by all
  makefiles at that moment.

* A new command-line option is defined, -B or --always-make.  If
  specified GNU make will consider all targets out-of-date even if they
  would otherwise not be.

* The arguments to $(call ...) functions were being stored in $1, $2,
  etc. as recursive variables, even though they are fully expanded
  before assignment.  This means that escaped dollar signs ($$ etc.)
  were not behaving properly.  Now the arguments are stored as simple
  variables.  This may mean that if you added extra escaping to your
  $(call ...) function arguments you will need to undo it now.

* The variable invoked by $(call ...) can now be recursive: unlike other
  variables it can reference itself and this will not produce an error
  when it is used as the first argument to $(call ...) (but only then).

* New pseudo-target .LOW_RESOLUTION_TIME, superseding the configure
  option --disable-nsec-timestamps.  You might need this if your build
  process depends on tools like "cp -p" preserving time stamps, since
  "cp -p" (right now) doesn't preserve the subsecond portion of a time
  stamp.

* Updated translations for French, Galician, German, Japanese, Korean,
  and Russian.  New translations for Croatian, Danish, Hebrew, and
  Turkish.

* Updated internationalization support to Gettext 0.11.5.
  GNU make now uses Gettext's "external" feature, and does not include
  any internationalization code itself.  Configure will search your
  system for an existing implementation of GNU Gettext (only GNU Gettext
  is acceptable) and use it if it exists.  If not, NLS will be disabled.
  See ABOUT-NLS for more information.

* Updated to autoconf 2.54 and automake 1.7.  Users should not be impacted.

8 files changed, 76 insertions, 120 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index dafc62a9e54..09c01a9e532 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2002/08/25 21:49:40 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2002/10/16 00:21:21 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
 #
 
-DISTNAME=       make-3.79.1
-PKGNAME=        gmake-3.79.1
-PKGREVISION=	1
+DISTNAME=       make-3.80
+PKGNAME=        gmake-3.80
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU:=make/}
 
@@ -18,6 +17,7 @@ CONFIGURE_ARGS+=	--program-prefix="g"
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 TEXINFO_OVERRIDE=	YES
+TEXINFO_REQD=		4.0
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,14 +28,22 @@ CONFIGURE_ARGS+=	--disable-nsec-timestamps
 BUILD_DEFS+=	GMAKE_NSEC_TIMESTAMPS
 
 post-extract:
-	${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig
+	${MV} ${WRKSRC}/doc/make.texi ${WRKSRC}/doc/make.texi.orig
 	${SED} '/@dircategory/s|.*|@dircategory Programming \& development tools|' \
-	    < ${WRKSRC}/make.texinfo.orig > ${WRKSRC}/make.texinfo
+	    < ${WRKSRC}/doc/make.texi.orig > ${WRKSRC}/doc/make.texi
 
 post-install:
 	${CHMOD} g-s ${PREFIX}/bin/gmake
 	${CHGRP} ${BINGRP} ${PREFIX}/bin/gmake
 
+# NOTE:  the 'test' target requires perl, but since gmake does
+# not otherwise require it, perl is not listed as an explicit
+# dependency
+test: build
+	cd ${WRKSRC} && \
+		${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
+		tee ${WRKDIR}/tests.log
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/PLIST b/devel/gmake/PLIST
index 097413b2de5..9b8bb8eac8b 100644
--- a/devel/gmake/PLIST
+++ b/devel/gmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/10/16 00:21:22 dmcmahill Exp $
 bin/gmake
 @unexec ${INSTALL_INFO} --delete %D/info/make.info %D/info/dir
 info/make.info
@@ -12,14 +12,22 @@ info/make.info-7
 info/make.info-8
 info/make.info-9
 info/make.info-10
+info/make.info-11
 @exec ${INSTALL_INFO} %D/info/make.info %D/info/dir
 man/man1/gmake.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/distinfo b/devel/gmake/distinfo
index 26bbd55c7dc..e150ef23452 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 21:49:40 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/10/16 00:21:22 dmcmahill Exp $
 
-SHA1 (make-3.79.1.tar.gz) = d3cdff9f91a9cda71af8b2df2a94f9b844fa9704
-Size (make-3.79.1.tar.gz) = 1030393 bytes
-SHA1 (patch-aa) = 1ee1298fcd4dddcc632948aeda046d1df115319f
-SHA1 (patch-ab) = 40d3a68312743d5994d2cb137579d2f3be28320e
-SHA1 (patch-ac) = b5cb517d1ea11692203b3d1fbc6cec19e5c11660
-SHA1 (patch-ad) = 1a873f5db090d29a104e3c021950ab20644cc3a1
-SHA1 (patch-ae) = 71a54be609287cee1b163e843ccac4748810e304
+SHA1 (make-3.80.tar.gz) = 12cd7822d9cd7c1f12cc50df87366ec61915a277
+Size (make-3.80.tar.gz) = 1211924 bytes
+SHA1 (patch-ab) = 0bcde870568c00b1370e067e84c540e6649f90bb
+SHA1 (patch-ac) = 51f0b7a6160f36b8d1ff049e84a3ddf2195b6c50
+SHA1 (patch-ad) = 2b8037911acd8d0ddaa09f697a3b5e1397859cb5
+SHA1 (patch-ae) = 7baeabf65a5ceee682134edf90654c53bfb9ee11
diff --git a/devel/gmake/patches/patch-aa b/devel/gmake/patches/patch-aa
deleted file mode 100644
index 1814c79cc03..00000000000
--- a/devel/gmake/patches/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2001/03/13 20:15:47 wiz Exp $
-
---- configure.orig	Fri Jun 23 18:09:54 2000
-+++ configure
-@@ -2528,7 +2528,7 @@
-     # Check whether --with-included-gettext or --without-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
-   withval="$with_included_gettext"
--  with_included_gettext=yes
-+  with_included_gettext=$withval
- else
-   with_included_gettext=maybe
- fi
-@@ -2669,12 +2669,8 @@
- 
- int main() {
- 
--#if __USE_GNU_GETTEXT
-   extern int _nl_msg_cat_cntr;
-   return _nl_msg_cat_cntr;
--#else
--not GNU gettext
--#endif
- 
- ; return 0; }
- EOF
-@@ -2851,12 +2847,12 @@
- 
-     if test "x$prefix" = xNONE; then
-       cat >> confdefs.h <<EOF
--#define LOCALEDIR "$ac_default_prefix/share/locale"
-+#define LOCALEDIR "$ac_default_prefix/${PKGLOCALEDIR}/locale"
- EOF
- 
-     else
-       cat >> confdefs.h <<EOF
--#define LOCALEDIR "$prefix/share/locale"
-+#define LOCALEDIR "$prefix/${PKGLOCALEDIR}/locale"
- EOF
- 
-     fi
diff --git a/devel/gmake/patches/patch-ab b/devel/gmake/patches/patch-ab
index 7bc8f4e8a47..aee9f8fe995 100644
--- a/devel/gmake/patches/patch-ab
+++ b/devel/gmake/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2001/02/27 08:48:38 tron Exp $
+$NetBSD: patch-ab,v 1.6 2002/10/16 00:21:22 dmcmahill Exp $
 
---- i18n/Makefile.in.orig	Fri Jun 23 18:35:27 2000
-+++ i18n/Makefile.in	Tue Feb 27 09:38:18 2001
-@@ -81,7 +81,7 @@
- 
- AUTOMAKE_OPTIONS = gnits
- 
--localedir = $(prefix)/share/locale
+--- po/Makefile.in.in.orig	Thu Oct  3 14:18:35 2002
++++ po/Makefile.in.in
+@@ -21,7 +21,7 @@ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
 +localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/po
  
- ALL_POFILES = @ALL_POFILES@
- ALL_MOFILES = @ALL_MOFILES@
+ INSTALL = @INSTALL@
diff --git a/devel/gmake/patches/patch-ac b/devel/gmake/patches/patch-ac
index 0f992104937..680e7137d96 100644
--- a/devel/gmake/patches/patch-ac
+++ b/devel/gmake/patches/patch-ac
@@ -1,22 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/02/27 08:48:39 tron Exp $
+$NetBSD: patch-ac,v 1.2 2002/10/16 00:21:22 dmcmahill Exp $
 
---- Makefile.in.orig	Fri Jun 23 18:35:23 2000
-+++ Makefile.in	Tue Feb 27 09:40:18 2001
-@@ -101,7 +101,7 @@
- man_MANS = make.1
- info_TEXINFOS = make.texinfo
+--- Makefile.am.orig	Thu Oct  3 22:29:18 2002
++++ Makefile.am
+@@ -27,7 +27,7 @@ make_LDADD =	@LIBOBJS@ @ALLOCA@ $(GLOBLI
  
--DEFS = -DALIASPATH=\"$(aliaspath)\" -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
-+DEFS = -DALIASPATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
+ man_MANS =	make.1
  
- INCLUDES = -I. -I$(srcdir) $(GLOBINC)
+-DEFS =		-DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
++DEFS =		-DLOCALEDIR=\"$(prefix)/$(PKGLOCALEDIR)/locale\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
  
-@@ -117,7 +117,7 @@
+ AM_CPPFLAGS =	$(GLOBINC)
  
- POTFILES = $(SRCS) remote-cstms.c vmsfunctions.c
- 
--localedir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- aliaspath = $(localedir):.
- 
- # --------------- Local INSTALL Section
diff --git a/devel/gmake/patches/patch-ad b/devel/gmake/patches/patch-ad
index 9f10177fbb3..3ffd0c35d15 100644
--- a/devel/gmake/patches/patch-ad
+++ b/devel/gmake/patches/patch-ad
@@ -1,19 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2001/03/19 14:57:33 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2002/10/16 00:21:22 dmcmahill Exp $
 
---- getopt.c.orig	Tue Jan 25 08:42:51 2000
-+++ getopt.c
-@@ -79,9 +79,13 @@
- # endif
- #endif
- 
-+#ifdef HAVE_GETTEXT
-+# include <libintl.h>
-+#else
- /* This is for other GNU distributions with internationalized messages.
-    When compiling libc, the _ macro is predefined.  */
--#include "gettext.h"
-+# include "gettext.h"
-+#endif
- #define _(msgid)    gettext (msgid)
- 
+--- Makefile.in.orig	Thu Oct  3 22:56:12 2002
++++ Makefile.in
+@@ -55,7 +55,7 @@ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
  
+-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
++DEFS = -DLOCALEDIR=\"$(prefix)/$(PKGLOCALEDIR)/locale\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
diff --git a/devel/gmake/patches/patch-ae b/devel/gmake/patches/patch-ae
index c9fd8588c32..29632981f93 100644
--- a/devel/gmake/patches/patch-ae
+++ b/devel/gmake/patches/patch-ae
@@ -1,21 +1,18 @@
-$NetBSD: patch-ae,v 1.3 2002/08/25 21:49:41 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2002/10/16 00:21:22 dmcmahill Exp $
 
---- config.sub.orig	Fri Jun 23 09:30:45 2000
-+++ config.sub	Wed Jun  5 19:09:07 2002
-@@ -213,7 +213,7 @@
- 		| alphaev6[78] \
- 		| we32k | ns16k | clipper | i370 | sh | sh[34] \
- 		| powerpc | powerpcle \
--		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mipseb | mips64el \
- 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
- 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- 		| mips64vr5000 | miprs64vr5000el | mcore \
-@@ -251,6 +251,7 @@
- 	      | clipper-* | orion-* \
- 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-+	      | mipseb-* \
- 	      | mips64el-* | mips64orion-* | mips64orionel-* \
- 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- 	      | mipstx39-* | mipstx39el-* | mcore-* \
+--- getopt.c.orig	Tue Jan 25 02:42:51 2000
++++ getopt.c
+@@ -79,9 +79,13 @@
+ # endif
+ #endif
+ 
++#ifdef HAVE_GETTEXT
++#include <libintl.h>
++#else
+ /* This is for other GNU distributions with internationalized messages.
+    When compiling libc, the _ macro is predefined.  */
+ #include "gettext.h"
++#endif
+ #define _(msgid)    gettext (msgid)
+ 
+