[pkgsrc/trunk]: pkgsrc/textproc/gsed Remove GNU_PROGRAM_PREFIX variable (disc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f2f6e8dac5b
branches:  trunk
changeset: 604382:3f2f6e8dac5b
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 22:22:00 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:

 textproc/gsed/Makefile |  22 ++++++----------------
 textproc/gsed/PLIST    |   9 ++++-----
 2 files changed, 10 insertions(+), 21 deletions(-)

diffs (62 lines):

diff -r 958d754d127e -r 3f2f6e8dac5b textproc/gsed/Makefile
--- a/textproc/gsed/Makefile    Tue May 29 22:20:40 2012 +0000
+++ b/textproc/gsed/Makefile    Tue May 29 22:22:00 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2011/12/29 22:30:47 sbd Exp $
+# $NetBSD: Makefile,v 1.39 2012/05/29 22:22:00 cheusov Exp $
 #
 
 DISTNAME=      sed-4.2.1
 PKGNAME=       g${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc editors
 MASTER_SITES=  ${MASTER_SITE_GNU:=sed/}
 
@@ -20,25 +20,15 @@
 INFO_FILES=            YES
 TEST_TARGET=           check
 
+INSTALLATION_DIRS=     gnu/bin
+
 # at least Solaris-2.9 has issues with grep/egrep
 USE_TOOLS+=            grep makeinfo
 
-.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=            gsed
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-PLIST.gsed=            yes
+CONFIGURE_ARGS+=       --program-prefix=g
 
 post-install:
-       ${LN} -f ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}sed ${DESTDIR}${PREFIX}/bin/gsed
-       ${LN} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}sed.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gsed.1
-.endif
+       ln -f -s ../../bin/gsed ${DESTDIR}${PREFIX}/gnu/bin/sed
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 958d754d127e -r 3f2f6e8dac5b textproc/gsed/PLIST
--- a/textproc/gsed/PLIST       Tue May 29 22:20:40 2012 +0000
+++ b/textproc/gsed/PLIST       Tue May 29 22:22:00 2012 +0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.13 2011/12/29 22:30:47 sbd Exp $
-bin/${GNU_PROGRAM_PREFIX}sed
-${PLIST.gsed}bin/gsed
+@comment $NetBSD: PLIST,v 1.14 2012/05/29 22:22:00 cheusov Exp $
+bin/gsed
+gnu/bin/sed
 info/sed.info
-man/man1/${GNU_PROGRAM_PREFIX}sed.1
-${PLIST.gsed}man/man1/gsed.1
+man/man1/gsed.1
 share/locale/af/LC_MESSAGES/sed.mo
 share/locale/ca/LC_MESSAGES/sed.mo
 share/locale/cs/LC_MESSAGES/sed.mo