summaryrefslogtreecommitdiff
path: root/archivers/gcpio
diff options
context:
space:
mode:
Diffstat (limited to 'archivers/gcpio')
-rw-r--r--archivers/gcpio/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 39f28d122cf..022fdb4aba2 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2006/10/01 13:38:33 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2006/10/07 16:21:39 reed Exp $
#
DISTNAME= cpio-2.6
PKGNAME= g${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=cpio/}
@@ -27,6 +27,11 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
LIBS.NetBSD+= -lgnumalloc
+.if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == ""
+# pax installs a "cpio" also
+CONFLICTS+= pax-[0-9]*
+.endif
+
BUILD_DEFS+= GNU_PROGRAM_PREFIX
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}