This is a potential update of GNU make to 3.82. "Potential", because
this release contains a number of changes that break backward
compatibility and I haven't yet run a bulk build to check for
fallout. (Will do that now.)
The man page formats fine with mandoc(1).
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 18 Oct 2010 21:35:48 -0000 1.41
+++ Makefile 23 Oct 2010 14:47:57 -0000
@@ -2,8 +2,8 @@
COMMENT= GNU make
-DISTNAME= make-3.81
-PKGNAME= g${DISTNAME}p1
+DISTNAME= make-3.82
+PKGNAME= g${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
@@ -11,30 +11,17 @@ HOMEPAGE= http://www.gnu.org/software/ma
MODULES= devel/gettext
-# GPLv2+
+# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c
+WANTLIB= c
-FAKE=all
SEPARATE_BUILD= simple
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --program-prefix="g"
-CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
- LDFLAGS="-L${DEPBASE}/lib"
-USE_GROFF = Yes
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config
-
-post-install:
- @chmod ${BINMODE} ${PREFIX}/bin/gmake
- @chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/gmake
-
-# XXX This is the ONE case where we shouldn't be able to cheat on
-# where HOME is coming from, but we can. Looks like gnu-make is bogus...
-
-REGRESS_FLAGS=HOME=/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/gmake/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 12 Jun 2008 21:04:16 -0000 1.5
+++ distinfo 23 Oct 2010 14:47:57 -0000
@@ -1,5 +1,5 @@
-MD5 (make-3.81.tar.gz) = pOlJSsbcP2sMX/dcXVKrug==
-RMD160 (make-3.81.tar.gz) = pxOnKHXLmilWhnfJgCJGXG9Vy78=
-SHA1 (make-3.81.tar.gz) = zU+loxhBdkkr8HmVk6jyUKcoIQw=
-SHA256 (make-3.81.tar.gz) = Frd96fATvNU2t7we++MUIjrt/iUPkGPjPLtN/TRyFaI=
-SIZE (make-3.81.tar.gz) = 1564560
+MD5 (make-3.82.tar.gz) = f3wADjswxoQPLpz4ayVPrA==
+RMD160 (make-3.82.tar.gz) = j8HgdPo7sPnOMG8wsJ22BX+ls28=
+SHA1 (make-3.82.tar.gz) = ktG4ejDRyUguUvtKaOijVeeUYzE=
+SHA256 (make-3.82.tar.gz) = PZkbM+YEGHxYgaCrwuEC1bl3baVWlkDnN3j4XWFyQuc=
+SIZE (make-3.82.tar.gz) = 1712747
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 23 Oct 2010 14:47:57 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Sat Oct 23 15:49:01 2010
++++ Makefile.in Sat Oct 23 15:49:11 2010
+@@ -332,7 +332,7 @@ EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cs
+ noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
+ debug.h getopt.h gettext.h hash.h
+
+-make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@ \
++make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LTLIBINTL@ \
+ $(am__append_1)
+ man_MANS = make.1
+ AM_CPPFLAGS = $(GLOBINC) $(am__append_2)
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 12 Jun 2008 21:04:16 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2008/06/12 21:04:16 brad Exp $
---- configure.orig Sat Apr 1 01:40:00 2006
-+++ configure Wed May 28 19:30:52 2008
-@@ -14529,10 +14529,10 @@ s,@MSGFMT@,$MSGFMT,;t t
- s,@GMSGFMT@,$GMSGFMT,;t t
- s,@XGETTEXT@,$XGETTEXT,;t t
- s,@MSGMERGE@,$MSGMERGE,;t t
--s,@LIBICONV@,$LIBICONV,;t t
-+s,@LIBICONV@,$LTLIBICONV,;t t
- s,@LTLIBICONV@,$LTLIBICONV,;t t
- s,@INTLLIBS@,$INTLLIBS,;t t
--s,@LIBINTL@,$LIBINTL,;t t
-+s,@LIBINTL@,$LTLIBINTL,;t t
- s,@LTLIBINTL@,$LTLIBINTL,;t t
- s,@POSUB@,$POSUB,;t t
- s,@ALLOCA@,$ALLOCA,;t t
Index: patches/patch-doc_make_texi
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-doc_make_texi,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_make_texi
--- patches/patch-doc_make_texi 12 Jun 2008 21:04:16 -0000 1.2
+++ patches/patch-doc_make_texi 23 Oct 2010 14:47:57 -0000
@@ -1,15 +1,12 @@
$OpenBSD: patch-doc_make_texi,v 1.2 2008/06/12 21:04:16 brad Exp $
---- doc/make.texi.orig Sat Apr 1 01:36:40 2006
-+++ doc/make.texi Wed May 28 19:29:23 2008
-@@ -50,9 +50,9 @@ Software Foundation raise funds for GNU development.''
- @c ISPELL CHECK: done, 2000-06-25 --Martin Buchholz
+--- doc/make.texi.orig Sat Oct 23 15:31:18 2010
++++ doc/make.texi Sat Oct 23 15:31:52 2010
+@@ -52,7 +52,7 @@ developing GNU and promoting software freedom.''
-
-...@dircategory GNU Packages
-...@dircategory Programming & development tools
+ @dircategory Software development
@direntry
-* Make: (make). Remake files automatically.
-+* GNU Make: (make). The GNU make utility.
++* GNU Make: (make). The GNU make utility.
@end direntry
@iftex
Index: patches/patch-make.1
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-make.1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-make.1
--- patches/patch-make.1 12 Jun 2008 21:04:16 -0000 1.3
+++ patches/patch-make.1 23 Oct 2010 14:47:57 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-make.1,v 1.3 2008/06/12
Since we install GNU make as gmake replace make with gmake in the
manpage where it makes sense.
---- make.1.orig Sat Feb 11 15:00:39 2006
-+++ make.1 Wed May 28 22:15:02 2008
+--- make.1.orig Thu Jun 4 08:30:27 2009
++++ make.1 Sat Oct 23 16:23:21 2010
@@ -1,8 +1,8 @@
-.TH MAKE 1 "22 August 1989" "GNU" "LOCAL USER COMMANDS"
+.TH GMAKE 1L "22 August 1989" "GNU" "LOCAL USER COMMANDS"
@@ -122,7 +122,7 @@ manpage where it makes sense.
will not limit the number of jobs that can run simultaneously.
.TP 0.5i
.BR \-k , " \-\-keep\-going"
-@@ -241,7 +241,7 @@ This also prints the version information given by the
+@@ -242,7 +242,7 @@ This also prints the version information given by the
.B \-v
switch (see below).
To print the data base without trying to remake any files, use
@@ -131,7 +131,7 @@ manpage where it makes sense.
.B \-p
.BI \-f /dev/null.
.TP 0.5i
-@@ -266,11 +266,11 @@ Cancel the effect of the
+@@ -267,11 +267,11 @@ Cancel the effect of the
.B \-k
option.
This is never necessary except in a recursive
@@ -145,7 +145,7 @@ manpage where it makes sense.
via MAKEFLAGS or if you set
.B \-k
in MAKEFLAGS in your environment.
-@@ -280,11 +280,11 @@ Touch files (mark them up to date without really chang
+@@ -281,11 +281,11 @@ Touch files (mark them up to date without really chang
instead of running their commands.
This is used to pretend that the commands were done, in order to fool
future invocations of
@@ -159,7 +159,7 @@ manpage where it makes sense.
program plus a copyright, a list of authors and a notice that there
is no warranty.
.TP 0.5i
-@@ -293,7 +293,7 @@ Print a message containing the working directory
+@@ -294,7 +294,7 @@ Print a message containing the working directory
before and after other processing.
This may be useful for tracking down errors from complicated nests of
recursive
@@ -168,7 +168,7 @@ manpage where it makes sense.
commands.
.TP 0.5i
.B \-\-no\-print\-directory
-@@ -313,9 +313,9 @@ Without
+@@ -314,9 +314,9 @@ Without
it is almost the same as running a
.I touch
command on the given file before running
@@ -180,3 +180,12 @@ manpage where it makes sense.
.TP 0.5i
.B \-\-warn\-undefined\-variables
Warn when an undefined variable is referenced.
+@@ -328,7 +328,7 @@ and no targets that were built failed. A status of on
+ if the
+ .B \-q
+ flag was used and
+-.I make
++.I gmake
+ determines that a target needs to be rebuilt. A status of two will be
+ returned if any errors were encountered.
+ .SH "SEE ALSO"
Index: patches/patch-misc_c
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-misc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-misc_c
--- patches/patch-misc_c 10 May 2010 17:17:48 -0000 1.1
+++ patches/patch-misc_c 23 Oct 2010 14:47:57 -0000
@@ -5,9 +5,9 @@ Make this error non-fatal by not exiting
the effects of userland threads which change i/o operations to
non-blocking.
---- misc.c.orig Mon May 10 19:11:29 2010
-+++ misc.c Mon May 10 19:11:39 2010
-@@ -892,6 +892,5 @@ close_stdout (void)
+--- misc.c.orig Mon Jul 19 09:10:54 2010
++++ misc.c Sat Oct 23 15:30:51 2010
+@@ -954,6 +954,5 @@ close_stdout (void)
error (NILF, _("write error: %s"), strerror (errno));
else
error (NILF, _("write error"));
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gmake/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 12 Jun 2008 21:04:16 -0000 1.14
+++ pkg/PLIST 23 Oct 2010 14:47:57 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.14 2008/06/12 21:04:16 brad Exp $
@bin bin/gmake
-...@endfake
@info info/make.info
@man man/man1/gmake.1
share/locale/be/LC_MESSAGES/make.mo
@@ -14,15 +13,16 @@ share/locale/gl/LC_MESSAGES/make.mo
share/locale/he/LC_MESSAGES/make.mo
share/locale/hr/LC_MESSAGES/make.mo
share/locale/id/LC_MESSAGES/make.mo
+share/locale/it/LC_MESSAGES/make.mo
share/locale/ja/LC_MESSAGES/make.mo
share/locale/ko/LC_MESSAGES/make.mo
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/make.mo
share/locale/nl/LC_MESSAGES/make.mo
share/locale/pl/LC_MESSAGES/make.mo
share/locale/pt_BR/LC_MESSAGES/make.mo
share/locale/ru/LC_MESSAGES/make.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
-share/locale/rw/LC_MESSAGES/make.mo
share/locale/sv/LC_MESSAGES/make.mo
share/locale/tr/LC_MESSAGES/make.mo
share/locale/uk/LC_MESSAGES/make.mo
--
Christian "naddy" Weisgerber na...@mips.inka.de
