summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorcheusov <cheusov@pkgsrc.org>2012-05-29 20:37:08 +0000
committercheusov <cheusov@pkgsrc.org>2012-05-29 20:37:08 +0000
commit67a1767bc88efc21798b4e0fa600a66ea0c394cc (patch)
tree1dc12e69862089e478dcbd1c8344924c8b7b6342 /archivers
parentb70ec208283693b9bd000bfbdc4280c637554d69 (diff)
downloadpkgsrc-67a1767bc88efc21798b4e0fa600a66ea0c394cc.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.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/gcpio/Makefile21
-rw-r--r--archivers/gcpio/PLIST11
2 files changed, 15 insertions, 17 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index eb6736edabd..8b5ce9e143c 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -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 @@ GNU_CONFIGURE= yes
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 --git a/archivers/gcpio/PLIST b/archivers/gcpio/PLIST
index 83ceff492e4..386a4f4189f 100644
--- a/archivers/gcpio/PLIST
+++ b/archivers/gcpio/PLIST
@@ -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