nb1: Make work on Interix; check for -ldl in configure.in automagically;

install without stripping binaries (so that "arj" works properly)

4 files changed, 48 insertions, 9 deletions

diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 34d21cdf128..cd22d89b96a 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/04/22 20:48:42 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/27 17:16:28 tv Exp $
 # FreeBSD Id: ports/archivers/arj/Makefile,v 1.2 2002/09/17 05:17:29 ijliao Exp
 
 DISTNAME=	arj-3.10.20
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://testcase.newmail.ru/files/
 
@@ -16,7 +17,9 @@ USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${WRKSRC}/gnu/configure
 MAKEFILE=		makefile.gnu
+MAKE_FLAGS+=		INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q}
 
+INSTALL_UNSTRIPPED=	yes # $LOCALBASE/bin/arj must have symbol table
 ARJ_DOCSDIR=		${PREFIX}/share/doc/arj
 
 pre-configure:
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index 85709d23453..a5ed7922a4b 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/04/22 20:16:58 dillo Exp $
+$NetBSD: distinfo,v 1.4 2004/04/27 17:16:28 tv Exp $
 
 SHA1 (arj-3.10.20.tar.gz) = ce818c8127d11efac469c65a9f65572be7e07a5a
 Size (arj-3.10.20.tar.gz) = 428054 bytes
-SHA1 (patch-aa) = 496e52f278c39c86e84247c42861958bbfa2f962
-SHA1 (patch-ab) = d16c31e610b2f06048b14d19a94792f5c9c60370
+SHA1 (patch-aa) = 627dfb018aad8c624c5c88e4f4fdb39bee159b36
+SHA1 (patch-ab) = f5bf9af0bc17ac0bda05d5884d5ef32863dc70ab
 SHA1 (patch-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72
diff --git a/archivers/arj/patches/patch-aa b/archivers/arj/patches/patch-aa
index 8aaf3a89726..0445c385383 100644
--- a/archivers/arj/patches/patch-aa
+++ b/archivers/arj/patches/patch-aa
@@ -1,7 +1,25 @@
-$NetBSD: patch-aa,v 1.3 2004/04/22 20:16:58 dillo Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/27 17:16:28 tv Exp $
 
---- environ.c.orig	Sat Apr 17 15:19:40 2004
+--- environ.c.orig	Sat Apr 17 09:19:40 2004
 +++ environ.c
+@@ -61,7 +61,7 @@
+  #elif defined(__FreeBSD__)||defined(__NetBSD__)
+   #include <sys/param.h>
+   #include <sys/mount.h>
+- #elif defined(__QNXNTO__)
++ #elif defined(__QNXNTO__)||defined(__INTERIX)
+   #include <sys/statvfs.h>
+  #else
+   #include <sys/statfs.h>
+@@ -2286,7 +2286,7 @@ unsigned long file_getfree(char *name)
+   else
+    return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
+  #elif TARGET==UNIX
+-  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
++  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)
+    struct statvfs vfs;
+ 
+    if(statvfs(name, &vfs)==-1)
 @@ -3005,7 +3005,7 @@ void get_exe_name(char *dest, char *arg)
      they are missing altogether, the corresponding code will gracefully
      terminate. */
@@ -20,3 +38,13 @@ $NetBSD: patch-aa,v 1.3 2004/04/22 20:16:58 dillo Exp $
   #else
    dest[0]='\0';
   #endif
+@@ -3802,7 +3802,9 @@ int reset_drive(char *name)
+  #elif TARGET==WIN32
+   return(0);
+  #elif TARGET==UNIX
++  #ifndef __INTERIX
+   sync();
++  #endif
+   return(0);
+  #endif
+ }
diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab
index 1918efc82a7..51f973daaf4 100644
--- a/archivers/arj/patches/patch-ab
+++ b/archivers/arj/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/04/22 20:16:58 dillo Exp $
+$NetBSD: patch-ab,v 1.3 2004/04/27 17:16:28 tv Exp $
 
---- gnu/configure.in.orig	Sat Apr 17 13:28:06 2004
+--- gnu/configure.in.orig	Sat Apr 17 07:28:06 2004
 +++ gnu/configure.in
 @@ -12,7 +12,7 @@ dnl Installation script (let it be, temp
  AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
@@ -11,7 +11,15 @@ $NetBSD: patch-ab,v 1.2 2004/04/22 20:16:58 dillo Exp $
  
  dnl Checks for the canonical system name
  AC_CANONICAL_HOST
-@@ -115,7 +115,7 @@ dnl Initial setup
+@@ -36,6 +36,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])
++AC_SEARCH_LIBS([dlsym], [dl])
+ 
+ dnl Platform-specific tuning
+ PROG_EXT=
+@@ -115,7 +116,7 @@ dnl Initial setup
  
  test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
  AC_SUBST(CONFIG_SHELL)