[pkgsrc/trunk]: pkgsrc/archivers/gtar-base If GNU_PROGRAM_PREFIX is not "g" o...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dae8386f7e4e
branches:  trunk
changeset: 472164:dae8386f7e4e
user:      reed <reed%pkgsrc.org@localhost>
date:      Mon Apr 05 18:38:43 2004 +0000

description:
If GNU_PROGRAM_PREFIX is not "g" or not set, then still install
with "g" prefix.  Allow this to be optionally forced by defining
GTAR_PROGRAM_PREFIX.  If GTAR_PROGRAM_PREFIX is set to nothing,
then conflict with pax, because both install a "tar".

So now the default is to install as "gtar" even if GNU_PROGRAM_PREFIX
is set to "".

Bump package revision for this.

This is for part of my PR #22693.

diffstat:

 archivers/gtar-base/Makefile     |  29 ++++++++++++++++++++---------
 archivers/gtar-base/PLIST        |   6 +++---
 archivers/gtar-base/PLIST.Darwin |   6 +++---
 3 files changed, 26 insertions(+), 15 deletions(-)

diffs (82 lines):

diff -r b3ec17b84ab6 -r dae8386f7e4e archivers/gtar-base/Makefile
--- a/archivers/gtar-base/Makefile      Mon Apr 05 18:17:42 2004 +0000
+++ b/archivers/gtar-base/Makefile      Mon Apr 05 18:38:43 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2004/03/11 18:03:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.34 2004/04/05 18:38:43 reed Exp $
 #
 
 DISTNAME=       tar-1.13.25
 PKGNAME=       gtar-base-1.13.25
-PKGREVISION=   1
+PKGREVISION=   2
 SVR4_PKGNAME=  gtarb
 CATEGORIES=    archivers
 MASTER_SITES=  ftp://alpha.gnu.org/gnu/tar/ \
@@ -22,14 +22,25 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX}
+.if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} != ""
+GTAR_PROGRAM_PREFIX?=  ${GNU_PROGRAM_PREFIX}
+.else
+GTAR_PROGRAM_PREFIX?=  g
 .endif
+
+.if ${GTAR_PROGRAM_PREFIX} == ""
+# pax installs a "tar" also
+CONFLICTS+=            pax-[0-9]*
+.else
+CONFIGURE_ARGS+=       --program-prefix=${GTAR_PROGRAM_PREFIX}
+.endif
+
 CONFIGURE_ARGS+=       --with-catgets
-PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+=          GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX}
 BUILD_DEFS+=           GNU_PROGRAM_PREFIX
+BUILD_DEFS+=           GTAR_PROGRAM_PREFIX
 
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
+.if ${GTAR_PROGRAM_PREFIX} != "g"
 PLIST_SUBST+=           GTAR_LINK=""
 .else
 PLIST_SUBST+=           GTAR_LINK="@comment "
@@ -40,9 +51,9 @@
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/gtar.1 \
-               ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}tar.1
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-       ${LN} -sf ${GNU_PROGRAM_PREFIX}tar ${PREFIX}/bin/gtar
+               ${PREFIX}/man/man1/${GTAR_PROGRAM_PREFIX}tar.1
+.if ${GTAR_PROGRAM_PREFIX} != "g"
+       ${LN} -sf ${GTAR_PROGRAM_PREFIX}tar ${PREFIX}/bin/gtar
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r b3ec17b84ab6 -r dae8386f7e4e archivers/gtar-base/PLIST
--- a/archivers/gtar-base/PLIST Mon Apr 05 18:17:42 2004 +0000
+++ b/archivers/gtar-base/PLIST Mon Apr 05 18:38:43 2004 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/20 23:23:57 jschauma Exp $
-bin/${GNU_PROGRAM_PREFIX}tar
+@comment $NetBSD: PLIST,v 1.6 2004/04/05 18:38:43 reed Exp $
+bin/${GTAR_PROGRAM_PREFIX}tar
 ${GTAR_LINK}bin/gtar
-man/man1/${GNU_PROGRAM_PREFIX}tar.1
+man/man1/${GTAR_PROGRAM_PREFIX}tar.1
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.mo
diff -r b3ec17b84ab6 -r dae8386f7e4e archivers/gtar-base/PLIST.Darwin
--- a/archivers/gtar-base/PLIST.Darwin  Mon Apr 05 18:17:42 2004 +0000
+++ b/archivers/gtar-base/PLIST.Darwin  Mon Apr 05 18:38:43 2004 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2002/12/22 01:34:38 wiz Exp $
-bin/${GNU_PROGRAM_PREFIX}tar
-man/man1/${GNU_PROGRAM_PREFIX}tar.1
+@comment $NetBSD: PLIST.Darwin,v 1.3 2004/04/05 18:38:43 reed Exp $
+bin/${GTAR_PROGRAM_PREFIX}tar
+man/man1/${GTAR_PROGRAM_PREFIX}tar.1