Changes to allow bootstrapping Zoularis:

- fetch the shar file so we don't need tar
- do not install info files (they will be a separate pkg), as we need
  tar to unpack the gtexinfo distribution
- on Solaris we get .mo files instead of .cat files (I'm guessing for
  Linux, please someone verify and adjust Makefile appropriately)

6 files changed, 45 insertions, 21 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 283ea92465e..dabac6fbf4b 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,19 +1,31 @@
-# $NetBSD: Makefile,v 1.11 1999/04/14 21:39:01 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/09/18 03:36:23 kim Exp $
 #
 
 DISTNAME=       tar-1.12
 PKGNAME=	gtar-1.12
 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
 
-USE_GTEXINFO=	yes
+EXTRACT_CMD=	${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${SH}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --program-prefix=g --with-catgets
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} != "NetBSD")
+PLIST_SRC=	${WRKDIR}/PLIST
+
+pre-install:
+	-${RM} -f ${WRKDIR}/PLIST
+	${CAT} ${PKGDIR}/PLIST | ${SED} -e 's/cat$$/mo/' > ${WRKDIR}/PLIST
+
+.endif
+
 post-patch:
 	@${ECHO} '' >>${WRKSRC}/po/fr.po
 
diff --git a/archivers/gtar/files/md5 b/archivers/gtar/files/md5
index 426f28bc72c..00fb5a4917e 100644
--- a/archivers/gtar/files/md5
+++ b/archivers/gtar/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:16:50 agc Exp $
+$NetBSD: md5,v 1.3 1999/09/18 03:36:24 kim Exp $
 
-MD5 (tar-1.12.tar.gz) = 89f2164a014719adc597c333fba89580
+MD5 (tar-1.12.shar.gz) = 2de18b48856dac3c76863d6eb2b7e5f9
diff --git a/archivers/gtar/files/patch-sum b/archivers/gtar/files/patch-sum
index 1f5ac57a235..09408fb311f 100644
--- a/archivers/gtar/files/patch-sum
+++ b/archivers/gtar/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.2 1999/08/10 05:05:39 christos Exp $
+$NetBSD: patch-sum,v 1.3 1999/09/18 03:36:24 kim Exp $
 
 MD5 (patch-aa) = bcc4f474df0bec91c68b2a0a74d94ce5
 MD5 (patch-ab) = c084f2dec72afbc738780f1ef24339f1
 MD5 (patch-ac) = e4f3ddfab9b1a9dfeddbb2d7a977dcc5
-MD5 (patch-ad) = bff27b6077f59c33af7629fd071efe96
+MD5 (patch-ad) = a205544ef8de6e37cbcd85f0b3d8863f
+MD5 (patch-ae) = 1247d0b77f15168128953e9d01b1f0ea
diff --git a/archivers/gtar/patches/patch-ad b/archivers/gtar/patches/patch-ad
index cca5abde475..8c1d1c54276 100644
--- a/archivers/gtar/patches/patch-ad
+++ b/archivers/gtar/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 1998/08/15 00:12:10 tv Exp $
+$NetBSD: patch-ad,v 1.2 1999/09/18 03:36:24 kim Exp $
 
---- configure.orig	Fri Aug 14 19:35:25 1998
-+++ configure	Fri Aug 14 19:35:33 1998
+--- configure.orig	Fri Apr 25 16:03:34 1997
++++ configure	Fri Sep 17 23:08:21 1999
+@@ -4255,7 +4255,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
 @@ -4509,7 +4509,7 @@
  		 USE_INCLUDED_LIBINTL=yes
  		 CATOBJEXT=.cat
diff --git a/archivers/gtar/patches/patch-ae b/archivers/gtar/patches/patch-ae
new file mode 100644
index 00000000000..65986ff8020
--- /dev/null
+++ b/archivers/gtar/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 1999/09/18 03:36:24 kim Exp $
+
+--- Makefile.in.orig	Fri Apr 25 20:21:38 1997
++++ Makefile.in	Fri Sep 17 22:46:37 1999
+@@ -104,7 +104,7 @@
+ 
+ BABYL = rmail/* admin/*/RMAIL
+ EXTRA_DIST = AC-PATCHES AM-PATCHES BI-PATCHES PORTS rebox.el
+-SUBDIRS = doc lib intl src scripts po tests
++SUBDIRS = lib intl src scripts po tests
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ CONFIG_HEADER_IN = config.h.in
+ CONFIG_HEADER_FULL = config.h
diff --git a/archivers/gtar/pkg/PLIST b/archivers/gtar/pkg/PLIST
index 076490f3817..cec21d58677 100644
--- a/archivers/gtar/pkg/PLIST
+++ b/archivers/gtar/pkg/PLIST
@@ -1,16 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 1999/02/11 19:17:28 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/09/18 03:36:24 kim Exp $
 bin/gtar
-@unexec install-info --delete --info-dir=%D/info %D/info/tar.info
-info/tar.info
-info/tar.info-1
-info/tar.info-2
-info/tar.info-3
-info/tar.info-4
-info/tar.info-5
-info/tar.info-6
-info/tar.info-7
-info/tar.info-8
-@exec install-info --info-dir=%D/info %D/info/tar.info
 man/man1/gtar.1
 share/locale/de/LC_MESSAGES/tar.cat
 share/locale/fr/LC_MESSAGES/tar.cat