- older versions of 1.8 incorrectly identify themselves as 1.7 [1]

- Utilize PORTDOCS and PLIST_FILES

PR:		[1] 77702
Submitted by:	Sam Lawrance <boris at brooknet.com.au>

3 files changed, 16 insertions, 51 deletions

diff --git a/security/libwhisker/Makefile b/security/libwhisker/Makefile
index cd98d42aebc..c6e2073628f 100644
--- a/security/libwhisker/Makefile
+++ b/security/libwhisker/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	1.8
 PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	http://www.wiretrip.net/rfp/${PORTNAME}/
-DISTNAME=	${PORTNAME}-current
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl module to create HTTP test scripts
@@ -20,40 +19,25 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 USE_PERL5=	yes
 
-DOC1=		README CHANGES KNOWNBUGS
-DOCS=		docs/OPTIMIZE docs/evil.htm docs/whisker_hash.txt
-IMGS=		imgs/logo-builton.gif imgs/logo-name.gif imgs/logo-plain.gif
-SCRIPTS=	scripts/func2html.pl scripts/prox.pl
+PLIST_FILES=	${SITE_PERL_REL}/LW.pm
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.pl lib
 
 do-install:
-	@cd ${WRKSRC} && ${PERL} ${WRKSRC}/Makefile.pl lib
-	@${MKDIR} ${SITE_PERL}/${PORTNAME} && ${CHMOD} 755 ${SITE_PERL}/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/LW.pm ${SITE_PERL}/${PORTNAME}/LW.pm
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.pl ${INSTALL_TARGET}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR} \
-		&& ${CHMOD} 755 ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/docs \
-		&& ${CHMOD} 755 ${DOCSDIR}/docs
-	@${MKDIR} ${DOCSDIR}/imgs \
-		&& ${CHMOD} 755 ${DOCSDIR}/imgs
-	@${MKDIR} ${DOCSDIR}/scripts \
-		&& ${CHMOD} 755 ${DOCSDIR}/scripts
-.for i in ${DOC1}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/docs/
-.endfor
-.for i in ${IMGS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/imgs/
-.endfor
-.for i in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/scripts/
-.endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/api_demo.pl ${DOCSDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/simple.pl ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/docs ${DOCSDIR}/imgs ${DOCSDIR}/scripts
+	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGES KNOWNBUGS ${DOCSDIR}
+	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} * ${DOCSDIR}/docs
+	cd ${WRKSRC}/imgs/ && ${INSTALL_DATA} * ${DOCSDIR}/imgs
+	cd ${WRKSRC}/scripts/ && ${INSTALL_SCRIPT} * ${DOCSDIR}/scripts
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/libwhisker/distinfo b/security/libwhisker/distinfo
index 7219520554f..626096f2a33 100644
--- a/security/libwhisker/distinfo
+++ b/security/libwhisker/distinfo
@@ -1,2 +1,2 @@
-MD5 (libwhisker-current.tar.gz) = d8cb255dee28e3cd120ea2d82a6a3f64
-SIZE (libwhisker-current.tar.gz) = 109709
+MD5 (libwhisker-1.8.tar.gz) = 25166ce0788c9daae4eb4122b7f85f49
+SIZE (libwhisker-1.8.tar.gz) = 109681
diff --git a/security/libwhisker/pkg-plist b/security/libwhisker/pkg-plist
deleted file mode 100644
index 1306bdbe9ea..00000000000
--- a/security/libwhisker/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-%%SITE_PERL%%/libwhisker/LW.pm
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
-%%PORTDOCS%%%%DOCSDIR%%/api_demo.pl
-%%PORTDOCS%%%%DOCSDIR%%/simple.pl
-%%PORTDOCS%%%%DOCSDIR%%/docs/OPTIMIZE
-%%PORTDOCS%%%%DOCSDIR%%/docs/evil.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/whisker_hash.txt
-%%PORTDOCS%%%%DOCSDIR%%/imgs/logo-builton.gif
-%%PORTDOCS%%%%DOCSDIR%%/imgs/logo-name.gif
-%%PORTDOCS%%%%DOCSDIR%%/imgs/logo-plain.gif
-%%PORTDOCS%%%%DOCSDIR%%/scripts/func2html.pl
-%%PORTDOCS%%%%DOCSDIR%%/scripts/prox.pl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/imgs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/libwhisker