On Darwin, use tar-1.12.tar.gz, rather than the shar format archive,

since this shows up problems on NFS-mounted pkgsrc archives on Darwin.

On Darwin, don't try to make the po message files, since msgfmt doesn't
yet exist.

These changes allow bootstrapping the gtar-base package on Darwin.

4 files changed, 31 insertions, 12 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 279e29f46a0..12e8c72a749 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/10/19 09:02:38 veego Exp $
+# $NetBSD: Makefile,v 1.18 2001/12/27 21:50:56 agc Exp $
 #
 
 DISTNAME=       tar-1.12
@@ -6,19 +6,21 @@ 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
 
-EXTRACT_CMD=	${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${SH}
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --program-prefix=g --with-catgets
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} != "Darwin"
+EXTRACT_SUFX=	.shar.gz
+EXTRACT_CMD=	${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${SH}
+.endif
+
 .if (${OPSYS} != "NetBSD")
 PLIST_SRC=	${WRKDIR}/PLIST
 
@@ -26,8 +28,12 @@ post-configure:
 	@${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile
 
 pre-install:
-	-${RM} -f ${WRKDIR}/PLIST
-	${CAT} ${PKGDIR}/PLIST | ${SED} -e 's/cat$$/mo/' > ${WRKDIR}/PLIST
+	-${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
 .endif
 
 post-patch:
diff --git a/archivers/gtar-base/PLIST.Darwin b/archivers/gtar-base/PLIST.Darwin
new file mode 100644
index 00000000000..37381df5ba0
--- /dev/null
+++ b/archivers/gtar-base/PLIST.Darwin
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2001/12/27 21:50:57 agc Exp $
+bin/gtar
+man/man1/gtar.1
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index e36ff71a68e..1632c1db074 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:21:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/12/27 21:50:57 agc Exp $
 
+SHA1 (tar-1.12.tar.gz) = a426b8551a4b61289a1bb6d677ada162f8bbc51a
+Size (tar-1.12.tar.gz) = 867759 bytes
 SHA1 (tar-1.12.shar.gz) = 4cab31f6be9c6803679213a46bb3432670a151fc
 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-ae) = 5c1f69eb71908b5690ab63909e5f1988f230e716
+SHA1 (patch-ae) = 21862d6e4dfc81904ef2ae6276bce6c8131b5841
diff --git a/archivers/gtar-base/patches/patch-ae b/archivers/gtar-base/patches/patch-ae
index 78f93e53f18..cfa2d83fae4 100644
--- a/archivers/gtar-base/patches/patch-ae
+++ b/archivers/gtar-base/patches/patch-ae
@@ -1,13 +1,21 @@
-$NetBSD: patch-ae,v 1.2 1999/09/18 14:52:32 kim Exp $
+$NetBSD: patch-ae,v 1.3 2001/12/27 21:50:57 agc Exp $
 
---- Makefile.in.orig	Fri Apr 25 20:21:38 1997
-+++ Makefile.in	Fri Sep 17 22:46:37 1999
-@@ -104,7 +104,7 @@
+--- Makefile.in.orig	Fri Apr 25 20:21:57 1997
++++ Makefile.in	Thu Dec 27 16:28:31 2001
+@@ -102,9 +102,15 @@
  
+ AUTOMAKE_OPTIONS = gnits dist-shar
+ 
++OPSYS!= uname -s
++
  BABYL = rmail/* admin/*/RMAIL
  EXTRA_DIST = AC-PATCHES AM-PATCHES BI-PATCHES PORTS rebox.el
 -SUBDIRS = doc lib intl src scripts po tests
++.if ${OPSYS} == "Darwin"
++SUBDIRS = lib intl src scripts tests
++.else
 +SUBDIRS = lib intl src scripts po tests
++.endif
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIG_HEADER_IN = config.h.in
  CONFIG_HEADER_FULL = config.h