summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorcheusov <cheusov>2012-05-29 22:58:52 +0000
committercheusov <cheusov>2012-05-29 22:58:52 +0000
commit0e2bf81c57e24e28adc66b6ebf70097d0876013a (patch)
tree4aa856dd68132409593d1b2d7fd9392d3099af08 /archivers
parent7500cab4f9ade308bbc551226be10ec8a8ad33ce (diff)
downloadpkgsrc-0e2bf81c57e24e28adc66b6ebf70097d0876013a.tar.gz
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@)
Diffstat (limited to 'archivers')
-rw-r--r--archivers/pax/Makefile16
1 files changed, 2 insertions, 14 deletions
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 38b29fc8795..5d6695b058f 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2012/03/09 10:20:15 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2012/05/29 22:58:53 cheusov Exp $
DISTNAME= pax-20080110
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= # empty
DISTFILES= # empty
@@ -22,19 +23,6 @@ USE_FEATURES= nbcompat
.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
-
-.else
-
-# pax installs "tar" and "cpio"
-.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) && \
- (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
-CONFLICTS+= gcpio-[0-9]*
-.endif
-.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) && \
- (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
-CONFLICTS+= gtar-base-[0-9]*
-.endif
-
.endif
PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}