From 26562c996837fc012dea76fcedfbb23ed38e47d0 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Wed, 4 Mar 2009 17:33:55 +0000
Subject: - 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  | 16 ++++++++++++----
 archivers/arj/pkg-plist | 14 --------------
 2 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 archivers/arj/pkg-plist

(limited to 'archivers')

diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 861852af3968..8907a2f14e72 100644
--- a/archivers/arj/Makefile
+++ b/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)
diff --git a/archivers/arj/pkg-plist b/archivers/arj/pkg-plist
deleted file mode 100644
index f658c8f06529..000000000000
--- a/archivers/arj/pkg-plist
+++ /dev/null
@@ -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
-- 
cgit v1.2.3