summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-20 04:14:47 +0000
committerjlam <jlam@pkgsrc.org>2006-03-20 04:14:47 +0000
commit129ff4b22e17003fcf1b1b2fef7c01567e4d8407 (patch)
tree2c97b94ea69c39d40532f53c2e6e79a544d88343 /archivers
parent2c46420eafb25bcf55a83d3484c84ec009d21bf6 (diff)
downloadpkgsrc-129ff4b22e17003fcf1b1b2fef7c01567e4d8407.tar.gz
* Add a CONFLICT with gtar-base (libexec/rmt).
* LIBS is an "OPSYS" variable, so avoid the unnecessary conditional. * List the info files in the PLIST. Bump the PKGREVISION to 3.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/gcpio/Makefile13
-rw-r--r--archivers/gcpio/PLIST3
2 files changed, 8 insertions, 8 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index f022c0fb47b..0bc1ace1d36 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2006/03/05 16:27:22 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/03/20 04:14:47 jlam Exp $
#
DISTNAME= cpio-2.6
-PKGREVISION= 2
+PKGREVISION= 3
PKGNAME= g${DISTNAME}
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=cpio/}
@@ -11,20 +11,19 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/cpio/cpio.html
COMMENT= GNU copy-in/out (cpio) with remote magnetic tape (rmt) support
+CONFLICTS+= gtar-base-[0-9]*
+
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
USE_TOOLS+= makeinfo
+INFO_FILES= # PLIST
TEST_TARGET= check
-INFO_FILES= cpio.info
-
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-LIBS+= -lgnumalloc
-.endif
+LIBS.NetBSD+= -lgnumalloc
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
diff --git a/archivers/gcpio/PLIST b/archivers/gcpio/PLIST
index e08c736a449..c70b0027492 100644
--- a/archivers/gcpio/PLIST
+++ b/archivers/gcpio/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2005/11/03 19:38:51 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/20 04:14:47 jlam Exp $
bin/${GNU_PROGRAM_PREFIX}cpio
+info/cpio.info
libexec/${GNU_PROGRAM_PREFIX}rmt
man/man1/${GNU_PROGRAM_PREFIX}cpio.1
man/man1/${GNU_PROGRAM_PREFIX}mt.1