diff options
| author | fhajny <fhajny> | 2012-03-09 10:13:29 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2012-03-09 10:13:29 +0000 |
| commit | 828b479117844c0113a85a924bc1581ee60e103b (patch) | |
| tree | 236dae9b986ad236088c3a4b4f89e4845bffdc19 /archivers | |
| parent | f52998cc687bccb655650180eedc99f569b759d5 (diff) | |
| download | pkgsrc-828b479117844c0113a85a924bc1581ee60e103b.tar.gz | |
Only conflict with archivers/pax if NBPAX_PROGRAM_PREFIX empty.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/gtar-base/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index 1bb1858cc84..255cc0d4508 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2011/05/11 07:49:58 adam Exp $ +# $NetBSD: Makefile,v 1.72 2012/03/09 10:13:29 fhajny Exp $ DISTNAME= tar-1.26 PKGNAME= ${DISTNAME:S/tar/gtar-base/} @@ -32,7 +32,8 @@ GTAR_PROGRAM_PREFIX?= ${GNU_PROGRAM_PREFIX} GTAR_PROGRAM_PREFIX?= g .endif -.if ${GTAR_PROGRAM_PREFIX} == "" +.if ${GTAR_PROGRAM_PREFIX} == "" && \ + (!defined(NBPAX_PROGRAM_PREFIX) || ${NBPAX_PROGRAM_PREFIX} == "") # pax installs a "tar" also CONFLICTS+= pax-[0-9]* .else |