diff options
-rw-r--r-- | archivers/arj/Makefile | 7 | ||||
-rw-r--r-- | archivers/arj/distinfo | 10 | ||||
-rw-r--r-- | archivers/arj/patches/patch-ab | 23 |
3 files changed, 21 insertions, 19 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile index 336cccfa587..f37b766a17f 100644 --- a/archivers/arj/Makefile +++ b/archivers/arj/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:28:52 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/03/05 21:40:57 adam Exp $ -DISTNAME= arj-3.10.21 -PKGREVISION= 1 +DISTNAME= arj-3.10.22 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arj/} @@ -13,10 +12,10 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= autoconf gmake GNU_CONFIGURE= yes +CONFIGURE_ENV+= LD=${LD:Q} CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure MAKEFILE= makefile.gnu MAKE_FLAGS+= INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q} -CONFIGURE_ENV+= LD=${LD:Q} INSTALL_UNSTRIPPED= yes # $LOCALBASE/bin/arj must have symbol table ARJ_DOCSDIR= ${PREFIX}/share/doc/arj diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo index ba24f8f719b..7d7389a157c 100644 --- a/archivers/arj/distinfo +++ b/archivers/arj/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.11 2005/10/07 16:52:06 joerg Exp $ +$NetBSD: distinfo,v 1.12 2006/03/05 21:40:57 adam 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 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b +RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153 +Size (arj-3.10.22.tar.gz) = 431467 bytes SHA1 (patch-aa) = 7dc0000f3d0c0974a40bbea7d9103449cb89b4b9 -SHA1 (patch-ab) = d97fb922d7d0c4656dfd648d72e132bfd6198355 +SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d SHA1 (patch-ac) = bb74d73a4f07ab9d1d915d3383ba2904caa69573 SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4 SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab index 6f0342ed848..e9f0320a564 100644 --- a/archivers/arj/patches/patch-ab +++ b/archivers/arj/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.6 2005/03/22 16:24:13 minskim Exp $ +$NetBSD: patch-ab,v 1.7 2006/03/05 21:40:57 adam Exp $ ---- gnu/configure.in.orig 2004-04-17 06:28:06.000000000 -0500 +--- gnu/configure.in.orig 2005-06-21 20:27:20.000000000 +0200 +++ gnu/configure.in @@ -12,13 +12,23 @@ dnl Installation script (let it be, temp AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh]) @@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.6 2005/03/22 16:24:13 minskim Exp $ dnl Platform-specific tuning PROG_EXT= -@@ -45,30 +56,42 @@ REQUIRES_DEF= +@@ -45,22 +56,27 @@ REQUIRES_DEF= OS_ID="UNIX" OS_DEF="-D_UNIX" DLL_CFLAGS="-fPIC" @@ -50,6 +50,12 @@ $NetBSD: patch-ab,v 1.6 2005/03/22 16:24:13 minskim Exp $ - LD_STRIP="gnu/stripgcc.lnk" + LD_STRIP="-s gnu/stripgcc.lnk" ;; + k*bsd*) + AC_DEFINE(ELF_EXECUTABLES) + DYN_LIBS="-ldl" +- LD_STRIP="gnu/stripgcc.lnk" ++ LD_STRIP="-s gnu/stripgcc.lnk" + ;; *bsd*) AC_DEFINE(ELF_EXECUTABLES) DLL_FLAGS="-shared -export-dynamic" @@ -59,13 +65,10 @@ $NetBSD: patch-ab,v 1.6 2005/03/22 16:24:13 minskim Exp $ +darwin*) + DLL_FLAGS="-bundle" + LD_STRIP="" -+ ;; -+interix3*) -+ # not ELF -+ DLL_FLAGS="-shared" -+ DLL_CFLAGS="" ;; - *qnx*) + interix3*) + # not ELF +@@ -71,14 +87,16 @@ interix3*) AC_DEFINE(ELF_EXECUTABLES) DLL_FLAGS="-shared -fPIC" DLL_CFLAGS="-shared -fPIC" @@ -84,7 +87,7 @@ $NetBSD: patch-ab,v 1.6 2005/03/22 16:24:13 minskim Exp $ ;; os2*) PROG_EXT=".exe" -@@ -115,7 +138,7 @@ dnl Initial setup +@@ -125,7 +143,7 @@ dnl Initial setup test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh AC_SUBST(CONFIG_SHELL) |