diff options
| author | reed <reed@pkgsrc.org> | 2006-10-07 16:52:19 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2006-10-07 16:52:19 +0000 |
| commit | 717e353fe61038dada5645174f75b2d68ee038fc (patch) | |
| tree | e6a4f44b4744991ec327f4dfff811aa83fe30fc4 /archivers | |
| parent | c3f7c6136b28bc53dec6ba591883db503c396bfe (diff) | |
| download | pkgsrc-717e353fe61038dada5645174f75b2d68ee038fc.tar.gz | |
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 (limited to 'archivers')
| -rw-r--r-- | archivers/pax/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
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" |