pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/gcpio If GNU_PROGRAM_PREFIX is empty then co...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5cbc64bb958e
branches: trunk
changeset: 519676:5cbc64bb958e
user: reed <reed%pkgsrc.org@localhost>
date: Sat Oct 07 16:21:39 2006 +0000
description:
If GNU_PROGRAM_PREFIX is empty then conflict with pax package
(which also installs cpio).
This is for my old PR #22693.
(Note I did this different than I did the gtar-base package
which has an another optional setting for choosing the prefix
for gtar which installs gtar with "g" if GNU_PROGRAM_PREFIX is empty.
If that is needed for gcpio also, let me know.)
diffstat:
archivers/gcpio/Makefile | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r 0665a54f0883 -r 5cbc64bb958e archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile Sat Oct 07 13:51:24 2006 +0000
+++ b/archivers/gcpio/Makefile Sat Oct 07 16:21:39 2006 +0000
@@ -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 @@
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}
Home |
Main Index |
Thread Index |
Old Index