diff options
| author | cheusov <cheusov@pkgsrc.org> | 2012-05-29 21:44:45 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2012-05-29 21:44:45 +0000 |
| commit | 6f0d36c438e96cde9e061a7fde4c63d8a9526dbd (patch) | |
| tree | a3e32d4d75b78488b1b3b896ef91020143ed7f47 | |
| parent | 9cc4fd4270e94056c0ee3890ec97a01f08f04d63 (diff) | |
| download | pkgsrc-6f0d36c438e96cde9e061a7fde4c63d8a9526dbd.tar.gz | |
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@).
All utilities are installed with a prefix 'g'. Symlinks with original
names are created in ${PREFIX}/gnu/bin.
++pkgrevision
| -rw-r--r-- | devel/m4/Makefile | 25 | ||||
| -rw-r--r-- | devel/m4/PLIST | 8 |
2 files changed, 11 insertions, 22 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 097d010dca5..6776fc95114 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2012/01/31 01:00:13 christos Exp $ +# $NetBSD: Makefile,v 1.67 2012/05/29 21:44:45 cheusov Exp $ DISTNAME= m4-1.4.16 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=m4/} @@ -18,29 +18,18 @@ INFO_FILES= yes TEST_TARGET= check -.include "../../mk/bsd.prefs.mk" - -.if defined(GNU_PROGRAM_PREFIX) -CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} -.endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} -BUILD_DEFS+= GNU_PROGRAM_PREFIX - -PLIST_VARS+= gm4 +CONFIGURE_ARGS+= --program-prefix=g -.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" -PLIST.gm4= yes -.endif +.include "../../mk/bsd.prefs.mk" .if ${LOWER_OPSYS} == "aix" CFLAGS+= -D_LINUX_SOURCE_COMPAT .endif +INSTALLATION_DIRS+= share/examples/m4 gnu/bin + post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/m4 ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4 -.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" - ${LN} -sf ${GNU_PROGRAM_PREFIX}m4 ${DESTDIR}${PREFIX}/bin/gm4 -.endif + ${LN} -sf ../../bin/gm4 ${DESTDIR}${PREFIX}/gnu/bin/m4 .include "../../mk/bsd.pkg.mk" diff --git a/devel/m4/PLIST b/devel/m4/PLIST index fe87f886e9a..cb8b694044d 100644 --- a/devel/m4/PLIST +++ b/devel/m4/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:48:57 joerg Exp $ -bin/${GNU_PROGRAM_PREFIX}m4 -${PLIST.gm4}bin/gm4 +@comment $NetBSD: PLIST,v 1.15 2012/05/29 21:44:45 cheusov Exp $ +bin/gm4 +gnu/bin/m4 info/m4.info -man/man1/${GNU_PROGRAM_PREFIX}m4.1 +man/man1/gm4.1 share/examples/m4/capitalize.m4 share/examples/m4/capitalize2.m4 share/examples/m4/comments.m4 |