Update to 2.5. Set LICENSE. Fixed HOMEPAGE and MASTER_SITES. Don't hide the

`cd' command. Use INSTALLATION_DIRS instead of INSTALL_DATADIR. Fix line lengths
in do-install phase. Use PKGBASE for INSTALLATION_DIRS. From CHANGES:

- LibWhisker is now licensed under the 'simplied' (2 clause) BSD license.

- Added the {whisker}->{allow_short_reads} option, which will return success
if some body data is read but it is less than the server-advertised content
length.  Thanks to Dave Lodge for the suggestion.

- Thomas Reinke pointed out that cookie_parse() was lowercasing cookie
names, which causes problems if the server is being case-sensitive with
cookie names.

- Fixed a documentation typo for uri_absolute().  Thanks to Sullo for
pointing it out.

- A bug in http_fixup_request() would append a port to the Host header even
if there was already one.  Thanks to Sullo for reporting it.

- Francisco Amato recommended two new anti-IDS modes that involve using
0x0d and 0x0b as request separator/spacers.  IDS modes 'A' and 'B' were
added, respectively.

2 files changed, 24 insertions, 20 deletions

diff --git a/devel/libwhisker2/Makefile b/devel/libwhisker2/Makefile
index 32afce7ef65..8a5a74e0bf7 100644
--- a/devel/libwhisker2/Makefile
+++ b/devel/libwhisker2/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2013/05/31 12:40:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/04/06 14:05:14 rodent Exp $
 
-DISTNAME=	libwhisker2-2.4
-PKGREVISION=	2
+DISTNAME=	libwhisker2-2.5
 CATEGORIES=	devel
-MASTER_SITES=	http://www.wiretrip.net/rfp/libwhisker/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=whisker/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.wiretrip.net/rfp/lw.asp
+HOMEPAGE=	http://sourceforge.net/projects/whisker/
 COMMENT=	Perl module geared specifically for HTTP testing
+LICENSE=	2-clause-bsd
 
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
 
@@ -16,23 +16,27 @@ REPLACE_PERL=	scripts/api_demo.pl scripts/crawl_demo.pl \
 		scripts/simple_demo.pl scripts/form_demo1.pl \
 		scripts/form_demo2.pl scripts/prox.pl
 
+INSTALLATION_DIRS+=	libdata/${PKGBASE} share/doc/${PKGBASE}
+INSTALLATION_DIRS+=	share/examples/${PKGBASE}
+
 do-build:
-	@cd ${WRKSRC} && ${PERL5} Makefile.pl lib
+	cd ${WRKSRC} && ${PERL5} Makefile.pl lib
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/libwhisker2
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/libwhisker2
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/libdata/libwhisker2
-
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/libwhisker2
-	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DESTDIR}${PREFIX}/share/doc/libwhisker2
-	${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${DESTDIR}${PREFIX}/share/doc/libwhisker2
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/libwhisker2
-	${INSTALL_DATA} ${WRKSRC}/LW2.pm ${DESTDIR}${PREFIX}/libdata/libwhisker2
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.gif \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/LW2.pm \
+		${DESTDIR}${PREFIX}/libdata/${PKGBASE}
 
 .	for f in ${REPLACE_PERL}
 		${INSTALL_SCRIPT} ${WRKSRC}/${f} \
-			${DESTDIR}${PREFIX}/share/examples/libwhisker2
+			${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
 .	endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libwhisker2/distinfo b/devel/libwhisker2/distinfo
index fa645899540..f4fecc593e6 100644
--- a/devel/libwhisker2/distinfo
+++ b/devel/libwhisker2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/04/14 10:30:37 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2014/04/06 14:05:14 rodent Exp $
 
-SHA1 (libwhisker2-2.4.tar.gz) = 18c62213f8592964ed54cfa5a63e3d06dd5ce6ce
-RMD160 (libwhisker2-2.4.tar.gz) = 86ac57bc00733f2d2037c893319290c1ee626367
-Size (libwhisker2-2.4.tar.gz) = 132083 bytes
+SHA1 (libwhisker2-2.5.tar.gz) = e5810210ed6adefadac028700d3e18b451215b3b
+RMD160 (libwhisker2-2.5.tar.gz) = fd8dc1552499119f3e7086860e9cbbfaf3bf6c25
+Size (libwhisker2-2.5.tar.gz) = 207569 bytes