ports/64021: Maintainer update: textproc/dico (extract fix)

[Cyrille Lefevre]

>Number:         64021
>Category:       ports
>Synopsis:       Maintainer update: textproc/dico (extract fix)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 09 16:40:11 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sat Jan 31 15:17:05 CET 2004 root at gits:/disk3/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386
>Description:
	Makefile
		PORTREVISION bumped
		EXTRA_CMD added
		*_SUB added
		delete %%DOCSDIR%% if NOPORTDOCS
	pkg-plist
		sorted
>How-To-Repeat:
	n/a
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/dico/Makefile,v
retrieving revision 1.11
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.11 Makefile
--- Makefile	4 Feb 2004 05:09:10 -0000	1.11
+++ Makefile	10 Mar 2004 00:31:34 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	dico
 PORTVERSION= 	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://homepages.starnet.fr/dtrystram/
 #	http://www.montefiore.ulg.ac.be/~geuzaine/BRONNE/WWW/ftp/ le_dico.tgz
@@ -26,23 +26,34 @@
 
 USE_REINPLACE=	true
 USE_ZIP=	true
+EXTRACT_CMD=	UNZIP= unzip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_AUTOMAKE=	true
 USE_GMAKE=	true
 AUTOMAKE_ARGS=	--add-missing --foreign --include-deps
 MAKE_ARGS=	prefix=${PREFIX}
 MAN1=		dico.1
+REINPLACE_SUB=	PREFIX=${PREFIX}
 
 # Post-patch
 #
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/sources/dico.c
+	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/sources/dico.c
 
 # Pre-configure
 #
 
 pre-configure:
 	@cd ${WRKSRC} && ${ACLOCAL}
+
+# Post-install
+#
+
+post-install:
+.if defined(NOPORTDOCS)
+	@${RM} -rf ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/dico/pkg-plist,v
retrieving revision 1.2
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.2 pkg-plist
--- pkg-plist	10 Oct 2003 13:37:23 -0000	1.2
+++ pkg-plist	24 Dec 2003 00:58:49 -0000
@@ -28,6 +28,6 @@
 %%DATADIR%%/y.dic
 %%DATADIR%%/z.dic
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/copying.doc
 %%PORTDOCS%%%%DOCSDIR%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/copying.doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: