[Midnightbsd-cvs] mports [17745] trunk/devel/gmake: gmake 4.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Oct 14 20:37:26 EDT 2014
Revision: 17745
http://svnweb.midnightbsd.org/mports/?rev=17745
Author: laffer1
Date: 2014-10-14 20:37:25 -0400 (Tue, 14 Oct 2014)
Log Message:
-----------
gmake 4.1
Modified Paths:
--------------
trunk/devel/gmake/Makefile
trunk/devel/gmake/distinfo
trunk/devel/gmake/pkg-plist
Removed Paths:
-------------
trunk/devel/gmake/files/patch-ab
trunk/devel/gmake/files/patch-read.c
trunk/devel/gmake/files/patch-remake.c
Modified: trunk/devel/gmake/Makefile
===================================================================
--- trunk/devel/gmake/Makefile 2014-10-15 00:34:53 UTC (rev 17744)
+++ trunk/devel/gmake/Makefile 2014-10-15 00:37:25 UTC (rev 17745)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= gmake
-PORTVERSION= 3.82
-PORTREVISION= 6
+PORTVERSION= 4.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
Modified: trunk/devel/gmake/distinfo
===================================================================
--- trunk/devel/gmake/distinfo 2014-10-15 00:34:53 UTC (rev 17744)
+++ trunk/devel/gmake/distinfo 2014-10-15 00:37:25 UTC (rev 17745)
@@ -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
Deleted: trunk/devel/gmake/files/patch-ab
===================================================================
--- trunk/devel/gmake/files/patch-ab 2014-10-15 00:34:53 UTC (rev 17744)
+++ trunk/devel/gmake/files/patch-ab 2014-10-15 00:37:25 UTC (rev 17745)
@@ -1,7 +0,0 @@
---- doc/make.texi.orig 2010-07-19 02:10:54.000000000 -0500
-+++ doc/make.texi 2011-03-02 17:01:58.000000000 -0600
-@@ -54,3 +54,3 @@
- @direntry
--* Make: (make). Remake files automatically.
-+* GNU Make: (make). Remake files automatically.
- @end direntry
Deleted: trunk/devel/gmake/files/patch-read.c
===================================================================
--- trunk/devel/gmake/files/patch-read.c 2014-10-15 00:34:53 UTC (rev 17744)
+++ trunk/devel/gmake/files/patch-read.c 2014-10-15 00:37:25 UTC (rev 17745)
@@ -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)
Deleted: trunk/devel/gmake/files/patch-remake.c
===================================================================
--- trunk/devel/gmake/files/patch-remake.c 2014-10-15 00:34:53 UTC (rev 17744)
+++ trunk/devel/gmake/files/patch-remake.c 2014-10-15 00:37:25 UTC (rev 17745)
@@ -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
Modified: trunk/devel/gmake/pkg-plist
===================================================================
--- trunk/devel/gmake/pkg-plist 2014-10-15 00:34:53 UTC (rev 17744)
+++ trunk/devel/gmake/pkg-plist 2014-10-15 00:37:25 UTC (rev 17745)
@@ -1,5 +1,7 @@
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
More information about the Midnightbsd-cvs
mailing list