Make this build on Interix. (Apparently the sysexits.h override operation

in configure.ac was a little backwards....)

4 files changed, 28 insertions, 4 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 492471f1f02..2450677ec9e 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/01/09 22:52:13 recht Exp $
+# $NetBSD: Makefile,v 1.40 2005/01/16 04:44:50 tv Exp $
 #
 
 DISTNAME=       tar-1.15.1
@@ -50,6 +50,11 @@ PLIST_SUBST+=           GTAR_LINK=""
 PLIST_SUBST+=           GTAR_LINK="@comment "
 .endif
 
+# don't include rmt if gtar won't build it
+.if ${OPSYS} != "Interix"
+PLIST_SRC=		${WRKSRC}/.PLIST.rmt ${PKGDIR}/PLIST
+.endif
+
 post-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
 	${INSTALL_DATA} ${FILESDIR}/gtar.1 \
@@ -58,5 +63,8 @@ post-install:
 	${LN} -sf ${GTAR_PROGRAM_PREFIX}tar ${PREFIX}/bin/gtar
 .endif
 
+${WRKSRC}/.PLIST.rmt:
+	${ECHO} 'libexec/${GTAR_PROGRAM_PREFIX}rmt' >$@
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index fff4fc84bbd..c6cf2c60191 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2005/01/09 22:52:13 recht Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/01/16 04:44:50 tv Exp $
 bin/${GTAR_PROGRAM_PREFIX}tar
 ${GTAR_LINK}bin/gtar
-libexec/${GTAR_PROGRAM_PREFIX}rmt
 man/man1/${GTAR_PROGRAM_PREFIX}tar.1
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/tar.mo
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index 80a89ae4586..668bd63f98a 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/01/09 22:52:13 recht Exp $
+$NetBSD: distinfo,v 1.13 2005/01/16 04:44:50 tv Exp $
 
 SHA1 (tar-1.15.1.tar.gz) = 21574ae5d39b698f7f577e2cecc91a5ec89b659c
 Size (tar-1.15.1.tar.gz) = 2204322 bytes
+SHA1 (patch-aa) = adbd252113bfb131de80bbcf8150b2a955e17058
 SHA1 (patch-ab) = db7dc670cab8ba4eab9cf7b8efd79395ac4ea43c
 SHA1 (patch-ac) = 072a7eaff685093b86289e0b45281c41ae06f4fc
 SHA1 (patch-ad) = 8f109cbc150cb7db48b7a59dcba9eefb654875e0
diff --git a/archivers/gtar-base/patches/patch-aa b/archivers/gtar-base/patches/patch-aa
new file mode 100644
index 00000000000..ea491230fb7
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.8 2005/01/16 04:44:50 tv Exp $
+
+--- configure.orig	2004-12-21 08:30:30.000000000 -0500
++++ configure
+@@ -19553,9 +19553,9 @@ if test `eval echo '${'$as_ac_Header'}'`
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- SYSEXITS_H=sysexits.h
+-else
+   SYSEXITS_H=
++else
++  SYSEXITS_H=sysexits.h
+ fi
+ 
+ done