summaryrefslogtreecommitdiff
path: root/archivers/arj
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2004-04-22 20:16:58 +0000
committerdillo <dillo@pkgsrc.org>2004-04-22 20:16:58 +0000
commitd272fc3de187fc304b0d1f7d194b1329f409a6c4 (patch)
tree426dc256bedcdb0741ce3e8314fee60b94660157 /archivers/arj
parent998c13902dac31749222c53c5242c350d01e11da (diff)
downloadpkgsrc-d272fc3de187fc304b0d1f7d194b1329f409a6c4.tar.gz
update to 3.10.20 (improvements and bug fixes)
Diffstat (limited to 'archivers/arj')
-rw-r--r--archivers/arj/Makefile7
-rw-r--r--archivers/arj/PLIST11
-rw-r--r--archivers/arj/distinfo12
-rw-r--r--archivers/arj/patches/patch-aa25
-rw-r--r--archivers/arj/patches/patch-ab23
-rw-r--r--archivers/arj/patches/patch-ac46
6 files changed, 46 insertions, 78 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 1a3c90fe760..9cbcaac10f1 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/02/14 15:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/22 20:16:58 dillo Exp $
# FreeBSD Id: ports/archivers/arj/Makefile,v 1.2 2002/09/17 05:17:29 ijliao Exp
-DISTNAME= arj-3.10b
+DISTNAME= arj-3.10.20
CATEGORIES= archivers
MASTER_SITES= http://testcase.newmail.ru/files/
@@ -23,9 +23,6 @@ pre-configure:
${RM} -f ${WRKSRC}/environ.c.1
cd ${WRKSRC}/gnu; ${AUTOCONF}
-pre-build:
- (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} -f ${MAKEFILE} ${MAKE_FLAGS} ${MAKE_ARGS} prepare)
-
post-install:
${INSTALL_DATA_DIR} ${ARJ_DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${WRKSRC}/doc/debug.txt \
diff --git a/archivers/arj/PLIST b/archivers/arj/PLIST
index 5a8f0f367d7..f613315d36b 100644
--- a/archivers/arj/PLIST
+++ b/archivers/arj/PLIST
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/13 15:39:28 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/22 20:16:58 dillo Exp $
bin/arj
+bin/arj-register
bin/arjdisp
bin/rearj
-bin/register
-lib/arjcrypt.so
+lib/arj/arjcrypt.so
+man/man1/arj-register.1
+man/man1/arj.1
+man/man1/arjdisp.1
+man/man1/rearj.1
share/doc/arj/COPYING
share/doc/arj/arjl.txt
share/doc/arj/arjs.txt
@@ -12,3 +16,4 @@ share/doc/arj/history.txt
share/doc/arj/readme.txt
share/doc/arj/unix.txt
@dirrm share/doc/arj
+@dirrm lib/arj
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index 664a15e76a6..85709d23453 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/06/06 10:11:15 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/04/22 20:16:58 dillo Exp $
-SHA1 (arj-3.10b.tar.gz) = 26fa3c87a7200ebf8b193c988fefd528e9795f51
-Size (arj-3.10b.tar.gz) = 385626 bytes
-SHA1 (patch-aa) = 96c3399e6cb78ef46a46003953a9a06e25876ee3
-SHA1 (patch-ab) = 75113a9fd64224bf1578a03078b437eaf0bc99a0
-SHA1 (patch-ac) = bf1258e936418c32a5550da3fa63966cf8b92f25
+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-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72
diff --git a/archivers/arj/patches/patch-aa b/archivers/arj/patches/patch-aa
index 257549cd066..8aaf3a89726 100644
--- a/archivers/arj/patches/patch-aa
+++ b/archivers/arj/patches/patch-aa
@@ -1,30 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2003/06/06 10:11:15 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/22 20:16:58 dillo Exp $
---- environ.c.orig Thu Mar 28 00:02:38 2002
+--- environ.c.orig Sat Apr 17 15:19:40 2004
+++ environ.c
-@@ -53,7 +53,7 @@
- #if defined(linux)
- #include <sys/ioctl.h>
- #include <linux/fs.h>
-- #elif defined(__FreeBSD__)
-+ #elif defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/param.h>
- #include <sys/mount.h>
- #else
-@@ -2721,7 +2721,7 @@ void get_exe_name(char *dest, char *arg)
- ps=pe+1;
- } while(*pe!='\0');
+@@ -3005,7 +3005,7 @@ void get_exe_name(char *dest, char *arg)
+ they are missing altogether, the corresponding code will gracefully
+ terminate. */
#if SFX_LEVEL==ARJ
-- strcpy(dest, "/usr/bin/arj");
+- strcpy(dest, "/usr/local/bin/arj");
+ strcpy(dest, "@PREFIX@/bin/arj");
#elif SFX_LEVEL==ARJSFXV
strcpy(dest, "./arjsfxv");
#elif SFX_LEVEL==ARJSFX
-@@ -2729,7 +2729,7 @@ void get_exe_name(char *dest, char *arg)
+@@ -3013,7 +3013,7 @@ void get_exe_name(char *dest, char *arg)
#elif SFX_LEVEL==ARJSFXJR
strcpy(dest, "./arjsfxjr");
#elif defined(REARJ)
-- strcpy(dest, "/usr/bin/rearj");
+- strcpy(dest, "/usr/local/bin/rearj");
+ strcpy(dest, "@PREFIX@/bin/rearj");
#else
dest[0]='\0';
diff --git a/archivers/arj/patches/patch-ab b/archivers/arj/patches/patch-ab
index c8260074915..1918efc82a7 100644
--- a/archivers/arj/patches/patch-ab
+++ b/archivers/arj/patches/patch-ab
@@ -1,19 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/13 15:39:28 cjep Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/22 20:16:58 dillo Exp $
---- gnu/configure.in.orig Thu Mar 28 00:03:42 2002
+--- gnu/configure.in.orig Sat Apr 17 13:28:06 2004
+++ gnu/configure.in
-@@ -11,7 +11,7 @@ dnl Installation script (let it be, temp
- AC_PROG_INSTALL(e:/os2apps/autoconf/install-sh)
+@@ -12,7 +12,7 @@ dnl Installation script (let it be, temp
+ AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
dnl Configuration parameters
--AC_CONFIG_HEADER(../c_defs.h:config.h.in)
-+AC_CONFIG_HEADER(c_defs.h:config.h.in)
+-AC_CONFIG_HEADER([../c_defs.h:config.h.in])
++AC_CONFIG_HEADER([c_defs.h:config.h.in])
dnl Checks for the canonical system name
AC_CANONICAL_HOST
-@@ -115,4 +115,4 @@ AC_SUBST(LIBS)
- AC_SUBST(DYN_LIBS)
- AC_SUBST(LD_STRIP)
+@@ -115,7 +115,7 @@ dnl Initial setup
--AC_OUTPUT(../makefile.gnu:makefile.in)
+ test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
+ AC_SUBST(CONFIG_SHELL)
+-
+AC_OUTPUT(makefile.gnu:makefile.in)
+ AC_MSG_CHECKING([if dynamic C library may be used])
+ AC_ARG_ENABLE(libc,
+ [ --disable-libc Disable linking with dynamic C library],
diff --git a/archivers/arj/patches/patch-ac b/archivers/arj/patches/patch-ac
index ce83944ac26..cde1c686b91 100644
--- a/archivers/arj/patches/patch-ac
+++ b/archivers/arj/patches/patch-ac
@@ -1,41 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/13 15:39:28 cjep Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/22 20:16:58 dillo Exp $
---- gnu/makefile.in.orig Mon Apr 8 23:14:22 2002
+--- gnu/makefile.in.orig Sat Apr 17 13:28:06 2004
+++ gnu/makefile.in
-@@ -420,21 +420,21 @@ clean:
- #
+@@ -166,7 +166,7 @@ MAKE_KEY=$(TOOLS_DIR)/make_key$x
+ endif
- install:
-- cp $(ARJ_DIR)/arj$x /usr/local/bin/
-- -rm -f /usr/bin/arj$x
-- ln -s /usr/local/bin/arj$x /usr/bin/arj$x
-- cp $(ARJCRYPT_DIR)/arjcrypt$d /usr/local/lib/
-- -rm -f /usr/lib/arjcrypt$d
-- ln -s /usr/local/lib/arjcrypt$d /usr/lib/arjcrypt$d
-- cp $(REARJ_DIR)/rearj$x /usr/local/bin/
-- -rm -f /usr/bin/rearj$x
-- ln -s /usr/local/bin/rearj$x /usr/bin/rearj$x
-- cp $(ARJDISP_DIR)/arjdisp$x /usr/local/bin/
-- -rm -f /usr/bin/arjdisp$x
-- ln -s /usr/local/bin/arjdisp$x /usr/bin/arjdisp$x
-- cp $(REGISTER_DIR)/register$x /usr/local/bin/
-- -rm -f /usr/bin/register$x
-- ln -s /usr/local/bin/register$x /usr/bin/register$x
-+ cp $(ARJ_DIR)/arj$x @prefix@/bin
-+# -rm -f /usr/bin/arj$x
-+# ln -s /usr/local/bin/arj$x /usr/bin/arj$x
-+ cp $(ARJCRYPT_DIR)/arjcrypt$d @prefix@/lib/
-+# -rm -f /usr/lib/arjcrypt$d
-+# ln -s /usr/local/lib/arjcrypt$d /usr/lib/arjcrypt$d
-+ cp $(REARJ_DIR)/rearj$x @prefix@/bin/
-+# -rm -f /usr/bin/rearj$x
-+# ln -s /usr/local/bin/rearj$x /usr/bin/rearj$x
-+ cp $(ARJDISP_DIR)/arjdisp$x @prefix@/bin/
-+# -rm -f /usr/bin/arjdisp$x
-+# ln -s /usr/local/bin/arjdisp$x /usr/bin/arjdisp$x
-+ cp $(REGISTER_DIR)/register$x @prefix@/bin/
-+# -rm -f /usr/bin/register$x
-+# ln -s /usr/local/bin/register$x /usr/bin/register$x
+ all: prepare timestamp
+- $(MAKE) do-all
++ $(MAKE) -f makefile.gnu do-all
- #
- # Packaging (was: packager$x $(BASEDIR_C) $(BASEDIR))
+ do-all: \
+ $(ARJ_DIR)/arj$x \