[pkgsrc/trunk]: pkgsrc/archivers/gcpio Remove GNU_PROGRAM_PREFIX variable (di...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1cfb45f909e5
branches:  trunk
changeset: 604362:1cfb45f909e5
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 20:37:08 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.

diffstat:

 archivers/gcpio/Makefile |  21 +++++++++------------
 archivers/gcpio/PLIST    |  11 ++++++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diffs (62 lines):

diff -r 724967fe0910 -r 1cfb45f909e5 archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile  Tue May 29 20:23:12 2012 +0000
+++ b/archivers/gcpio/Makefile  Tue May 29 20:37:08 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2011/04/22 13:42:49 obache Exp $
+# $NetBSD: Makefile,v 1.41 2012/05/29 20:37:08 cheusov Exp $
 #
 
 DISTNAME=      cpio-2.6
 PKGNAME=       g${DISTNAME}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GNU:=cpio/}
 
@@ -21,20 +21,17 @@
 USE_TOOLS+=    makeinfo
 INFO_FILES=    yes
 
-TEST_TARGET=   check
+INSTALLATION_DIRS=     gnu/bin
 
-CONFIGURE_ENV+=        gt_cv_func_gnugettext1_libintl=yes
+TEST_TARGET=           check
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libintl=yes
 
-.if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == ""
-# pax installs a "cpio" also
-CONFLICTS+=    pax-[0-9]*
-.endif
+CONFIGURE_ARGS+=       --program-prefix=g
 
-BUILD_DEFS+=           GNU_PROGRAM_PREFIX
-CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX:Q}
-PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
+post-install:
+       set -e; cd ${DESTDIR}${PREFIX}/gnu/bin; \
+       ln -s ../../bin/gcpio cpio
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 724967fe0910 -r 1cfb45f909e5 archivers/gcpio/PLIST
--- a/archivers/gcpio/PLIST     Tue May 29 20:23:12 2012 +0000
+++ b/archivers/gcpio/PLIST     Tue May 29 20:37:08 2012 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2006/06/05 19:04:32 minskim Exp $
-bin/${GNU_PROGRAM_PREFIX}cpio
+@comment $NetBSD: PLIST,v 1.9 2012/05/29 20:37:08 cheusov Exp $
+bin/gcpio
+gnu/bin/cpio
 info/cpio.info
-libexec/${GNU_PROGRAM_PREFIX}rmt
-man/man1/${GNU_PROGRAM_PREFIX}cpio.1
-man/man1/${GNU_PROGRAM_PREFIX}mt.1
+libexec/grmt
+man/man1/gcpio.1
+man/man1/gmt.1
 share/locale/da/LC_MESSAGES/cpio.mo
 share/locale/de/LC_MESSAGES/cpio.mo
 share/locale/es/LC_MESSAGES/cpio.mo