Make build on Interix.

3 files changed, 27 insertions, 14 deletions

diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index b65fa1b1776..6432c45ac5d 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/07/27 13:03:39 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/01/16 16:57:12 tv Exp $
 
 SHA1 (arj-3.10.21.tar.gz) = 3599001a762655688dcd1663e100f2d6ebec8227
 Size (arj-3.10.21.tar.gz) = 430807 bytes
 SHA1 (patch-aa) = d9d1d7970a00286451a8fcf56e27cd86182e8a99
-SHA1 (patch-ab) = c588776f9b8e2331471be07e6acd3b873af84fbc
+SHA1 (patch-ab) = a704418a3c1fe22e4d8c2f72a52483c68b114da6
 SHA1 (patch-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72
diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab
index bb17c0dad53..6ef28fc6c67 100644
--- a/archivers/arj/patches/patch-ab
+++ b/archivers/arj/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2004/07/10 17:39:50 salo Exp $
+$NetBSD: patch-ab,v 1.5 2005/01/16 16:57:12 tv Exp $
 
---- gnu/configure.in.orig	Sat Apr 17 13:28:06 2004
-+++ gnu/configure.in	Sat Jul 10 19:24:37 2004
-@@ -12,7 +12,7 @@
+--- gnu/configure.in.orig	2004-04-17 07:28:06.000000000 -0400
++++ gnu/configure.in
+@@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
  AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
  
  dnl Configuration parameters
@@ -11,7 +11,6 @@ $NetBSD: patch-ab,v 1.4 2004/07/10 17:39:50 salo Exp $
  
  dnl Checks for the canonical system name
  AC_CANONICAL_HOST
-@@ -19,6 +19,16 @@
  
  dnl Checks for programs.
  AC_PROG_CC
@@ -28,7 +27,7 @@ $NetBSD: patch-ab,v 1.4 2004/07/10 17:39:50 salo Exp $
  
  dnl Checks for header files.
  AC_HEADER_STDC
-@@ -36,6 +46,7 @@
+@@ -36,6 +46,7 @@ AC_FUNC_SETVBUF_REVERSED
  AC_TYPE_SIGNAL
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
@@ -36,7 +35,19 @@ $NetBSD: patch-ab,v 1.4 2004/07/10 17:39:50 salo Exp $
  
  dnl Platform-specific tuning
  PROG_EXT=
-@@ -68,7 +79,9 @@
+@@ -57,6 +68,11 @@ linux*)
+         DLL_FLAGS="-shared -export-dynamic"
+         LD_STRIP="gnu/stripgcc.lnk"
+ 	;;
++interix3*)
++	# not ELF
++	DLL_FLAGS="-shared"
++	DLL_CFLAGS=""
++	;;
+ *qnx*)
+ 	AC_DEFINE(ELF_EXECUTABLES)
+         DLL_FLAGS="-shared -fPIC"
+@@ -68,7 +84,9 @@ linux*)
          CFLAGS="-DSUNOS -D_UNIX"
          DLL_FLAGS="-shared -fPIC"
          DLL_CFLAGS="-shared -fPIC"
@@ -46,7 +57,7 @@ $NetBSD: patch-ab,v 1.4 2004/07/10 17:39:50 salo Exp $
  	;;
  os2*)
  	PROG_EXT=".exe"
-@@ -115,7 +128,7 @@
+@@ -115,7 +133,7 @@ dnl Initial setup
  
  test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
  AC_SUBST(CONFIG_SHELL)
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index ee32234f361..b3d135871a5 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/07/28 02:47:35 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/16 16:57:55 tv Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
@@ -23,10 +23,12 @@ PRGNAME=	xbin
 EXTRACT_ONLY=	# empty
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
-CFLAGS+=	-DBSD
-LDFLAGS+=	-lcompat
+
+.if !empty(OPSYS:M*BSD)
+CFLAGS+=		-DBSD
+LDFLAGS+=		-lcompat
 .endif
+CFLAGS.Interix+=	-DBSD
 
 INSTALLATION_DIRS=	bin man/cat1