>Number:         4758
>Category:       pkg
>Synopsis:       pkgsrc/devel/gmake is v3.75 - v3.76.1 is recent
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 30 13:35:01 1997
>Last-Modified:
>Originator:     Thorsten Frueauf
>Organization:
private
	
>Release:        <NetBSD-current source date> NetBSD 1.3
>Environment:
	
System: NetBSD cyberlap 1.3 NetBSD 1.3 (CYBERLAP) #4: Tue Dec 30 18:22:30 MET 1997 frueauf@cyberlap:/usr/src/sys/arch/i386/compile/CYBERLAP i386


>Description:
	
gmake in our pkgsrc is version 3.75, but there exists already version 3.76.1.

>How-To-Repeat:
	
Look at our pkgsrc/devel/gmake and look at a recent GNU mirror :-)

>Fix:
	
Apply the following patch, created with `diff -c`:

*** Makefile-orig	Fri Nov 14 10:46:52 1997
--- Makefile	Mon Dec  1 21:00:45 1997
***************
*** 1,14 ****
  # $NetBSD: Makefile,v 1.5 1997/11/13 14:37:45 hubertf Exp $
  # New ports collection makefile for:	GNU make
! # Version required:     3.75
  # Date created:		11 September 1994
  # Whom:			jkh
  #
  # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
  #
  
! DISTNAME=       make-3.75
! PKGNAME=        gmake-3.75
  CATEGORIES=	devel
  MASTER_SITES=   ${MASTER_SITE_GNU}
  
--- 1,14 ----
  # $NetBSD: Makefile,v 1.5 1997/11/13 14:37:45 hubertf Exp $
  # New ports collection makefile for:	GNU make
! # Version required:     3.76.1
  # Date created:		11 September 1994
  # Whom:			jkh
  #
  # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
  #
  
! DISTNAME=       make-3.76.1
! PKGNAME=        gmake-3.76.1
  CATEGORIES=	devel
  MASTER_SITES=   ${MASTER_SITE_GNU}
  
***************
*** 25,33 ****
  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
  
  .include <bsd.port.mk>
--- 25,29 ----
*** files/md5-orig	Thu Oct 16 10:36:44 1997
--- files/md5	Sun Nov 30 14:12:49 1997
***************
*** 1 ****
! MD5 (make-3.75.tar.gz) = f3dd5a2bc74aee00b9f3c38f5d438f60
--- 1 ----
! MD5 (make-3.76.1.tar.gz) = 1f2d2fd7806a815ca58d844ba1499f6b
*** pkg/PLIST-orig	Sun Nov  9 15:22:34 1997
--- pkg/PLIST	Mon Dec  1 21:30:55 1997
***************
*** 1,7 ****
  @comment $NetBSD: PLIST,v 1.2 1997/11/06 09:59:12 agc Exp $
  bin/gmake
! man/man1/gmake.1.gz
! @unexec install-info --delete %D/info/make.info %D/info/dir
  info/make.info
! @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
! @exec install-info %D/info/make.info %D/info/dir
--- 1,14 ----
  @comment $NetBSD: PLIST,v 1.2 1997/11/06 09:59:12 agc Exp $
  bin/gmake
! man/man1/gmake.1
! @unexec install-info --info-dir=%D/info --remove %D/info/make.info
  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
*** patches-orig/patch-aa	Thu Oct 16 10:36:44 1997
--- patches/patch-aa	Mon Dec  1 20:45:01 1997
***************
*** 1,62 ****
! --- 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
--- 1,11 ----
! --- 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=
*** patches-orig/patch-ab	Thu Oct 16 10:36:45 1997
--- patches/patch-ab	Mon Dec  1 21:38:38 1997
***************
*** 1,13 ****
! --- 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
   
--- 1,22 ----
! --- Makefile.in.orig	Fri Sep 19 20:58:51 1997
! +++ Makefile.in	Mon Dec  1 21:18:22 1997
! @@ -193,6 +193,10 @@
!  	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
!  	done
!  
! +install-man:
! +	echo "  $(INSTALL_PROGRAM) make.man $(mandir)/man1/`echo make.1|sed '$(transform)'`";
! +	$(INSTALL_PROGRAM) make.man $(mandir)/man1/`echo make.1|sed '$(transform)'`
! +
!  .c.o:
!  	$(COMPILE) -c $<
!  
! @@ -461,7 +467,7 @@
!  
!  install-exec-am: install-binPROGRAMS
!  
! -install-data-am: install-info-am
! +install-data-am: install-info-am install-man
!  
!  uninstall-am: uninstall-binPROGRAMS uninstall-info
   
>Audit-Trail:
>Unformatted:
pkgsrc/devel/gmake is v3.75 - v3.76.1 is recent