Date: Sun, 12 Oct 1997 17:57:22 -0400 (EDT) From: "Justin M. Seger" <jseger@freebsd.scds.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/4747: update of ports/gmake to version 3.76.1 Message-ID: <199710122157.RAA22950@freebsd.scds.com> Resent-Message-ID: <199710122150.OAA19099@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 4747
>Category: ports
>Synopsis: update of ports/gmake to version 3.76.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 12 14:50:01 PDT 1997
>Last-Modified:
>Originator: Justin M. Seger
>Organization:
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
>Description:
This is an update of ports/gmake to version 3.76.1
I tested it with a couple of gmake dependant ports with
no problems, so it should be alright.
>How-To-Repeat:
>Fix:
diff -Nru gmake/Makefile gmake.new/Makefile
--- gmake/Makefile Fri Jun 13 16:00:47 1997
+++ gmake.new/Makefile Sun Oct 12 17:40:38 1997
@@ -1,21 +1,25 @@
# New ports collection makefile for: GNU make
-# Version required: 3.75
+# Version required: 3.76.1
# Date created: 11 September 1994
# Whom: jkh
#
# $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}
+MAINTAINER= jseger@freebsd.org
GNU_CONFIGURE= yes
MAN1= gmake.1
# joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
+pre-build:
+ rm -rf ${WRKSRC}/make.info*
post-install:
+ ${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/gmake.1
/bin/chmod g-s ${PREFIX}/bin/gmake
/usr/bin/chgrp ${BINGRP} ${PREFIX}/bin/gmake
@if [ ! -f ${PREFIX}/info/dir ]; then \
diff -Nru gmake/files/md5 gmake.new/files/md5
--- gmake/files/md5 Fri Sep 13 23:25:36 1996
+++ gmake.new/files/md5 Sun Oct 12 08:50:47 1997
@@ -1 +1 @@
-MD5 (make-3.75.tar.gz) = f3dd5a2bc74aee00b9f3c38f5d438f60
+MD5 (make-3.76.1.tar.gz) = 1f2d2fd7806a815ca58d844ba1499f6b
diff -Nru gmake/patches/patch-aa gmake.new/patches/patch-aa
--- gmake/patches/patch-aa Mon Jun 16 11:42:02 1997
+++ gmake.new/patches/patch-aa Sun Oct 12 13:23:01 1997
@@ -1,62 +1,58 @@
---- 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
+--- Makefile.in.orig Fri Sep 19 14:58:51 1997
++++ Makefile.in Sun Oct 12 13:22:53 1997
+@@ -54,14 +54,14 @@
+ CC = @CC@
+ CPP = @CPP@
+ LIBOBJS = @LIBOBJS@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ PACKAGE = @PACKAGE@
+ REMOTE = @REMOTE@
+ VERSION = @VERSION@
+
+ AUTOMAKE_OPTIONS = 1.2
+
+-bin_PROGRAMS = make
++bin_PROGRAMS = gmake
+
+ make_SOURCES = main.c commands.c job.c dir.c file.c misc.c read.c remake.c \
+ rule.c implicit.c default.c variable.c expand.c function.c \
+@@ -206,8 +206,8 @@
+
+ maintainer-clean-compile:
+
+-make: $(make_OBJECTS) $(make_DEPENDENCIES)
+- @rm -f make
++gmake: $(make_OBJECTS) $(make_DEPENDENCIES)
++ @rm -f gmake
+ $(LINK) $(make_LDFLAGS) $(make_OBJECTS) $(make_LDADD) $(LIBS)
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
+@@ -259,12 +259,12 @@
+ done; \
+ done
+ @$(POST_INSTALL)
+- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+- for file in $(INFO_DEPS); do \
+- echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
+- install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
+- done; \
+- else : ; fi
++# @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
++# for file in $(INFO_DEPS); do \
++# echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
++# install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
++# done; \
++# else : ; fi
+
+ uninstall-info:
+ $(PRE_UNINSTALL)
+@@ -476,7 +476,7 @@
- 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
+ uninstall: uninstall-recursive uninstall-am
+
+-all: all-recursive-am all-am
++all: all-recursive-am all-am info
+
+ install-strip:
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
diff -Nru gmake/patches/patch-ab gmake.new/patches/patch-ab
--- gmake/patches/patch-ab Tue Jun 17 03:23:46 1997
+++ gmake.new/patches/patch-ab Wed Dec 31 19:00:00 1969
@@ -1,13 +0,0 @@
---- 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
-
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199710122157.RAA22950>