Update to 3.10g [1,2]

Add STRIP=, because stripped arj binaries don't print help topic [2]
Add language-specific options [2]
Change MASTER_SITE_SUBDIR (keramida -> osa) [3]
Replace hardcoded /etc to ${LOCALBASE}/etc [3,4]
Remove -O2 flag for ${CC} [3,4]

Submitted by:	[1] Mathieu Arnold <m@absolight.net> (PR 52982)
		[2] Konstantin Reznichenko <kot@premierbank.dp.ua> (PR 53079)
			(maintainer)
		[3] osa
Approved by:	[4] maintainer
		fjoe (mentor)

4 files changed, 29 insertions, 31 deletions

diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index a12b35249e89..e3e1e145fa0d 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -6,28 +6,36 @@
 #
 
 PORTNAME=	arj
-PORTVERSION=	3.10b
+PORTVERSION=	3.10g
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://testcase.newmail.ru/files/
-MASTER_SITE_SUBDIR=	keramida
+MASTER_SITE_SUBDIR=	osa
 
 MAINTAINER=	kot@premierbank.dp.ua
 COMMENT=	Open-source ARJ
 
-USE_AUTOCONF=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_REINPLACE=	yes
+USE_AUTOCONF_VER=	253
 USE_GMAKE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
-MAKEFILE=	makefile.gnu
+MAKEFILE=	GNUmakefile
+STRIP=
+LANGUAGE?=	en
+MAKE_ENV+=	"LOCALE=${LANGUAGE}"
+
+MAN1=		arj-register.1 arj.1 arjdisp.1 rearj.1
+
+post-extract:
+	@${REINPLACE_CMD} -e 's!/etc!${LOCALBASE}/etc!' \
+		 ${WRKSRC}/arj.c ${WRKSRC}/file_reg.c ${WRKSRC}/rearj.c
+	@${REINPLACE_CMD} -e 's!-O2!!' ${WRKSRC}/gnu/configure.in
 
 pre-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} prepare)
 
-do-install:
-.for f in arj rearj arjdisp register
-	${INSTALL_PROGRAM} ${WRKSRC}/freebsd${OSREL}/en/rs/$f/$f ${PREFIX}/bin
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/freebsd${OSREL}/en/rs/arjcrypt/arjcrypt.so ${PREFIX}/lib
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} COPYING debug.txt ${DOCSDIR}
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index c067d3ab3b3a..b16a5ff83cde 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1 +1 @@
-MD5 (arj-3.10b.tar.gz) = 59948e8f098d5f1ed5fbd7e86cd51ab4
+MD5 (arj-3.10g.tar.gz) = 5c35766dde5e9a04b2bced7fd88c4727
diff --git a/archivers/arj/files/patch-environ.c b/archivers/arj/files/patch-environ.c
deleted file mode 100644
index 926bce55c966..000000000000
--- a/archivers/arj/files/patch-environ.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- environ.c.orig Mon Apr  8 11:31:01 2002
-+++ environ.c Mon Apr  8 14:06:05 2002
-@@ -2721,7 +2721,7 @@
-   ps=pe+1;
-  } while(*pe!='\0');
-  #if SFX_LEVEL==ARJ
--  strcpy(dest, "/usr/bin/arj");
-+  strcpy(dest, "/usr/local/bin/arj");
-  #elif SFX_LEVEL==ARJSFXV
-   strcpy(dest, "./arjsfxv");
-  #elif SFX_LEVEL==ARJSFX
diff --git a/archivers/arj/pkg-plist b/archivers/arj/pkg-plist
index 2f766ebf93b8..f658c8f06529 100644
--- a/archivers/arj/pkg-plist
+++ b/archivers/arj/pkg-plist
@@ -1,13 +1,14 @@
 bin/arj
+bin/arj-register
 bin/arjdisp
 bin/rearj
-bin/register
-lib/arjcrypt.so
-%%PORTDOCS%%share/doc/arj/COPYING
-%%PORTDOCS%%share/doc/arj/arjl.txt
-%%PORTDOCS%%share/doc/arj/arjs.txt
-%%PORTDOCS%%share/doc/arj/debug.txt
-%%PORTDOCS%%share/doc/arj/history.txt
-%%PORTDOCS%%share/doc/arj/readme.txt
-%%PORTDOCS%%share/doc/arj/unix.txt
-%%PORTDOCS%%@dirrm share/doc/arj
+lib/arj/arjcrypt.so
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/arjl.txt
+%%PORTDOCS%%%%DOCSDIR%%/arjs.txt
+%%PORTDOCS%%%%DOCSDIR%%/debug.txt
+%%PORTDOCS%%%%DOCSDIR%%/history.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/unix.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/arj