[pkgsrc/trunk]: pkgsrc/archivers/gsharutils Remove GNU_PROGRAM_PREFIX variabl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5a145a0cbec
branches:  trunk
changeset: 604365:f5a145a0cbec
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 20:52:55 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:

 archivers/gsharutils/Makefile |  18 ++++++++++--------
 archivers/gsharutils/PLIST    |  12 +++++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diffs (63 lines):

diff -r fc7b51071465 -r f5a145a0cbec archivers/gsharutils/Makefile
--- a/archivers/gsharutils/Makefile     Tue May 29 20:50:35 2012 +0000
+++ b/archivers/gsharutils/Makefile     Tue May 29 20:52:55 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2011/11/19 18:59:20 marino Exp $
+# $NetBSD: Makefile,v 1.46 2012/05/29 20:52:55 cheusov Exp $
 
 DISTNAME=      sharutils-4.11.1
+PKGREVISION=   1
 PKGNAME=       g${DISTNAME}
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GNU:=sharutils/}
@@ -13,6 +14,8 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+INSTALLATION_DIRS=     gnu/bin
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
@@ -21,15 +24,14 @@
 USE_TOOLS+=            makeinfo msgfmt sh:run
 
 CONFIGURE_ARGS+=       --disable-uucode
-CONFIGURE_ENV+=                SH=${TOOLS_SH:Q}
+CONFIGURE_ENV+=                SH=${TOOLS_SH}
 
-.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
+post-install:
+       set -e; cd ${DESTDIR}${PREFIX}/gnu/bin; \
+       ln -s ../../bin/gshar shar; \
+       ln -s ../../bin/gunshar unshar
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fc7b51071465 -r f5a145a0cbec archivers/gsharutils/PLIST
--- a/archivers/gsharutils/PLIST        Tue May 29 20:50:35 2012 +0000
+++ b/archivers/gsharutils/PLIST        Tue May 29 20:52:55 2012 +0000
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2011/11/19 18:59:20 marino Exp $
-bin/${GNU_PROGRAM_PREFIX}shar
-bin/${GNU_PROGRAM_PREFIX}unshar
+@comment $NetBSD: PLIST,v 1.9 2012/05/29 20:52:55 cheusov Exp $
+bin/gshar
+bin/gunshar
+gnu/bin/shar
+gnu/bin/unshar
 info/sharutils.info
-man/man1/${GNU_PROGRAM_PREFIX}shar.1
-man/man1/${GNU_PROGRAM_PREFIX}unshar.1
+man/man1/gshar.1
+man/man1/gunshar.1
 share/locale/bg/LC_MESSAGES/sharutils.mo
 share/locale/ca/LC_MESSAGES/sharutils.mo
 share/locale/cs/LC_MESSAGES/sharutils.mo