From d0574f73510b513227f684116f9141c9bd4f67d5 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Sat, 7 Oct 2006 16:52:19 +0000
Subject: 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.
---
 archivers/pax/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'archivers/pax')

diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 7bef5336c51..6128aa94dff 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -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"
-- 
cgit v1.2.3