upgrade to gmake 3.78.1

This commit is contained in:
brad 1999-10-27 20:27:45 +00:00
parent 2399873101
commit 6c03974b67
6 changed files with 79 additions and 113 deletions

View File

@ -1,20 +1,25 @@
# $OpenBSD: Makefile,v 1.9 1999/08/13 05:01:13 brad Exp $
# $OpenBSD: Makefile,v 1.10 1999/10/27 20:27:45 brad Exp $
DISTNAME= make-3.77
PKGNAME= gmake-3.77
DISTNAME= make-3.78.1
PKGNAME= gmake-3.78.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
NEED_VERSION= 1.121
MAINTAINER= todd@openbsd.org
SEPARATE_BUILD= simple
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name='s/^/g/'
post-extract:
@${RM} -f ${WRKSRC}/make.info*
post-install:
@/bin/chmod g-s ${PREFIX}/bin/gmake
@/usr/sbin/chgrp ${BINGRP} ${PREFIX}/bin/gmake
@${CHMOD} g-s ${PREFIX}/bin/gmake
@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/gmake
@if [ ! -f ${PREFIX}/info/dir ]; then \
${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
fi

View File

@ -1,3 +1,3 @@
MD5 (make-3.77.tar.gz) = b8264b1f8579d810a6de5db634aeafe4
RMD160 (make-3.77.tar.gz) = 7ce50227e72375699fcdaf20f22927beb451fc0e
SHA1 (make-3.77.tar.gz) = 4cb65e57447f5d2f166af425c36c79c5d21e3199
MD5 (make-3.78.1.tar.gz) = afd70cd88dbaf692ba92aadf641551bb
RMD160 (make-3.78.1.tar.gz) = 6d7e539802d37fe38318cfba822cf9b6ba8691d5
SHA1 (make-3.78.1.tar.gz) = 29adeb2ea92cfab7104c27adfcaff488634f0442

View File

@ -1,63 +1,25 @@
*** Makefile.in.orig Thu Jul 30 09:38:45 1998
--- Makefile.in Thu Nov 19 10:26:16 1998
***************
*** 62,68 ****
CC = @CC@
CPP = @CPP@
LIBOBJS = @LIBOBJS@
! MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
REMOTE = @REMOTE@
VERSION = @VERSION@
--- 62,68 ----
CC = @CC@
CPP = @CPP@
LIBOBJS = @LIBOBJS@
! MAKEINFO = @MAKEINFO@ --no-split
PACKAGE = @PACKAGE@
REMOTE = @REMOTE@
VERSION = @VERSION@
***************
*** 164,170 ****
SOURCES = $(make_SOURCES)
OBJECTS = $(make_OBJECTS)
! all: all-recursive-am all-am
.SUFFIXES:
.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi
--- 164,170 ----
SOURCES = $(make_SOURCES)
OBJECTS = $(make_OBJECTS)
! all: all-recursive-am all-am info
.SUFFIXES:
.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi
***************
*** 317,328 ****
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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
! install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
! done; \
! else : ; fi
uninstall-info:
$(PRE_UNINSTALL)
--- 317,328 ----
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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
! # install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
! # done; \
! # else : ; fi
uninstall-info:
$(PRE_UNINSTALL)
--- Makefile.in.orig Thu Sep 23 13:46:00 1999
+++ Makefile.in Tue Oct 26 16:12:29 1999
@@ -67,7 +67,7 @@
GETCONF = @GETCONF@
GLOBLIB = @GLOBLIB@
LIBOBJS = @LIBOBJS@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
PACKAGE = @PACKAGE@
PERL = @PERL@
RANLIB = @RANLIB@
@@ -322,13 +322,6 @@
done; \
done
@$(POST_INSTALL)
- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
- for file in $$list; do \
- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
- done; \
- else : ; fi
uninstall-info:
$(PRE_UNINSTALL)

View File

@ -1,11 +1,14 @@
--- make.texinfo.orig Tue Sep 16 23:17:33 1997
+++ make.texinfo Thu Oct 16 00:56:23 1997
@@ -25,7 +25,7 @@
--- make.texinfo.orig Thu Sep 23 13:40:19 1999
+++ make.texinfo Tue Oct 26 09:29:42 1999
@@ -24,9 +24,9 @@
@c Combine the program and concept indices:
@syncodeindex pg cp
@ifinfo
-@dircategory The GNU make utility
-@dircategory GNU Packages
+@dircategory Programming & development tools
@direntry
* GNU make: (make.info). The GNU make utility.
-* Make: (make). Remake files automatically.
+* GNU Make: (make). The GNU make utility.
@end direntry
@ifinfo

View File

@ -1,34 +1,30 @@
*** main.c.orig Thu Nov 19 10:35:08 1998
--- main.c Thu Nov 19 10:44:03 1998
***************
*** 1082,1089 ****
--- 1082,1096 ----
#else
static char name[] = "/tmp/GmXXXXXX";
#endif
+ #ifndef __OpenBSD__
(void) mktemp (name);
#else
+ int ftmp;
+
+ if ((ftmp = mkstemp (name)) < 0)
+ pfatal_with_name ("mkstemp (temporary file)");
+ #endif
+ #else
static char name[L_tmpnam];
(void) tmpnam (name);
#endif
***************
*** 1091,1097 ****
--- 1098,1108 ----
if (stdin_nm)
fatal("Makefile from standard input specified twice.");
+ #ifndef __OpenBSD__
outfile = fopen (name, "w");
+ #else
+ outfile = fdopen (ftmp, "w");
+ #endif
if (outfile == 0)
pfatal_with_name ("fopen (temporary file)");
while (!feof (stdin))
--- main.c.orig Tue Oct 26 09:32:12 1999
+++ main.c Tue Oct 26 09:34:46 1999
@@ -1144,8 +1144,15 @@
#else
static char name[] = "/tmp/GmXXXXXX";
#endif
+#ifndef __OpenBSD__
(void) mktemp (name);
#else
+ int ftmp;
+
+ if ((ftmp = mkstemp (name)) < 0)
+ pfatal_with_name ("mkstemp (temporary file)");
+#endif
+#else
static char name[L_tmpnam];
(void) tmpnam (name);
#endif
@@ -1153,7 +1160,11 @@
if (stdin_nm)
fatal (NILF, _("Makefile from standard input specified twice."));
+#ifndef __OpenBSD__
outfile = fopen (name, "w");
+#else
+ outfile = fdopen (ftmp, "w");
+#endif
if (outfile == 0)
pfatal_with_name (_("fopen (temporary file)"));
while (!feof (stdin))

View File

@ -1,5 +1,5 @@
@unexec install-info --delete --info-dir=%D/info %D/info/make.info
bin/gmake
@unexec install-info --delete --info-dir=%D/info %D/info/make.info
info/make.info
man/man1/gmake.1
@exec install-info --info-dir=%D/info %D/info/make.info
man/man1/gmake.1