Upgrade.

10 files changed, 44 insertions, 60 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 62410f9b923..6cb802409ef 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,17 +1,14 @@
 # New ports collection makefile for:	GNU make
-# Version required:	3.71
+# Version required:     3.73
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.5 1994/11/28 23:33:53 torstenb Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:44:36 jkh Exp $
 #
 
-DISTNAME=	make-3.72.1
+DISTNAME=       make-3.73
 GNU_CONFIGURE=	yes
-# Commented out, often busy
-# MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-# Mirror:
-MASTER_SITES=	ftp://ftp.uu.net/systems/gnu/
+MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ ftp://ftp.uu.net/systems/gnu/
 CATEGORIES+=	development programming
 
 .include <bsd.port.mk>
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index 323c372a273..03e1c558be4 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1 +1 @@
-MD5 (make-3.72.1.tar.gz) = 5902a592290d303a2b59ddc40b2d52ff
+MD5 (make-3.73.tar.gz) = 497646e67aa91673c28cf57d955d6ca4
diff --git a/devel/gmake/files/patch-aa b/devel/gmake/files/patch-aa
index 26a629652cf..eceebb4ea2c 100644
--- a/devel/gmake/files/patch-aa
+++ b/devel/gmake/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile.in.orig	Mon Nov  7 00:35:49 1994
---- Makefile.in	Sun Jan 29 01:13:25 1995
+*** Makefile.in.orig	Wed Apr  5 08:41:26 1995
+--- Makefile.in	Sat Apr  8 17:49:22 1995
 ***************
-*** 94,100 ****
+*** 92,98 ****
   # Number to put on the man page filename.
   manext = 1
   # Prefix to put on installed `make' binary file name.
@@ -9,7 +9,7 @@
   # Prefix to put on installed `make' man page file name.
   manprefix = $(binprefix)
   
---- 94,100 ----
+--- 92,98 ----
   # Number to put on the man page filename.
   manext = 1
   # Prefix to put on installed `make' binary file name.
@@ -18,24 +18,18 @@
   manprefix = $(binprefix)
   
 ***************
-*** 206,212 ****
-  	 else true; fi
-  # Some systems can't deal with renaming onto a running binary.
-  	-rm -f $@.old
-! 	-mv $@ $@.old
-  	mv $@.new $@
+*** 186,191 ****
+--- 186,193 ----
   
-  $(infodir)/make.info: make.info
---- 206,212 ----
-  	 else true; fi
-  # Some systems can't deal with renaming onto a running binary.
-  	-rm -f $@.old
-! 	@if [ -w $@ ]; then mv $@ $@.old; fi
-  	mv $@.new $@
+  installdirs:
+  	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir)
++ 	rm -f $(bindir)/$(binprefix)make $(infodir)/make.info \
++ 		$(mandir)/$(manprefix)make.$(manext)
   
-  $(infodir)/make.info: make.info
+  $(bindir)/$(binprefix)make: make
+  	$(INSTALL_PROGRAM) make $@.new
 ***************
-*** 264,270 ****
+*** 260,266 ****
   	$(SHELL) config.status
   glob/Makefile: config.status $(srcdir)/glob/Makefile.in
   	$(SHELL) config.status
@@ -43,11 +37,12 @@
   stamp-config: config.status $(srcdir)/config.h.in
   	$(SHELL) config.status
   	touch stamp-config
---- 264,270 ----
+--- 262,269 ----
   	$(SHELL) config.status
   glob/Makefile: config.status $(srcdir)/glob/Makefile.in
   	$(SHELL) config.status
 ! config.h: stamp-config
+! 
   stamp-config: config.status $(srcdir)/config.h.in
   	$(SHELL) config.status
   	touch stamp-config
diff --git a/devel/gmake/pkg-comment b/devel/gmake/pkg-comment
index 535967e65e2..63622456321 100644
--- a/devel/gmake/pkg-comment
+++ b/devel/gmake/pkg-comment
@@ -1 +1 @@
-GNU make 3.72.1 (binary distribution)
+GNU make 3.73
diff --git a/devel/gmake/pkg-descr b/devel/gmake/pkg-descr
index 142f8f0e085..240bf785867 100644
--- a/devel/gmake/pkg-descr
+++ b/devel/gmake/pkg-descr
@@ -1,3 +1,3 @@
-This directory contains the 3.71 release of GNU Make.
+This directory contains the release of GNU Make.
 All bugs reported for previous test releases have been fixed.
 Some bugs surely remain.
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index 62410f9b923..6cb802409ef 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -1,17 +1,14 @@
 # New ports collection makefile for:	GNU make
-# Version required:	3.71
+# Version required:     3.73
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.5 1994/11/28 23:33:53 torstenb Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:44:36 jkh Exp $
 #
 
-DISTNAME=	make-3.72.1
+DISTNAME=       make-3.73
 GNU_CONFIGURE=	yes
-# Commented out, often busy
-# MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-# Mirror:
-MASTER_SITES=	ftp://ftp.uu.net/systems/gnu/
+MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ ftp://ftp.uu.net/systems/gnu/
 CATEGORIES+=	development programming
 
 .include <bsd.port.mk>
diff --git a/devel/gmake381/distinfo b/devel/gmake381/distinfo
index 323c372a273..03e1c558be4 100644
--- a/devel/gmake381/distinfo
+++ b/devel/gmake381/distinfo
@@ -1 +1 @@
-MD5 (make-3.72.1.tar.gz) = 5902a592290d303a2b59ddc40b2d52ff
+MD5 (make-3.73.tar.gz) = 497646e67aa91673c28cf57d955d6ca4
diff --git a/devel/gmake381/files/patch-aa b/devel/gmake381/files/patch-aa
index 26a629652cf..eceebb4ea2c 100644
--- a/devel/gmake381/files/patch-aa
+++ b/devel/gmake381/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile.in.orig	Mon Nov  7 00:35:49 1994
---- Makefile.in	Sun Jan 29 01:13:25 1995
+*** Makefile.in.orig	Wed Apr  5 08:41:26 1995
+--- Makefile.in	Sat Apr  8 17:49:22 1995
 ***************
-*** 94,100 ****
+*** 92,98 ****
   # Number to put on the man page filename.
   manext = 1
   # Prefix to put on installed `make' binary file name.
@@ -9,7 +9,7 @@
   # Prefix to put on installed `make' man page file name.
   manprefix = $(binprefix)
   
---- 94,100 ----
+--- 92,98 ----
   # Number to put on the man page filename.
   manext = 1
   # Prefix to put on installed `make' binary file name.
@@ -18,24 +18,18 @@
   manprefix = $(binprefix)
   
 ***************
-*** 206,212 ****
-  	 else true; fi
-  # Some systems can't deal with renaming onto a running binary.
-  	-rm -f $@.old
-! 	-mv $@ $@.old
-  	mv $@.new $@
+*** 186,191 ****
+--- 186,193 ----
   
-  $(infodir)/make.info: make.info
---- 206,212 ----
-  	 else true; fi
-  # Some systems can't deal with renaming onto a running binary.
-  	-rm -f $@.old
-! 	@if [ -w $@ ]; then mv $@ $@.old; fi
-  	mv $@.new $@
+  installdirs:
+  	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir)
++ 	rm -f $(bindir)/$(binprefix)make $(infodir)/make.info \
++ 		$(mandir)/$(manprefix)make.$(manext)
   
-  $(infodir)/make.info: make.info
+  $(bindir)/$(binprefix)make: make
+  	$(INSTALL_PROGRAM) make $@.new
 ***************
-*** 264,270 ****
+*** 260,266 ****
   	$(SHELL) config.status
   glob/Makefile: config.status $(srcdir)/glob/Makefile.in
   	$(SHELL) config.status
@@ -43,11 +37,12 @@
   stamp-config: config.status $(srcdir)/config.h.in
   	$(SHELL) config.status
   	touch stamp-config
---- 264,270 ----
+--- 262,269 ----
   	$(SHELL) config.status
   glob/Makefile: config.status $(srcdir)/glob/Makefile.in
   	$(SHELL) config.status
 ! config.h: stamp-config
+! 
   stamp-config: config.status $(srcdir)/config.h.in
   	$(SHELL) config.status
   	touch stamp-config
diff --git a/devel/gmake381/pkg-comment b/devel/gmake381/pkg-comment
index 535967e65e2..63622456321 100644
--- a/devel/gmake381/pkg-comment
+++ b/devel/gmake381/pkg-comment
@@ -1 +1 @@
-GNU make 3.72.1 (binary distribution)
+GNU make 3.73
diff --git a/devel/gmake381/pkg-descr b/devel/gmake381/pkg-descr
index 142f8f0e085..240bf785867 100644
--- a/devel/gmake381/pkg-descr
+++ b/devel/gmake381/pkg-descr
@@ -1,3 +1,3 @@
-This directory contains the 3.71 release of GNU Make.
+This directory contains the release of GNU Make.
 All bugs reported for previous test releases have been fixed.
 Some bugs surely remain.