upgrade to gmake 3.81

Bulk build tested by naddy@

ok okan@
This commit is contained in:
brad 2008-06-12 21:04:16 +00:00
parent 727e588824
commit 936c51164c
6 changed files with 59 additions and 50 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.36 2007/09/16 02:52:59 merdely Exp $
# $OpenBSD: Makefile,v 1.37 2008/06/12 21:04:16 brad Exp $
COMMENT= GNU make
DISTNAME= make-3.80
PKGNAME= g${DISTNAME}p1
DISTNAME= make-3.81
PKGNAME= g${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
@ -11,8 +11,7 @@ HOMEPAGE= http://www.gnu.org/software/make/
MODULES= devel/gettext
MAINTAINER= Todd T. Fries <todd@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -24,7 +23,8 @@ SEPARATE_BUILD= simple
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --program-prefix="g"
CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${DEPBASE}/lib"
LDFLAGS="-L${DEPBASE}/lib" \
MAKEINFO="makeinfo --no-split"
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config
post-install:

View File

@ -1,5 +1,5 @@
MD5 (make-3.80.tar.gz) = xoVA2pMCpIBo1czh8AmUdw==
RMD160 (make-3.80.tar.gz) = yJSIryCOWHHRmYV2APFuFW3gPNc=
SHA1 (make-3.80.tar.gz) = Es14ItnNfB8SzFDfhzZuxhkVonc=
SHA256 (make-3.80.tar.gz) = ZLMLQf3i6/Zp5q9ImIP7HfagasMFVals+jw57M5yZ90=
SIZE (make-3.80.tar.gz) = 1211924
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

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.1 2005/01/29 09:06:56 alek Exp $
--- configure.orig Sat Jan 29 00:25:06 2005
+++ configure Sat Jan 29 00:25:49 2005
@@ -11865,10 +11865,10 @@ s,@GMSGFMT@,$GMSGFMT,;t t
$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,@USE_NLS@,$USE_NLS,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-doc_make_texi,v 1.1 2002/10/04 18:06:28 brad Exp $
--- doc/make.texi.orig Fri Oct 4 10:18:02 2002
+++ doc/make.texi Fri Oct 4 10:19:00 2002
@@ -25,9 +25,9 @@
@c Combine the program and concept indices:
@syncodeindex pg cp
$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
-@dircategory GNU Packages
+@dircategory Programming & development tools
@ -12,4 +12,4 @@ $OpenBSD: patch-doc_make_texi,v 1.1 2002/10/04 18:06:28 brad Exp $
+* GNU Make: (make). The GNU make utility.
@end direntry
@ifinfo
@iftex

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-make.1,v 1.2 2002/10/04 18:06:28 brad Exp $
$OpenBSD: patch-make.1,v 1.3 2008/06/12 21:04:16 brad Exp $
Since we install GNU make as gmake replace make with gmake in the
manpage where it makes sense.
--- make.1.orig Tue Jul 6 17:09:34 1999
+++ make.1 Fri Oct 4 10:11:50 2002
--- make.1.orig Sat Feb 11 15:00:39 2006
+++ make.1 Wed May 28 22:15:02 2008
@@ -1,8 +1,8 @@
-.TH MAKE 1L "22 August 1989" "GNU" "LOCAL USER COMMANDS"
-.TH MAKE 1 "22 August 1989" "GNU" "LOCAL USER COMMANDS"
+.TH GMAKE 1L "22 August 1989" "GNU" "LOCAL USER COMMANDS"
.SH NAME
-make \- GNU make utility to maintain groups of programs
@ -17,7 +17,7 @@ manpage where it makes sense.
[
.B \-f
.I makefile
@@ -19,7 +19,7 @@ which is made from the Texinfo source fi
@@ -18,7 +18,7 @@ which is made from the Texinfo source file
.SH DESCRIPTION
.LP
The purpose of the
@ -26,9 +26,9 @@ manpage where it makes sense.
utility is to determine automatically which
pieces of a large program need to be recompiled, and issue the commands to
recompile them.
@@ -27,17 +27,17 @@ The manual describes the GNU implementat
.IR make ,
which was written by Richard Stallman and Roland McGrath.
@@ -27,17 +27,17 @@ The manual describes the GNU implementation of
which was written by Richard Stallman and Roland McGrath, and is
currently maintained by Paul Smith.
Our examples show C programs, since they are most common, but you can use
-.I make
+.I gmake
@ -47,7 +47,7 @@ manpage where it makes sense.
you must write a file called the
.I makefile
that describes the relationships among files in your program, and the
@@ -49,17 +49,17 @@ Once a suitable makefile exists, each ti
@@ -49,17 +49,17 @@ Once a suitable makefile exists, each time you change
this simple shell command:
.sp 1
.RS
@ -86,7 +86,7 @@ manpage where it makes sense.
updates a target if it depends on prerequisite files
that have been modified since the target was last modified,
or if the target does not exist.
@@ -125,7 +125,7 @@ previous one:
@@ -126,7 +126,7 @@ previous one:
is equivalent to
.BR "\-C " /etc.
This is typically used with recursive invocations of
@ -95,7 +95,7 @@ manpage where it makes sense.
.TP 0.5i
.B \-d
Print debugging information in addition to normal processing.
@@ -133,7 +133,7 @@ The debugging information says which fil
@@ -134,7 +134,7 @@ The debugging information says which files are being c
remaking, which file-times are being compared and with what results,
which files actually need to be remade, which implicit rules are
considered and which are applied---everything interesting about how
@ -103,8 +103,8 @@ manpage where it makes sense.
+.I gmake
decides what to do.
.TP 0.5i
.B \-e
@@ -157,7 +157,7 @@ If several
.BI \-\-debug "[=FLAGS]"
@@ -181,7 +181,7 @@ If several
options are used to specify several directories, the directories are
searched in the order specified.
Unlike the arguments to other flags of
@ -113,7 +113,7 @@ manpage where it makes sense.
directories given with
.B \-I
flags may come directly after the flag:
@@ -177,7 +177,7 @@ option, the last one is effective.
@@ -203,7 +203,7 @@ option, the last one is effective.
If the
.B \-j
option is given without an argument,
@ -121,8 +121,8 @@ manpage where it makes sense.
+.IR gmake
will not limit the number of jobs that can run simultaneously.
.TP 0.5i
.B \-k
@@ -214,7 +214,7 @@ This also prints the version information
.BR \-k , " \-\-keep\-going"
@@ -241,7 +241,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
@@ -236,11 +236,11 @@ Cancel the effect of the
@@ -266,11 +266,11 @@ Cancel the effect of the
.B \-k
option.
This is never necessary except in a recursive
@ -145,21 +145,21 @@ manpage where it makes sense.
via MAKEFLAGS or if you set
.B \-k
in MAKEFLAGS in your environment.
@@ -250,11 +250,11 @@ Touch files (mark them up to date withou
@@ -280,11 +280,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
-.IR make .
+.IR gmake .
.TP 0.5i
.B \-v
.BR \-v , " \-\-version"
Print the version of the
-.I make
+.I gmake
program plus a copyright, a list of authors and a notice that there
is no warranty.
.TP 0.5i
@@ -263,7 +263,7 @@ Print a message containing the working d
@@ -293,7 +293,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
@ -167,8 +167,8 @@ manpage where it makes sense.
+.I gmake
commands.
.TP 0.5i
.BI "\-W " file
@@ -278,9 +278,9 @@ Without
.B \-\-no\-print\-directory
@@ -313,9 +313,9 @@ Without
it is almost the same as running a
.I touch
command on the given file before running
@ -177,6 +177,6 @@ manpage where it makes sense.
except that the modification time is changed only in the imagination of
-.IR make .
+.IR gmake .
.SH "SEE ALSO"
.I "The GNU Make Manual"
.SH BUGS
.TP 0.5i
.B \-\-warn\-undefined\-variables
Warn when an undefined variable is referenced.

View File

@ -1,21 +1,30 @@
@comment $OpenBSD: PLIST,v 1.13 2005/04/23 14:32:51 espie Exp $
bin/gmake
@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
share/locale/da/LC_MESSAGES/make.mo
share/locale/de/LC_MESSAGES/make.mo
share/locale/es/LC_MESSAGES/make.mo
share/locale/fi/LC_MESSAGES/make.mo
share/locale/fr/LC_MESSAGES/make.mo
share/locale/ga/LC_MESSAGES/make.mo
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/ja/LC_MESSAGES/make.mo
share/locale/ko/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
share/locale/vi/LC_MESSAGES/make.mo
share/locale/zh_CN/LC_MESSAGES/make.mo