[pkgsrc/trunk]: pkgsrc/archivers/gcpio * Add a CONFLICT with gtar-base (libex...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbcc76959756
branches:  trunk
changeset: 509945:cbcc76959756
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 20 04:14:47 2006 +0000

description:
* 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:

 archivers/gcpio/Makefile |  13 ++++++-------
 archivers/gcpio/PLIST    |   3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r 4bf1dd0dd7af -r cbcc76959756 archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile  Mon Mar 20 04:09:37 2006 +0000
+++ b/archivers/gcpio/Makefile  Mon Mar 20 04:14:47 2006 +0000
@@ -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 @@
 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 -r 4bf1dd0dd7af -r cbcc76959756 archivers/gcpio/PLIST
--- a/archivers/gcpio/PLIST     Mon Mar 20 04:09:37 2006 +0000
+++ b/archivers/gcpio/PLIST     Mon Mar 20 04:14:47 2006 +0000
@@ -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