From 742fcdbdb2eca343696a885300c06128b66f5fbd Mon Sep 17 00:00:00 2001 From: form Date: Thu, 19 Nov 1998 04:54:02 +0000 Subject: [PATCH] update to 3.77; use mkstemp() instead of mktemp() --- devel/gmake/Makefile | 10 ++-- devel/gmake/files/md5 | 2 +- devel/gmake/patches/patch-aa | 102 +++++++++++++++++++++-------------- devel/gmake/patches/patch-ac | 59 ++++++++++---------- 4 files changed, 96 insertions(+), 77 deletions(-) diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index f478a81949d..a1770d1b773 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 1998/10/18 05:02:05 marc Exp $ +# $OpenBSD: Makefile,v 1.5 1998/11/19 04:54:02 form Exp $ # -DISTNAME= make-3.76.1 -PKGNAME= gmake-3.76.1 +DISTNAME= make-3.77 +PKGNAME= gmake-3.77 CATEGORIES= devel -#BROKEN= "newer version available" - MAINTAINER= todd@OpenBSD.org MASTER_SITES= ${MASTER_SITE_GNU} @@ -17,7 +15,7 @@ CONFIGURE_ARGS= --program-transform-name='s/^/g/' post-install: /bin/chmod g-s ${PREFIX}/bin/gmake /usr/sbin/chgrp ${BINGRP} ${PREFIX}/bin/gmake - ${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/gmake.1 +# ${INSTALL_MAN} ${WRKSRC}/make.man ${PREFIX}/man/man1/gmake.1 @if [ ! -f ${PREFIX}/info/dir ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi diff --git a/devel/gmake/files/md5 b/devel/gmake/files/md5 index 8f2eb6fa3ef..46a99c1bbf3 100644 --- a/devel/gmake/files/md5 +++ b/devel/gmake/files/md5 @@ -1 +1 @@ -MD5 (make-3.76.1.tar.gz) = 1f2d2fd7806a815ca58d844ba1499f6b +MD5 (make-3.77.tar.gz) = b8264b1f8579d810a6de5db634aeafe4 diff --git a/devel/gmake/patches/patch-aa b/devel/gmake/patches/patch-aa index 20ecba1091d..6cf0c6bc980 100644 --- a/devel/gmake/patches/patch-aa +++ b/devel/gmake/patches/patch-aa @@ -1,39 +1,63 @@ ---- Makefile.in.orig Sat Sep 20 03:58:51 1997 -+++ Makefile.in Thu Oct 16 00:50:40 1997 -@@ -54,7 +54,7 @@ - CC = @CC@ - CPP = @CPP@ - LIBOBJS = @LIBOBJS@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - 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 +*** 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) diff --git a/devel/gmake/patches/patch-ac b/devel/gmake/patches/patch-ac index 3643b458caf..d9fc50a5dc0 100644 --- a/devel/gmake/patches/patch-ac +++ b/devel/gmake/patches/patch-ac @@ -1,37 +1,34 @@ -*** main.c.orig Sat Jun 6 17:23:46 1998 ---- main.c Sat Jun 6 17:25:15 1998 +*** main.c.orig Thu Nov 19 10:35:08 1998 +--- main.c Thu Nov 19 10:44:03 1998 *************** -*** 1021,1026 **** ---- 1021,1027 ---- - FILE *outfile; - - /* Make a unique filename. */ -+ #if 0 - #ifdef HAVE_MKTEMP - - #ifdef VMS -*************** -*** 1033,1042 **** - static char name[L_tmpnam]; - (void) tmpnam (name); - #endif - -! outfile = fopen (name, "w"); - if (outfile == 0) -! pfatal_with_name ("fopen (temporary file)"); - while (!feof (stdin)) - { - char buf[2048]; ---- 1034,1045 ---- - static char name[L_tmpnam]; - (void) tmpnam (name); +*** 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 -+ static char name[] = "/tmp/GmXXXXXX"; ++ #else + static char name[L_tmpnam]; + (void) tmpnam (name); + #endif +*************** +*** 1091,1097 **** +--- 1098,1108 ---- + if (stdin_nm) + fatal("Makefile from standard input specified twice."); -! outfile = fdopen (mkstemp(name), "w"); ++ #ifndef __OpenBSD__ + outfile = fopen (name, "w"); ++ #else ++ outfile = fdopen (ftmp, "w"); ++ #endif if (outfile == 0) -! pfatal_with_name ("fdopen (temporary file)"); + pfatal_with_name ("fopen (temporary file)"); while (!feof (stdin)) - { - char buf[2048];