Fri Mar 9 10:20:15 2012 UTC ()
Only conflict with gtar-base and gcpio if NBPAX_PROGRAM_PREFIX empty.


(fhajny)
diff -r1.44 -r1.45 pkgsrc/archivers/pax/Makefile
cvs diff -r1.44 -r1.45 pkgsrc/archivers/pax/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/pax/Makefile 2012/03/04 19:50:21 1.44
+++ pkgsrc/archivers/pax/Makefile 2012/03/09 10:20:15 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.44 2012/03/04 19:50:21 joerg Exp $ 1# $NetBSD: Makefile,v 1.45 2012/03/09 10:20:15 fhajny Exp $
2 2
3DISTNAME= pax-20080110 3DISTNAME= pax-20080110
4CATEGORIES= archivers 4CATEGORIES= archivers
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://www.NetBSD.org/ 9HOMEPAGE= http://www.NetBSD.org/
10COMMENT= POSIX standard archiver with many extensions 10COMMENT= POSIX standard archiver with many extensions
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13BOOTSTRAP_PKG= yes 13BOOTSTRAP_PKG= yes
14CHECK_PERMS= no 14CHECK_PERMS= no
@@ -16,30 +16,32 @@ CHECK_PERMS= no @@ -16,30 +16,32 @@ CHECK_PERMS= no
16MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} 16MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
17 17
18USE_FEATURES= nbcompat 18USE_FEATURES= nbcompat
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22 22
23.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != "" 23.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
24CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q} 24CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
25 25
26.else 26.else
27 27
28# pax installs "tar" and "cpio" 28# pax installs "tar" and "cpio"
29.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) 29.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) && \
 30 (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
30CONFLICTS+= gcpio-[0-9]* 31CONFLICTS+= gcpio-[0-9]*
31.endif 32.endif
32.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) 33.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) && \
 34 (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
33CONFLICTS+= gtar-base-[0-9]* 35CONFLICTS+= gtar-base-[0-9]*
34.endif 36.endif
35 37
36.endif 38.endif
37 39
38PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q} 40PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}
39BUILD_DEFS+= NBPAX_PROGRAM_PREFIX 41BUILD_DEFS+= NBPAX_PROGRAM_PREFIX
40 42
41GNU_CONFIGURE= yes 43GNU_CONFIGURE= yes
42 44
43do-extract: 45do-extract:
44 ${CP} -R ${FILESDIR} ${WRKSRC} 46 ${CP} -R ${FILESDIR} ${WRKSRC}
45 47