summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2002-12-22 01:34:38 +0000
committerwiz <wiz>2002-12-22 01:34:38 +0000
commit915ef2ae055d88c0137c27358cb0c5d74129ba85 (patch)
tree51700de733c9cb545a041fcb01c674d38b8071d9
parent6c4ec02871978e135cbecb8276a599fa644f6f61 (diff)
downloadpkgsrc-915ef2ae055d88c0137c27358cb0c5d74129ba85.tar.gz
Use GNU_PROGRAM_PREFIX. Based on patch by Jeremy C. Reed.
-rw-r--r--archivers/gtar-base/Makefile15
-rw-r--r--archivers/gtar-base/PLIST6
-rw-r--r--archivers/gtar-base/PLIST.Darwin6
3 files changed, 16 insertions, 11 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index c457c67370d..9b2069d1e22 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/11/30 11:16:19 salo Exp $
+# $NetBSD: Makefile,v 1.24 2002/12/22 01:34:38 wiz Exp $
#
DISTNAME= tar-1.13.25
@@ -17,11 +17,15 @@ USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --program-prefix=g
-CONFIGURE_ARGS+= --with-catgets
-
.include "../../mk/bsd.prefs.mk"
+.if defined(GNU_PROGRAM_PREFIX)
+CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
+.endif
+CONFIGURE_ARGS+= --with-catgets
+PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+BUILD_DEFS+= GNU_PROGRAM_PREFIX
+
.if ${OPSYS} == "Darwin"
PLIST_SRC= ${.CURDIR}/PLIST.Darwin
EXTRACT_SUFX= .tar.gz
@@ -31,6 +35,7 @@ post-patch:
@${ECHO} '' >>${WRKSRC}/po/fr.po
post-install:
- ${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/gtar.1
+ ${INSTALL_DATA} ${FILESDIR}/${GNU_PROGRAM_PREFIX}tar.1 \
+ ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}tar.1
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index f975826f104..5058ac509a7 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/20 16:57:54 bouyer Exp $
-bin/gtar
-man/man1/gtar.1
+@comment $NetBSD: PLIST,v 1.4 2002/12/22 01:34:38 wiz Exp $
+bin/${GNU_PROGRAM_PREFIX}tar
+man/man1/${GNU_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 --git a/archivers/gtar-base/PLIST.Darwin b/archivers/gtar-base/PLIST.Darwin
index 37381df5ba0..dd1a04bfb32 100644
--- a/archivers/gtar-base/PLIST.Darwin
+++ b/archivers/gtar-base/PLIST.Darwin
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2001/12/27 21:50:57 agc Exp $
-bin/gtar
-man/man1/gtar.1
+@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