upgrade to gmake 3.80

devel/gmake/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2002/05/13 18:50:39 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2002/10/04 18:06:28 brad Exp $
 
 COMMENT=	"GNU make"
-DISTNAME=	make-3.79.1
-PKGNAME=	gmake-3.79.1
+
+DISTNAME=	make-3.80
+PKGNAME=	g${DISTNAME}
 CATEGORIES=	devel
-NEED_VERSION=	1.460
 MASTER_SITES=	${MASTER_SITE_GNU:=make/}
 
 HOMEPAGE=	http://www.gnu.org/software/make/
@@ -22,7 +22,8 @@ SEPARATE_BUILD=	simple
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS= --program-prefix="g"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 
 # XXX workaround sparc64 gcc optimization bug where gmake built
 # with optimization level > 0 would get random sig11's.
@@ -31,10 +32,10 @@ CFLAGS+=	-O0
 .endif
 
 post-extract:
-	@rm -f ${WRKSRC}/make.info*
+	@rm -f ${WRKSRC}/doc/make.info*
 
 post-install:
-	@chmod g-s ${PREFIX}/bin/gmake
+	@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 

devel/gmake/distinfo

@@ -1,3 +1,3 @@
-MD5 (make-3.79.1.tar.gz) = 22ea95c125c7b80e04354d4ee4ae960d
-RMD160 (make-3.79.1.tar.gz) = 7e4ce54ca5152c466dbe81beeac45e83fa609c79
-SHA1 (make-3.79.1.tar.gz) = d3cdff9f91a9cda71af8b2df2a94f9b844fa9704
+MD5 (make-3.80.tar.gz) = c68540da9302a48068d5cce1f0099477
+RMD160 (make-3.80.tar.gz) = c89488af208e5871d199857600f16e156de03cd7
+SHA1 (make-3.80.tar.gz) = 12cd7822d9cd7c1f12cc50df87366ec61915a277

devel/gmake/patches/patch-Makefile.in

@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Jun 23 12:35:23 2000
-+++ Makefile.in	Sun Aug 26 13:20:35 2001
-@@ -72,7 +72,7 @@ GLOBDIR = @GLOBDIR@
- GLOBINC = @GLOBINC@
- GLOBLIB = @GLOBLIB@
- LIBOBJS = @LIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MOFILES = @MOFILES@
- PACKAGE = @PACKAGE@
- PERL = @PERL@

devel/gmake/patches/patch-doc_make_texi

@@ -1,6 +1,7 @@
---- make.texinfo.orig	Tue Jun 20 10:00:17 2000
-+++ make.texinfo	Sun Aug 26 13:19:10 2001
-@@ -24,9 +24,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
  

devel/gmake/patches/patch-make.1

@@ -1,10 +1,10 @@
-$OpenBSD: patch-make.1,v 1.1 2000/08/27 01:05:06 rohee Exp $
+$OpenBSD: patch-make.1,v 1.2 2002/10/04 18:06:28 brad Exp $
 
 Since we install GNU make as gmake replace make with gmake in the
 manpage where it makes sense.
 
---- make.1.orig	Sun Aug 27 02:38:17 2000
-+++ make.1	Sun Aug 27 02:43:04 2000
+--- make.1.orig	Tue Jul  6 17:09:34 1999
++++ make.1	Fri Oct  4 10:11:50 2002
 @@ -1,8 +1,8 @@
 -.TH MAKE 1L "22 August 1989" "GNU" "LOCAL USER COMMANDS"
 +.TH GMAKE 1L "22 August 1989" "GNU" "LOCAL USER COMMANDS"
@@ -17,7 +17,7 @@ manpage where it makes sense.
  [
  .B \-f
  .I makefile
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ which is made from the Texinfo source fi
  .SH DESCRIPTION
  .LP
  The purpose of the
@@ -26,7 +26,7 @@ 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 @@
+@@ -27,17 +27,17 @@ The manual describes the GNU implementat
  .IR make ,
  which was written by Richard Stallman and Roland McGrath.
  Our examples show C programs, since they are most common, but you can use
@@ -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 @@
+@@ -49,17 +49,17 @@ Once a suitable makefile exists, each ti
  this simple shell command:
  .sp 1
  .RS
@@ -68,7 +68,7 @@ manpage where it makes sense.
  executes commands in the
  .I makefile
  to update
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ is typically a program.
  If no
  .B \-f
  option is present,
@@ -77,7 +77,7 @@ manpage where it makes sense.
  will look for the makefiles
  .IR GNUmakefile ,
  .IR makefile ,
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ If
  .I makefile
  is `\-', the standard input is read.
  .LP
@@ -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 @@
+@@ -125,7 +125,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 @@
+@@ -133,7 +133,7 @@ The debugging information says which fil
  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
@@ -104,7 +104,7 @@ manpage where it makes sense.
  decides what to do.
  .TP 0.5i
  .B \-e
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,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 @@
+@@ -177,7 +177,7 @@ option, the last one is effective.
  If the
  .B \-j
  option is given without an argument,
@@ -122,7 +122,7 @@ manpage where it makes sense.
  will not limit the number of jobs that can run simultaneously.
  .TP 0.5i
  .B \-k
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ This also prints the version information
  .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 @@
+@@ -236,11 +236,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.
-@@ -250,11 +250,11 @@
+@@ -250,11 +250,11 @@ Touch files (mark them up to date withou
  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
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ Print a message containing the working d
  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
  .BI "\-W " file
-@@ -278,7 +278,7 @@
+@@ -278,9 +278,9 @@ Without
  it is almost the same as running a
  .I touch
  command on the given file before running
@@ -178,3 +178,5 @@ manpage where it makes sense.
 -.IR make .
 +.IR gmake .
  .SH "SEE ALSO"
+ .I "The GNU Make Manual"
+ .SH BUGS

devel/gmake/pkg/PLIST

@@ -1,15 +1,22 @@
-@comment $OpenBSD: PLIST,v 1.6 2000/07/04 01:55:24 brad Exp $
+@comment $OpenBSD: PLIST,v 1.7 2002/10/04 18:06:28 brad Exp $
 bin/gmake
 @unexec install-info --delete --info-dir=%D/info %D/info/make.info
 info/make.info
 @exec install-info --info-dir=%D/info %D/info/make.info
 man/man1/gmake.1
+share/locale/da/LC_MESSAGES/make.mo
 share/locale/de/LC_MESSAGES/make.mo
 share/locale/es/LC_MESSAGES/make.mo
 share/locale/fr/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/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/sv/LC_MESSAGES/make.mo
+share/locale/tr/LC_MESSAGES/make.mo
+share/locale/zh_CN/LC_MESSAGES/make.mo