6 files changed, 22 insertions, 78 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index b97be7da4095..1c727c08b2f6 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,30 +1,30 @@
 # New ports collection makefile for:	GNU make
-# Version required:     3.76.1
+# Version required:     3.77.7
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.17 1997/10/15 17:14:52 max Exp $
+# $Id: Makefile,v 1.18 1998/07/02 10:43:18 vanilla Exp $
 #
 
-DISTNAME=       make-3.76.1
-PKGNAME=        gmake-3.76.1
+DISTNAME=       make-3.77
+PKGNAME=        gmake-3.77
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	jseger@freebsd.org
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name='s/^/g/'
+CONFIGURE_ARGS=	--program-prefix=g
 MAN1=		gmake.1
 
 # joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
-post-install:
-	chmod g-s ${PREFIX}/bin/gmake
-	chgrp ${BINGRP} ${PREFIX}/bin/gmake
-	${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/gmake.1
+pre-install:
 	@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
+
+post-install:
+	chmod g-s ${PREFIX}/bin/gmake
+	chgrp ${BINGRP} ${PREFIX}/bin/gmake
 
 .include <bsd.port.mk>
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index 8f2eb6fa3ef2..46a99c1bbf35 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1 +1 @@
-MD5 (make-3.76.1.tar.gz) = 1f2d2fd7806a815ca58d844ba1499f6b
+MD5 (make-3.77.tar.gz) = b8264b1f8579d810a6de5db634aeafe4
diff --git a/devel/gmake/files/patch-aa b/devel/gmake/files/patch-aa
index 20ecba1091dc..df8551ec2e14 100644
--- a/devel/gmake/files/patch-aa
+++ b/devel/gmake/files/patch-aa
@@ -9,31 +9,3 @@
  PACKAGE = @PACKAGE@
  REMOTE = @REMOTE@
  VERSION = @VERSION@
-@@ -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 @@
- 
- 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 --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index b97be7da4095..1c727c08b2f6 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -1,30 +1,30 @@
 # New ports collection makefile for:	GNU make
-# Version required:     3.76.1
+# Version required:     3.77.7
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.17 1997/10/15 17:14:52 max Exp $
+# $Id: Makefile,v 1.18 1998/07/02 10:43:18 vanilla Exp $
 #
 
-DISTNAME=       make-3.76.1
-PKGNAME=        gmake-3.76.1
+DISTNAME=       make-3.77
+PKGNAME=        gmake-3.77
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	jseger@freebsd.org
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name='s/^/g/'
+CONFIGURE_ARGS=	--program-prefix=g
 MAN1=		gmake.1
 
 # joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
-post-install:
-	chmod g-s ${PREFIX}/bin/gmake
-	chgrp ${BINGRP} ${PREFIX}/bin/gmake
-	${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/gmake.1
+pre-install:
 	@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
+
+post-install:
+	chmod g-s ${PREFIX}/bin/gmake
+	chgrp ${BINGRP} ${PREFIX}/bin/gmake
 
 .include <bsd.port.mk>
diff --git a/devel/gmake381/distinfo b/devel/gmake381/distinfo
index 8f2eb6fa3ef2..46a99c1bbf35 100644
--- a/devel/gmake381/distinfo
+++ b/devel/gmake381/distinfo
@@ -1 +1 @@
-MD5 (make-3.76.1.tar.gz) = 1f2d2fd7806a815ca58d844ba1499f6b
+MD5 (make-3.77.tar.gz) = b8264b1f8579d810a6de5db634aeafe4
diff --git a/devel/gmake381/files/patch-aa b/devel/gmake381/files/patch-aa
index 20ecba1091dc..df8551ec2e14 100644
--- a/devel/gmake381/files/patch-aa
+++ b/devel/gmake381/files/patch-aa
@@ -9,31 +9,3 @@
  PACKAGE = @PACKAGE@
  REMOTE = @REMOTE@
  VERSION = @VERSION@
-@@ -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 @@
- 
- 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