pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/pax To close my PR #22693.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7136d0e64f0
branches:  trunk
changeset: 519677:d7136d0e64f0
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat Oct 07 16:52:19 2006 +0000

description:
To close my PR #22693.

If GTAR_PROGRAM_PREFIX is empty, then conflict with gtar-base.

If GNU_PROGRAM_PREFIX is empty, then conflict with gcpio.

Bump PKGREVISION.

diffstat:

 archivers/pax/Makefile |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 5cbc64bb958e -r d7136d0e64f0 archivers/pax/Makefile
--- a/archivers/pax/Makefile    Sat Oct 07 16:21:39 2006 +0000
+++ b/archivers/pax/Makefile    Sat Oct 07 16:52:19 2006 +0000
@@ -1,8 +1,17 @@
-# $NetBSD: Makefile,v 1.28 2006/07/14 20:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/07 16:52:19 reed Exp $
 
 .include "Makefile.common"
 
 CATEGORIES=    archivers
+PKGREVISION=   1
+
+# pax installs "tar" and "cpio"
+.if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == ""
+CONFLICTS+=    gcpio-[0-9]*
+.endif
+.if defined(GTAR_PROGRAM_PREFIX) && ${GTAR_PROGRAM_PREFIX} == ""
+CONFLICTS+=    gtar-base-[0-9]*
+.endif
 
 .include "../../pkgtools/libnbcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index