- Fix build on recent -CURRENT renaming strnlen local function to _strnlen to

avoid conflict with recent introduced function with the same name on string.h
- Use SF macro for MASTER_SITES
- Remove CFLAGS change from CONFIGURE_ENV and use CHFLAGS +=
- Use PORTDOCS
- Remove 5 lines pkg-plist and use PLIST_FILES
- Change post-extract to post-patch, as used on most ports

archivers/arj/Makefile

@@ -9,8 +9,7 @@ PORTNAME=	arj
 PORTVERSION=	3.10.22
 PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Open-source ARJ
@@ -18,19 +17,28 @@ COMMENT=	Open-source ARJ
 USE_AUTOTOOLS=	autoconf:262
 USE_GMAKE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
-CONFIGURE_ENV=	CFLAGS="-fPIC"
+CFLAGS+=	-fPIC
 MAKEFILE=	GNUmakefile
 STRIP=
 LANGUAGE?=	en
 MAKE_ENV+=	"LOCALE=${LANGUAGE}"
+PORTDOCS=	*
+
+PLIST_FILES=	bin/arj \
+		bin/arj-register \
+		bin/arjdisp \
+		bin/rearj \
+		lib/arj/arjcrypt.so
+PLIST_DIRS=	lib/arj
 
 MAN1=		arj-register.1 arj.1 arjdisp.1 rearj.1
 
-post-extract:
+post-patch:
 	@${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
 	@${REINPLACE_CMD} -e 's!^static !!' ${WRKSRC}/integr.c
+	@${REINPLACE_CMD} -e 's!strnlen!_strnlen!g' ${WRKSRC}/fardata.c
 
 pre-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} prepare)

archivers/arj/pkg-plist

@@ -1,14 +0,0 @@
-bin/arj
-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
-%%PORTDOCS%%%%DOCSDIR%%/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/unix.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/arj