[pkgsrc/trunk]: pkgsrc/devel/m4 Remove GNU_PROGRAM_PREFIX variable (discussed...

[cheusov <cheusov%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0e0b740f998
branches:  trunk
changeset: 604375:d0e0b740f998
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 21:44:45 2012 +0000

description:
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

diffstat:

 devel/m4/Makefile |  25 +++++++------------------
 devel/m4/PLIST    |   8 ++++----
 2 files changed, 11 insertions(+), 22 deletions(-)

diffs (64 lines):

diff -r 159ec5a7d5ba -r d0e0b740f998 devel/m4/Makefile
--- a/devel/m4/Makefile Tue May 29 21:37:22 2012 +0000
+++ b/devel/m4/Makefile Tue May 29 21:44:45 2012 +0000
@@ -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 @@
 
 TEST_TARGET=           check
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=       --program-prefix=g
 
-.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
-
-.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 -r 159ec5a7d5ba -r d0e0b740f998 devel/m4/PLIST
--- a/devel/m4/PLIST    Tue May 29 21:37:22 2012 +0000
+++ b/devel/m4/PLIST    Tue May 29 21:44:45 2012 +0000
@@ -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