diff options
author | fredb <fredb> | 1999-11-11 13:29:59 +0000 |
---|---|---|
committer | fredb <fredb> | 1999-11-11 13:29:59 +0000 |
commit | 99ca23272c6aa2be7875c9a3995ae3a885802e91 (patch) | |
tree | d643bba2684d33e859230cf168a813a4eb2ce4ac /devel/gmake | |
parent | d2d608940ddfa53dffbf67d8dced7a69fa25986e (diff) | |
download | pkgsrc-99ca23272c6aa2be7875c9a3995ae3a885802e91.tar.gz |
Fix for `patch -F0' by eliminating patches
- - use --program-prefix="g" for make -> gmake
- - use '${SED}' to fix @dircategory
Diffstat (limited to 'devel/gmake')
-rw-r--r-- | devel/gmake/Makefile | 13 | ||||
-rw-r--r-- | devel/gmake/files/patch-sum | 8 | ||||
-rw-r--r-- | devel/gmake/patches/patch-aa | 15 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ab | 24 |
4 files changed, 14 insertions, 46 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 2d2eeafd6aa..bd926da06de 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/04/14 21:39:02 tron Exp $ +# $NetBSD: Makefile,v 1.19 1999/11/11 13:29:59 fredb Exp $ # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp # @@ -10,12 +10,17 @@ MASTER_SITES= ${MASTER_SITE_GNU:=make/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/make/make.html +CONFIGURE_ARGS= --program-prefix="g" GNU_CONFIGURE= yes USE_GTEXINFO= yes -# joerg@freebsd.org says FreeBSD getloadavg() no longer requires setgid kmem +post-extract: + ${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig + ${SED} '/@dircategory/s|.*|@dircategory Programming \& development tools|' \ + < ${WRKSRC}/make.texinfo.orig > ${WRKSRC}/make.texinfo + post-install: - /bin/chmod g-s ${PREFIX}/bin/gmake - /usr/bin/chgrp ${BINGRP} ${PREFIX}/bin/gmake + ${CHMOD} g-s ${PREFIX}/bin/gmake + ${CHGRP} ${BINGRP} ${PREFIX}/bin/gmake .include "../../mk/bsd.pkg.mk" diff --git a/devel/gmake/files/patch-sum b/devel/gmake/files/patch-sum index e306668aac8..b26c109b8a4 100644 --- a/devel/gmake/files/patch-sum +++ b/devel/gmake/files/patch-sum @@ -1,4 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:35 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/11 13:30:01 fredb Exp $ -MD5 (patch-aa) = d7449b87d93c0e458ca72bf5bb5093c3 -MD5 (patch-ab) = 1576dcbacc405f0b1e9a735f3cd36935 +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/devel/gmake/patches/patch-aa b/devel/gmake/patches/patch-aa deleted file mode 100644 index 098059c6ef0..00000000000 --- a/devel/gmake/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1999/03/05 09:20:16 agc Exp $ - -Install the program as gmake, the man page as gmake.1 - ---- 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= diff --git a/devel/gmake/patches/patch-ab b/devel/gmake/patches/patch-ab deleted file mode 100644 index 6e23b6a4532..00000000000 --- a/devel/gmake/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:24 agc Exp $ - ---- make.info-orig Fri Sep 19 20:41:07 1997 -+++ make.info Fri Jan 30 21:28:52 1998 -@@ -1,7 +1,7 @@ - This is Info file make.info, produced by Makeinfo version 1.67 from the - input file make.texinfo. - --INFO-DIR-SECTION The GNU make utility -+INFO-DIR-SECTION Programming & development tools - START-INFO-DIR-ENTRY - * GNU make: (make.info). The GNU make utility. - END-INFO-DIR-ENTRY ---- make.texinfo-orig Tue Sep 16 16:17:33 1997 -+++ make.texinfo Fri Jan 30 21:29:56 1998 -@@ -25,7 +25,7 @@ - @syncodeindex pg cp - - @ifinfo --@dircategory The GNU make utility -+@dircategory Programming & development tools - @direntry - * GNU make: (make.info). The GNU make utility. - @end direntry |