diff options
author | wiz <wiz> | 2002-12-23 20:08:50 +0000 |
---|---|---|
committer | wiz <wiz> | 2002-12-23 20:08:50 +0000 |
commit | 3e0a23ccb1e682851feb40e55e6f066f75280363 (patch) | |
tree | ea97f7bbd4461fdaef652b1482907e0bc6eaa27a /devel/m4 | |
parent | b4184c0db1b2fa660c7a40c619c97d7768606b26 (diff) | |
download | pkgsrc-3e0a23ccb1e682851feb40e55e6f066f75280363.tar.gz |
Honor GNU_PROGRAM_PREFIX; install gm4 in any case for pkgsrc use.
Change share dirname from gm4 to m4 to match PKGNAME.
Bump PKGREVISION to 1.
Diffstat (limited to 'devel/m4')
-rw-r--r-- | devel/m4/Makefile | 30 | ||||
-rw-r--r-- | devel/m4/PLIST | 59 | ||||
-rw-r--r-- | devel/m4/distinfo | 4 | ||||
-rw-r--r-- | devel/m4/patches/patch-ab | 11 |
4 files changed, 56 insertions, 48 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 4322a0f7512..47336d0b913 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,26 +1,42 @@ -# $NetBSD: Makefile,v 1.17 2002/08/25 21:49:45 jlam Exp $ -# FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp +# $NetBSD: Makefile,v 1.18 2002/12/23 20:08:50 wiz Exp $ # -DISTNAME= m4-1.4 +DISTNAME= m4-1.4 +PKGREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU:=m4/} +MASTER_SITES= ${MASTER_SITE_GNU:=m4/} MAINTAINER= packages@netbsd.org COMMENT= GNU version of Unix m4 macro-processor USE_BUILDLINK2= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-prefix=g INFO_FILES= m4.info TEXINFO_OVERRIDE= YES +.include "../../mk/bsd.prefs.mk" + +.if defined(GNU_PROGRAM_PREFIX) +CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX} +.endif +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +BUILD_DEFS+= GNU_PROGRAM_PREFIX + +.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" +PLIST_SUBST+= GM4_LINK="" +.else +PLIST_SUBST+= GM4_LINK="@comment " +.endif + pre-build: ${CHMOD} u+w ${WRKSRC}/checks/stamp-checks post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gm4 - ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/gm4 + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/m4 + ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/m4 +.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" + ${LN} -s ${GNU_PROGRAM_PREFIX}m4 ${PREFIX}/bin/gm4 +.endif .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/m4/PLIST b/devel/m4/PLIST index b06b816dcd9..9d25eede448 100644 --- a/devel/m4/PLIST +++ b/devel/m4/PLIST @@ -1,32 +1,33 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:14 seb Exp $ -bin/gm4 +@comment $NetBSD: PLIST,v 1.3 2002/12/23 20:08:50 wiz Exp $ +bin/${GNU_PROGRAM_PREFIX}m4 +${GM4_LINK}bin/gm4 @unexec ${INSTALL_INFO} --delete %D/info/m4.info %D/info/dir info/m4.info @exec ${INSTALL_INFO} %D/info/m4.info %D/info/dir -share/examples/gm4/capitalize.m4 -share/examples/gm4/comments.m4 -share/examples/gm4/ddivert.m4 -share/examples/gm4/debug.m4 -share/examples/gm4/esyscmd.m4 -share/examples/gm4/exp.m4 -share/examples/gm4/file.m4 -share/examples/gm4/foreach.m4 -share/examples/gm4/forloop.m4 -share/examples/gm4/fstab.m4 -share/examples/gm4/hanoi.m4 -share/examples/gm4/incl-test.m4 -share/examples/gm4/include.m4 -share/examples/gm4/indir.m4 -share/examples/gm4/misc.m4 -share/examples/gm4/multiquotes.m4 -share/examples/gm4/patsubst.m4 -share/examples/gm4/pushpop.m4 -share/examples/gm4/regexp.m4 -share/examples/gm4/reverse.m4 -share/examples/gm4/sync-lines.m4 -share/examples/gm4/sysv-args.m4 -share/examples/gm4/trace.m4 -share/examples/gm4/translit.m4 -share/examples/gm4/undivert.m4 -share/examples/gm4/wrap.m4 -@dirrm share/examples/gm4 +share/examples/m4/capitalize.m4 +share/examples/m4/comments.m4 +share/examples/m4/ddivert.m4 +share/examples/m4/debug.m4 +share/examples/m4/esyscmd.m4 +share/examples/m4/exp.m4 +share/examples/m4/file.m4 +share/examples/m4/foreach.m4 +share/examples/m4/forloop.m4 +share/examples/m4/fstab.m4 +share/examples/m4/hanoi.m4 +share/examples/m4/incl-test.m4 +share/examples/m4/include.m4 +share/examples/m4/indir.m4 +share/examples/m4/misc.m4 +share/examples/m4/multiquotes.m4 +share/examples/m4/patsubst.m4 +share/examples/m4/pushpop.m4 +share/examples/m4/regexp.m4 +share/examples/m4/reverse.m4 +share/examples/m4/sync-lines.m4 +share/examples/m4/sysv-args.m4 +share/examples/m4/trace.m4 +share/examples/m4/translit.m4 +share/examples/m4/undivert.m4 +share/examples/m4/wrap.m4 +@dirrm share/examples/m4 diff --git a/devel/m4/distinfo b/devel/m4/distinfo index f7590628522..8fd70703687 100644 --- a/devel/m4/distinfo +++ b/devel/m4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:30 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/12/23 20:08:50 wiz Exp $ SHA1 (m4-1.4.tar.gz) = 60bfd560128b9b60151c2c2441271043e803bbcf Size (m4-1.4.tar.gz) = 317588 bytes SHA1 (patch-aa) = 1cadcd91fcda6131bc1a8ab723a2cc199532ed07 -SHA1 (patch-ab) = 5af54b8208eb9f4ec56dfd2104b29d990bd3284c +SHA1 (patch-ab) = 217c506243100c7396045a3aab3c352dd9972403 diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab index a5c2e4bf51d..055db3f199f 100644 --- a/devel/m4/patches/patch-ab +++ b/devel/m4/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:26 agc Exp $ +$NetBSD: patch-ab,v 1.3 2002/12/23 20:08:51 wiz Exp $ --- doc/m4.texinfo.orig Mon Oct 31 09:07:39 1994 +++ doc/m4.texinfo Mon Jun 16 16:36:44 1997 @@ -10,12 +10,3 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:40:26 agc Exp $ @finalout @c %**end of header -@@ -17,7 +18,7 @@ - @ifinfo - @format - START-INFO-DIR-ENTRY --* m4: (m4). A powerful macro processor. -+* Gm4: (m4). A powerful macro processor. - END-INFO-DIR-ENTRY - @end format - @end ifinfo |