Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

5 files changed, 41 insertions, 37 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 3f6ebe947cb..27216b157f0 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/01/27 18:32:32 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:49:06 jlam Exp $
 #
 
 DISTNAME=       tar-1.12
@@ -6,39 +6,30 @@ PKGNAME=	gtar-base-1.12
 SVR4_PKGNAME=	gtarb
 CATEGORIES=	archivers
 MASTER_SITES=   ${MASTER_SITE_GNU:=tar/}
+EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	The GNU tape archiver with remote magnetic tape support
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --program-prefix=g --with-catgets
+USE_BUILDLINK2=		YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--program-prefix=g --with-catgets
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "Darwin"
-EXTRACT_SUFX=	.shar.gz
-.endif
-
-.if (${OPSYS} != "NetBSD")
-PLIST_SRC=	${WRKDIR}/PLIST
-
-post-configure:
-	@${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile
-
-pre-install:
-	-${RM} -f ${PLIST_SRC}
-.  if ${OPSYS} == "Darwin"
-	${CP} ${PKGDIR}/PLIST.Darwin ${PLIST_SRC}
-.  else
-	${CAT} ${PKGDIR}/PLIST | ${SED} -e 's/cat$$/mo/' > ${PLIST_SRC}
-.  endif
+.if ${OPSYS} == "NetBSD"
+PLIST_SRC=	${.CURDIR}/PLIST.NetBSD
+.elif ${OPSYS} == "Darwin"
+PLIST_SRC=	${.CURDIR}/PLIST.Darwin
+EXTRACT_SUFX=	.tar.gz
 .endif
 
 post-patch:
 	@${ECHO} '' >>${WRKSRC}/po/fr.po
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/gtar.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index dc17ba3a67c..440c864adb5 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:49:06 jlam Exp $
 bin/gtar
 man/man1/gtar.1
-share/locale/de/LC_MESSAGES/tar.cat
-share/locale/fr/LC_MESSAGES/tar.cat
-share/locale/it/LC_MESSAGES/tar.cat
-share/locale/ko/LC_MESSAGES/tar.cat
-share/locale/nl/LC_MESSAGES/tar.cat
-share/locale/no/LC_MESSAGES/tar.cat
-share/locale/pl/LC_MESSAGES/tar.cat
-share/locale/pt/LC_MESSAGES/tar.cat
-share/locale/sl/LC_MESSAGES/tar.cat
-share/locale/sv/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/tar.mo
diff --git a/archivers/gtar-base/PLIST.NetBSD b/archivers/gtar-base/PLIST.NetBSD
new file mode 100644
index 00000000000..cdfcc64e48a
--- /dev/null
+++ b/archivers/gtar-base/PLIST.NetBSD
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2002/08/25 21:49:07 jlam Exp $
+bin/gtar
+man/man1/gtar.1
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/tar.cat
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index 1632c1db074..bda4d8fde09 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/12/27 21:50:57 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:07 jlam Exp $
 
 SHA1 (tar-1.12.tar.gz) = a426b8551a4b61289a1bb6d677ada162f8bbc51a
 Size (tar-1.12.tar.gz) = 867759 bytes
@@ -7,5 +7,5 @@ Size (tar-1.12.shar.gz) = 1258219 bytes
 SHA1 (patch-aa) = c0254788ea22dfdd746fb9c2bead8f93370e493e
 SHA1 (patch-ab) = 7f58c1c752b7f5c020087dd4a2471887b5888c44
 SHA1 (patch-ac) = 7b91433854e291cd963839cafe41441b5e09b6da
-SHA1 (patch-ad) = 06bce623e2c6041fc2a479154cd4e0853d4a560e
+SHA1 (patch-ad) = f3190475eb03e6b1dfe0dd7841ec77c2143d58c0
 SHA1 (patch-ae) = 21862d6e4dfc81904ef2ae6276bce6c8131b5841
diff --git a/archivers/gtar-base/patches/patch-ad b/archivers/gtar-base/patches/patch-ad
index 02a67170ebf..90179926b10 100644
--- a/archivers/gtar-base/patches/patch-ad
+++ b/archivers/gtar-base/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 1999/09/18 14:52:26 kim Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 21:49:08 jlam Exp $
 
 --- configure.orig	Fri Apr 25 16:03:34 1997
 +++ configure	Fri Sep 17 23:08:21 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 1999/09/18 14:52:26 kim Exp $
    rm -rf conftest*
    CATOBJEXT=.mo
 -		   DATADIRNAME=lib
-+		   DATADIRNAME=share
++		   DATADIRNAME=${PKGLOCALEDIR}
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.3 1999/09/18 14:52:26 kim Exp $
  		 CATOBJEXT=.cat
  		 INSTOBJEXT=.cat
 -		 DATADIRNAME=lib
-+		 DATADIRNAME=share
++		 DATADIRNAME=${PKGLOCALEDIR}
  		 INTLDEPS="../intl/libintl.a"
  		 INTLLIBS=$INTLDEPS
  		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`