From 3ca62e00384d0ccc8e82243f207077a7cc60570e Mon Sep 17 00:00:00 2001 From: minskim Date: Tue, 22 Mar 2005 16:24:13 +0000 Subject: Make this package build on Darwin. - Include mount.h to use statfs. - Use chown(2) if lchown(2) is unavailable. (Can be problematic, but no easy solution.) - Pass -bundle to gcc to build a Mach-o bundle format file. --- archivers/arj/distinfo | 10 +++++---- archivers/arj/patches/patch-aa | 12 +++++++---- archivers/arj/patches/patch-ab | 49 ++++++++++++++++++++++++++++++++---------- archivers/arj/patches/patch-ac | 13 +++++++++-- archivers/arj/patches/patch-ad | 12 +++++++++++ archivers/arj/patches/patch-ae | 16 ++++++++++++++ 6 files changed, 91 insertions(+), 21 deletions(-) create mode 100644 archivers/arj/patches/patch-ad create mode 100644 archivers/arj/patches/patch-ae diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo index 581d38a9b98..cf7c8fd3a5f 100644 --- a/archivers/arj/distinfo +++ b/archivers/arj/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.8 2005/02/23 14:45:22 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/03/22 16:24:13 minskim Exp $ SHA1 (arj-3.10.21.tar.gz) = 3599001a762655688dcd1663e100f2d6ebec8227 RMD160 (arj-3.10.21.tar.gz) = e126821cf15abba91bbeeeb771ffd279ffc7d114 Size (arj-3.10.21.tar.gz) = 430807 bytes -SHA1 (patch-aa) = d9d1d7970a00286451a8fcf56e27cd86182e8a99 -SHA1 (patch-ab) = a704418a3c1fe22e4d8c2f72a52483c68b114da6 -SHA1 (patch-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72 +SHA1 (patch-aa) = 015dbd20e8fbd51c9ef185d8a6070feaba473964 +SHA1 (patch-ab) = d97fb922d7d0c4656dfd648d72e132bfd6198355 +SHA1 (patch-ac) = bb74d73a4f07ab9d1d915d3383ba2904caa69573 +SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4 +SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de diff --git a/archivers/arj/patches/patch-aa b/archivers/arj/patches/patch-aa index 8a5f1cb0e8c..422f226a73a 100644 --- a/archivers/arj/patches/patch-aa +++ b/archivers/arj/patches/patch-aa @@ -1,9 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2004/07/27 13:03:39 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2005/03/22 16:24:13 minskim Exp $ ---- environ.c.orig 2004-06-18 18:19:36.000000000 +0200 +--- environ.c.orig Fri Jun 18 11:19:36 2004 +++ environ.c -@@ -61,7 +61,7 @@ - #elif defined(__FreeBSD__)||defined(__NetBSD__) +@@ -58,10 +58,10 @@ + #include + #include + #include +- #elif defined(__FreeBSD__)||defined(__NetBSD__) ++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) #include #include - #elif defined(__QNXNTO__) diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab index 6ef28fc6c67..6f0342ed848 100644 --- a/archivers/arj/patches/patch-ab +++ b/archivers/arj/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2005/01/16 16:57:12 tv Exp $ +$NetBSD: patch-ab,v 1.6 2005/03/22 16:24:13 minskim Exp $ ---- gnu/configure.in.orig 2004-04-17 07:28:06.000000000 -0400 +--- gnu/configure.in.orig 2004-04-17 06:28:06.000000000 -0500 +++ gnu/configure.in @@ -12,13 +12,23 @@ dnl Installation script (let it be, temp AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh]) @@ -27,37 +27,64 @@ $NetBSD: patch-ab,v 1.5 2005/01/16 16:57:12 tv Exp $ dnl Checks for header files. AC_HEADER_STDC -@@ -36,6 +46,7 @@ AC_FUNC_SETVBUF_REVERSED +@@ -35,7 +45,8 @@ AC_FUNC_MEMCMP + 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_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul]) ++AC_CHECK_FUNCS([getcwd lchown 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= -@@ -57,6 +68,11 @@ linux*) - DLL_FLAGS="-shared -export-dynamic" - LD_STRIP="gnu/stripgcc.lnk" +@@ -45,30 +56,42 @@ REQUIRES_DEF= + OS_ID="UNIX" + OS_DEF="-D_UNIX" + DLL_CFLAGS="-fPIC" ++LD_STRIP="-s " + + case $host_os in + linux*) + AC_DEFINE(ELF_EXECUTABLES, 1, [Define if executables use ELF format]) + DYN_LIBS="-ldl" +- LD_STRIP="gnu/stripgcc.lnk" ++ LD_STRIP="-s gnu/stripgcc.lnk" ;; + *bsd*) + AC_DEFINE(ELF_EXECUTABLES) + DLL_FLAGS="-shared -export-dynamic" +- LD_STRIP="gnu/stripgcc.lnk" ++ LD_STRIP="-s gnu/stripgcc.lnk" ++ ;; ++darwin*) ++ DLL_FLAGS="-bundle" ++ LD_STRIP="" ++ ;; +interix3*) + # not ELF + DLL_FLAGS="-shared" + DLL_CFLAGS="" -+ ;; + ;; *qnx*) AC_DEFINE(ELF_EXECUTABLES) DLL_FLAGS="-shared -fPIC" -@@ -68,7 +84,9 @@ linux*) + DLL_CFLAGS="-shared -fPIC" +- LD_STRIP="gnu/stripgcc.lnk" ++ LD_STRIP="-s gnu/stripgcc.lnk" + ;; + *solaris*) + AC_DEFINE(ELF_EXECUTABLES) CFLAGS="-DSUNOS -D_UNIX" DLL_FLAGS="-shared -fPIC" DLL_CFLAGS="-shared -fPIC" +- LD_STRIP="gnu/stripgcc.lnk" + if test X"$ac_cv_prog_gnu_ld" = X"yes"; then - LD_STRIP="gnu/stripgcc.lnk" ++ LD_STRIP="-s gnu/stripgcc.lnk" + fi ;; os2*) PROG_EXT=".exe" -@@ -115,7 +133,7 @@ dnl Initial setup +@@ -115,7 +138,7 @@ dnl Initial setup test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh AC_SUBST(CONFIG_SHELL) diff --git a/archivers/arj/patches/patch-ac b/archivers/arj/patches/patch-ac index cde1c686b91..31f2dce089b 100644 --- a/archivers/arj/patches/patch-ac +++ b/archivers/arj/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.2 2004/04/22 20:16:58 dillo Exp $ +$NetBSD: patch-ac,v 1.3 2005/03/22 16:24:13 minskim Exp $ ---- gnu/makefile.in.orig Sat Apr 17 13:28:06 2004 +--- gnu/makefile.in.orig Sat Apr 17 06:28:06 2004 +++ gnu/makefile.in +@@ -53,7 +53,7 @@ DEBUG_SM = d + ALL_CFLAGS += -g -DDEBUG + else + DEBUG_SM = r +-ADD_LDFLAGS = -s @LD_STRIP@ ++ADD_LDFLAGS = @LD_STRIP@ + endif + + ALL_CFLAGS += $(CFLAGS) @@ -166,7 +166,7 @@ MAKE_KEY=$(TOOLS_DIR)/make_key$x endif diff --git a/archivers/arj/patches/patch-ad b/archivers/arj/patches/patch-ad new file mode 100644 index 00000000000..2b341ad077a --- /dev/null +++ b/archivers/arj/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2005/03/22 16:24:13 minskim Exp $ + +--- gnu/config.h.in.orig Sat Apr 17 05:33:38 2004 ++++ gnu/config.h.in +@@ -4,6 +4,7 @@ + #undef LIBC + #undef NP_SFX + #undef ELF_EXECUTABLES ++#undef HAVE_LCHOWN + #undef HAVE_MKDTEMP + #undef HAVE_FCLOSEALL + #undef HAVE_SETPRIORITY diff --git a/archivers/arj/patches/patch-ae b/archivers/arj/patches/patch-ae new file mode 100644 index 00000000000..62cf8281dbe --- /dev/null +++ b/archivers/arj/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1 2005/03/22 16:24:13 minskim Exp $ + +--- uxspec.c.orig Sat Apr 17 06:39:42 2004 ++++ uxspec.c +@@ -13,6 +13,11 @@ + #include + #endif + ++#include "c_defs.h" ++#ifndef HAVE_LCHOWN ++#define lchown chown ++#endif ++ + DEBUGHDR(__FILE__) /* Debug information block */ + + /* UXSPECIAL block types */ -- cgit v1.2.3