Index: head/devel/gmake/Makefile =================================================================== --- head/devel/gmake/Makefile (revision 370480) +++ head/devel/gmake/Makefile (revision 370481) @@ -1,42 +1,36 @@ # Created by: jkh # $FreeBSD$ PORTNAME= gmake -PORTVERSION= 3.82 -PORTREVISION= 2 +PORTVERSION= 4.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= make DISTNAME= make-${PORTVERSION} # note: before committing to this port, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. MAINTAINER= autotools@FreeBSD.org COMMENT= GNU version of 'make' utility LICENSE= GPLv3 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--program-prefix=g USES= makeinfo tar:bzip2 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext iconv NLS_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} \ --with-libintl-prefix=${LOCALBASE} NLS_CONFIGURE_ENABLE= nls CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split" INFO= make - -post-patch: - @${REINPLACE_CMD} -e '/no-print-dir/s/@itemx/@item/' \ - ${WRKSRC}/doc/make.texi - @${RM} ${WRKSRC}/doc/make.info* .include Index: head/devel/gmake/distinfo =================================================================== --- head/devel/gmake/distinfo (revision 370480) +++ head/devel/gmake/distinfo (revision 370481) @@ -1,2 +1,2 @@ -SHA256 (make-3.82.tar.bz2) = e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 -SIZE (make-3.82.tar.bz2) = 1242186 +SHA256 (make-4.1.tar.bz2) = 0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 +SIZE (make-4.1.tar.bz2) = 1327342 Index: head/devel/gmake/files/patch-read.c =================================================================== --- head/devel/gmake/files/patch-read.c (revision 370480) +++ head/devel/gmake/files/patch-read.c (nonexistent) @@ -1,52 +0,0 @@ -Add a fix for bug #30612 (http://savannah.gnu.org/bugs/index.php?30612) -from GNU make's CVS repository (revision 1.194). - -Taken from pkgsrc repository: devel/gmake/patches/patch-ah - ---- read.c.orig 2010-07-13 01:20:42.000000000 +0000 -+++ read.c -@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; - - /* Find and set the new end. Massage names if necessary. */ - while (1) Property changes on: head/devel/gmake/files/patch-read.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/gmake/files/patch-main.c =================================================================== --- head/devel/gmake/files/patch-main.c (revision 370480) +++ head/devel/gmake/files/patch-main.c (nonexistent) @@ -1,17 +0,0 @@ -When gmake automatically restart itself because one of its includes is updated, -the "MAKEFLAGS" environment variable is no more honoured. - -http://savannah.gnu.org/bugs/?30723 - -diff -rU3 -N make-3.82.orig/main.c make-3.82/main.c ---- main.c.orig 2010-07-19 07:10:53.000000000 +0000 -+++ main.c 2014-01-10 10:55:32.000000000 +0000 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) Property changes on: head/devel/gmake/files/patch-main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/gmake/files/patch-default.c =================================================================== --- head/devel/gmake/files/patch-default.c (revision 370480) +++ head/devel/gmake/files/patch-default.c (nonexistent) @@ -1,11 +0,0 @@ ---- default.c.orig 2014-01-03 01:20:16.000000000 -0800 -+++ default.c 2014-01-03 01:20:21.000000000 -0800 -@@ -408,7 +408,7 @@ - "OBJC", "gcc", - #else - "CC", "cc", -- "CXX", "g++", -+ "CXX", "c++", - "OBJC", "cc", - #endif - Property changes on: head/devel/gmake/files/patch-default.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/gmake/files/patch-remake.c =================================================================== --- head/devel/gmake/files/patch-remake.c (revision 370480) +++ head/devel/gmake/files/patch-remake.c (nonexistent) @@ -1,59 +0,0 @@ -Fix parallel builds. One port that exhibits this issue is webkit-gtk >= 1.8. - -http://savannah.gnu.org/bugs/?30653 - -Index: remake.c -=================================================================== -RCS file: /sources/make/make/remake.c,v -retrieving revision 1.147 -diff -u -r1.147 remake.c ---- remake.c 13 Jul 2010 01:20:42 -0000 1.147 -+++ remake.c 5 Aug 2010 01:02:18 -0000 -@@ -614,6 +614,12 @@ - d->file->dontcare = file->dontcare; - } - -+ /* We may have already encountered this file earlier in the same -+ * pass before we knew we'd be updating this target. In that -+ * case calling update_file now would result in the file being -+ * inappropriately pruned so we toggle the considered bit back -+ * off first. */ -+ d->file->considered = !considered; - - dep_status |= update_file (d->file, depth); - -Index: tests/scripts/features/parallelism -=================================================================== -RCS file: /sources/make/make/tests/scripts/features/parallelism,v -retrieving revision 1.16 -diff -u -r1.16 parallelism ---- tests/scripts/features/parallelism 5 Jul 2010 18:32:03 -0000 1.16 -+++ tests/scripts/features/parallelism 5 Aug 2010 01:02:18 -0000 -@@ -164,6 +164,27 @@ - - rmfiles('inc.mk'); - -+utouch(-15, 'file2'); -+utouch(-10, 'file4'); -+utouch(-5, 'file1'); -+ -+run_make_test(q! -+.INTERMEDIATE: file3 -+ -+file4: file3 -+ @mv -f $< $@ -+ -+file3: file2 -+ @touch $@ -+ -+file2: file1 -+ @touch $@ -+!, -+ '--no-print-directory -j2'); -+ -+rmfiles('file1', 'file2', 'file3', 'file4'); -+ -+ - if ($all_tests) { - # Implicit files aren't properly recreated during parallel builds - # Savannah bug #26864 Property changes on: head/devel/gmake/files/patch-remake.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/gmake/pkg-plist =================================================================== --- head/devel/gmake/pkg-plist (revision 370480) +++ head/devel/gmake/pkg-plist (revision 370481) @@ -1,26 +1,28 @@ bin/gmake +include/gnumake.h %%NLS%%share/locale/be/LC_MESSAGES/make.mo +%%NLS%%share/locale/cs/LC_MESSAGES/make.mo %%NLS%%share/locale/da/LC_MESSAGES/make.mo %%NLS%%share/locale/de/LC_MESSAGES/make.mo %%NLS%%share/locale/es/LC_MESSAGES/make.mo %%NLS%%share/locale/fi/LC_MESSAGES/make.mo %%NLS%%share/locale/fr/LC_MESSAGES/make.mo %%NLS%%share/locale/ga/LC_MESSAGES/make.mo %%NLS%%share/locale/gl/LC_MESSAGES/make.mo %%NLS%%share/locale/he/LC_MESSAGES/make.mo %%NLS%%share/locale/hr/LC_MESSAGES/make.mo %%NLS%%share/locale/id/LC_MESSAGES/make.mo %%NLS%%share/locale/it/LC_MESSAGES/make.mo %%NLS%%share/locale/ja/LC_MESSAGES/make.mo %%NLS%%share/locale/ko/LC_MESSAGES/make.mo %%NLS%%share/locale/lt/LC_MESSAGES/make.mo %%NLS%%share/locale/nl/LC_MESSAGES/make.mo %%NLS%%share/locale/pl/LC_MESSAGES/make.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo %%NLS%%share/locale/ru/LC_MESSAGES/make.mo %%NLS%%share/locale/sv/LC_MESSAGES/make.mo %%NLS%%share/locale/tr/LC_MESSAGES/make.mo %%NLS%%share/locale/uk/LC_MESSAGES/make.mo %%NLS%%share/locale/vi/LC_MESSAGES/make.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo man/man1/gmake.1.gz