From 516344ebca7c9f34fefb15834ad17366c97a1e09 Mon Sep 17 00:00:00 2001 From: frueauf Date: Fri, 30 Jan 1998 20:47:23 +0000 Subject: upgrade GNU make to 3.76.1 --- devel/gmake/Makefile | 14 ++++----- devel/gmake/files/md5 | 2 +- devel/gmake/patches/patch-aa | 73 +++++++------------------------------------- devel/gmake/patches/patch-ab | 33 ++++++++++++-------- devel/gmake/pkg/PLIST | 11 ++++++- 5 files changed, 49 insertions(+), 84 deletions(-) diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 9975a95e645..1962c854632 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,14 +1,14 @@ # New ports collection makefile for: GNU make -# Version required: 3.75 +# Version required: 3.76.1 # Date created: 11 September 1994 # Whom: jkh # -# $NetBSD: Makefile,v 1.7 1998/01/25 00:45:58 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 1998/01/30 20:47:23 frueauf Exp $ # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp # -DISTNAME= make-3.75 -PKGNAME= gmake-3.75 +DISTNAME= make-3.76.1 +PKGNAME= gmake-3.76.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} @@ -26,9 +26,7 @@ MAN1= gmake.1 post-install: /bin/chmod g-s ${PREFIX}/bin/gmake /usr/bin/chgrp ${BINGRP} ${PREFIX}/bin/gmake - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi - @install-info ${PREFIX}/info/make.info ${PREFIX}/info/dir + cd ${WRKSRC} && \ + ${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/${MAN1} .include diff --git a/devel/gmake/files/md5 b/devel/gmake/files/md5 index dec33e37275..8f2eb6fa3ef 100644 --- a/devel/gmake/files/md5 +++ b/devel/gmake/files/md5 @@ -1 +1 @@ -MD5 (make-3.75.tar.gz) = f3dd5a2bc74aee00b9f3c38f5d438f60 +MD5 (make-3.76.1.tar.gz) = 1f2d2fd7806a815ca58d844ba1499f6b diff --git a/devel/gmake/patches/patch-aa b/devel/gmake/patches/patch-aa index 4ef16a9c505..662d606b3f6 100644 --- a/devel/gmake/patches/patch-aa +++ b/devel/gmake/patches/patch-aa @@ -1,62 +1,11 @@ ---- Makefile.in.orig Thu Aug 29 06:13:09 1996 -+++ Makefile.in Thu Jun 12 20:53:26 1997 -@@ -79,7 +79,7 @@ - # Number to put on the man page filename. - manext = 1 - # Prefix to put on installed `make' binary file name. --binprefix = -+binprefix = g - # Prefix to put on installed `make' man page file name. - manprefix = $(binprefix) - -@@ -130,14 +130,14 @@ - .SUFFIXES: - .SUFFIXES: .o .c .h .ps .dvi .info .texinfo - --all: make -+all: make info - info: make.info - dvi: make.dvi - # Some makes apparently use .PHONY as the default goal if it is before `all'. - .PHONY: all check info dvi - - make.info: make.texinfo -- $(MAKEINFO) -I$(srcdir) $(srcdir)/make.texinfo -o make.info -+ rm -f make.info* && $(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/make.texinfo -o make.info - - make.dvi: make.texinfo - $(TEXI2DVI) $(srcdir)/make.texinfo -@@ -175,6 +175,8 @@ - - installdirs: - $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir) -+ rm -f $(bindir)/$(binprefix)make $(infodir)/make.info \ -+ $(mandir)/$(manprefix)make.$(manext) - - $(bindir)/$(binprefix)make: make - $(INSTALL_PROGRAM) make $@.new -@@ -204,10 +206,10 @@ - # line so we notice real errors from install-info. - # We use `$(SHELL) -c' because some shells do not - # fail gracefully when there is an unknown command. -- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -- if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \ -- install-info --infodir=$(infodir) $$dir/make.info; \ -- else true; fi -+# if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -+# if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \ -+# install-info --infodir=$(infodir) $$dir/make.info; \ -+# else true; fi - - $(mandir)/$(manprefix)make.$(manext): make.man - $(INSTALL_DATA) $(srcdir)/make.man $@ -@@ -250,7 +252,8 @@ - $(SHELL) config.status - glob/Makefile: config.status $(srcdir)/glob/Makefile.in - $(SHELL) config.status --config.h: stamp-config ; -+config.h: stamp-config -+ - stamp-config: config.status $(srcdir)/config.h.in - $(SHELL) config.status - touch stamp-config +--- configure-orig Fri Sep 19 20:37:14 1997 ++++ configure Mon Dec 1 20:41:54 1997 +@@ -59,7 +59,7 @@ + prefix=NONE + program_prefix=NONE + program_suffix=NONE +-program_transform_name=s,x,x, ++program_transform_name=s,^,g, + silent= + site= + srcdir= diff --git a/devel/gmake/patches/patch-ab b/devel/gmake/patches/patch-ab index d1d69bd6608..5352689cf21 100644 --- a/devel/gmake/patches/patch-ab +++ b/devel/gmake/patches/patch-ab @@ -1,13 +1,22 @@ ---- make.texinfo.orig Mon Jul 15 01:30:15 1996 -+++ make.texinfo Thu Jun 12 20:37:09 1997 -@@ -2,6 +2,10 @@ - @c %**start of header - @setfilename make.info - @settitle GNU @code{make} -+@dircategory Programming & development tools -+@direntry -+* Gmake: (make). The GNU Make utility. -+@end direntry - @setchapternewpage odd - @c %**end of header +--- make.info-orig Fri Sep 19 20:41:07 1997 ++++ make.info Fri Jan 30 21:28:52 1998 +@@ -1,7 +1,7 @@ + This is Info file make.info, produced by Makeinfo version 1.67 from the + input file make.texinfo. + +-INFO-DIR-SECTION The GNU make utility ++INFO-DIR-SECTION Programming & development tools + START-INFO-DIR-ENTRY + * GNU make: (make.info). The GNU make utility. + END-INFO-DIR-ENTRY +--- make.texinfo-orig Tue Sep 16 16:17:33 1997 ++++ make.texinfo Fri Jan 30 21:29:56 1998 +@@ -25,7 +25,7 @@ + @syncodeindex pg cp + @ifinfo +-@dircategory The GNU make utility ++@dircategory Programming & development tools + @direntry + * GNU make: (make.info). The GNU make utility. + @end direntry diff --git a/devel/gmake/pkg/PLIST b/devel/gmake/pkg/PLIST index d6cddcbdcd4..6fd40b54e23 100644 --- a/devel/gmake/pkg/PLIST +++ b/devel/gmake/pkg/PLIST @@ -1,7 +1,16 @@ -@comment $NetBSD: PLIST,v 1.3 1998/01/24 04:08:15 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/01/30 20:47:26 frueauf Exp $ bin/gmake man/man1/gmake.1.gz @unexec %D/bin/install-info --delete %D/info/make.info %D/info/dir info/make.info +info/make.info-1 +info/make.info-2 +info/make.info-3 +info/make.info-4 +info/make.info-5 +info/make.info-6 +info/make.info-7 +info/make.info-8 +info/make.info-9 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec %D/bin/install-info %D/info/make.info %D/info/dir -- cgit v1.2.3