summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2002-08-20 12:49:42 +0000
committeragc <agc>2002-08-20 12:49:42 +0000
commit5c6a20cd124d19593e015bb6f72b31ba59c5bc5b (patch)
tree6197d527ee3bb9cf9a9b1e2e54ac96183127066b
parent4c4e4f0f14536d76d2c70d1110d2b0cc5e9abc1a (diff)
downloadpkgsrc-5c6a20cd124d19593e015bb6f72b31ba59c5bc5b.tar.gz
Pullup version 1.30 of devel/gmake/Makefile, and version 1.82 of
mk/bsd.pkg.defaults.mk onto the pkgsrc 1.6 branch. Requested by Stoned Elipot. (This is a no-op on NetBSD, BTW). > From: Stoned Elipot <seb@netbsd.org> > Date: Mon, 19 Aug 2002 21:39:17 +0300 (EEST) > > Module Name: pkgsrc > Committed By: seb > Date: Mon Aug 19 18:39:16 UTC 2002 > > Modified Files: > pkgsrc/devel/gmake: Makefile > pkgsrc/mk: bsd.pkg.defaults.mk > > Log Message: > Now by default the support of micro- and nano-second timestamp values provided > by stat(2) is disabled: it causes grief even for package building. > > This is adjustable by the GMAKE_NSEC_TIMESTAMPS variable. > > Bump PKGREVISION.
-rw-r--r--devel/gmake/Makefile11
-rw-r--r--mk/bsd.pkg.defaults.mk8
2 files changed, 17 insertions, 2 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index c6d0a1cfb1c..1c0f17c46a9 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:11 seb Exp $
+# $NetBSD: Makefile,v 1.29.8.1 2002/08/20 12:49:43 agc 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
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
@@ -18,6 +19,14 @@ CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
TEXINFO_OVERRIDE= YES
+.include "../../mk/bsd.prefs.mk"
+
+.if (${GMAKE_NSEC_TIMESTAMPS} == "NO")
+CONFIGURE_ARGS+= --disable-nsec-timestamps
+.endif
+
+BUILD_DEFS+= GMAKE_NSEC_TIMESTAMPS
+
post-extract:
${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig
${SED} '/@dircategory/s|.*|@dircategory Programming \& development tools|' \
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 8f90ea39222..3969e500353 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.81 2002/08/15 00:34:04 fredb Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.81.4.1 2002/08/20 12:49:42 agc Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -575,6 +575,12 @@ GAWK_ENABLE_PORTALS?= NO
# Possible: YES, NO
# Default: NO
+GMAKE_NSEC_TIMESTAMPS?= NO
+# Used by GNU make to enable/disable support of micro- and nano-second
+# timestamp values provided by stat(2).
+# Possible: YES, NO
+# Default: NO
+
#GQMPEG_NO_JAPANESE?= yes
# Can be enabled to handle keep gqmpeg from interpreting ID3 tags
# different, to make it possible to read japanese language tags, which