- Update to version 3.10.18.

- Patch for the correct load arjcrypt.so
- Fix build on AMD64

PR:		ports/62953 ports/62852
Submitted by:	maintainer Hendrik Scholz <hendrik@scholz.net>

4 files changed, 21 insertions, 7 deletions

diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 2ba5e0153c9c..07ad717aac99 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	arj
-PORTVERSION=	3.10g
-PORTREVISION=	1
+PORTVERSION=	3.10.18
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,12 +19,11 @@ USE_REINPLACE=	yes
 USE_AUTOCONF_VER=	253
 USE_GMAKE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
+CONFIGURE_ENV=	CFLAGS="-fPIC"
 MAKEFILE=	GNUmakefile
 STRIP=
 LANGUAGE?=	en
 MAKE_ENV+=	"LOCALE=${LANGUAGE}"
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/arj
 
 MAN1=		arj-register.1 arj.1 arjdisp.1 rearj.1
 
@@ -40,7 +38,7 @@ pre-build:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} COPYING debug.txt ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} debug.txt ${DOCSDIR}
 	cd ${WRKSRC}/resource/en && \
 		${INSTALL_DATA} arjl.txt arjs.txt history.txt readme.txt unix.txt ${DOCSDIR}
 .endif
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index b8342641124e..097849eb267c 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1 +1 @@
-MD5 (arj-3.10g.tar.gz) = 22d6dc7365f23cd56865db3f05608de9
+MD5 (arj-3.10.18.tar.gz) = 3a2fbe6b2f5aac5e389f88074b6627df
diff --git a/archivers/arj/files/patch-garble.c b/archivers/arj/files/patch-garble.c
new file mode 100644
index 000000000000..667d47ae8e55
--- /dev/null
+++ b/archivers/arj/files/patch-garble.c
@@ -0,0 +1,17 @@
+--- garble.c.orig Fri Apr 18 10:12:36 2003
++++ garble.c Mon Feb 16 18:48:22 2004
+@@ -298,12 +298,13 @@
+     else
+     {
+      /* Get pathname of executable */
+-     #if defined(SKIP_GET_EXE_NAME)
++     #if defined(SKIP_GET_EXE_NAME) && TARGET!=UNIX
+       split_name(exe_name, tmp_arjcrypt_name, NULL);
+      #elif defined(PKGLIBDIR)
+       /* if !defined(PKGLIBDIR), we'll let the dynamic loader perform the
+          search */
+       strcpy(tmp_arjcrypt_name, PKGLIBDIR);
++      strcat(tmp_arjcrypt_name, "/");
+      #endif
+      if(arjcrypt_name==NULL||arjcrypt_name[0]=='\0')
+       msg_strcat(tmp_arjcrypt_name, M_ARJCRYPT_COM);
diff --git a/archivers/arj/pkg-plist b/archivers/arj/pkg-plist
index f658c8f06529..07dc1c471529 100644
--- a/archivers/arj/pkg-plist
+++ b/archivers/arj/pkg-plist
@@ -3,7 +3,6 @@ bin/arj-register
 bin/arjdisp
 bin/rearj
 lib/arj/arjcrypt.so
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/arjl.txt
 %%PORTDOCS%%%%DOCSDIR%%/arjs.txt
 %%PORTDOCS%%%%DOCSDIR%%/debug.txt