From 6d7e79cec25278dd86a9b7655c5460c37f83a740 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@FreeBSD.org>
Date: Sun, 7 Jan 2007 11:14:12 +0000
Subject: [PATCH] - Update to 2.1 [1] - Pass maintainership to submitter [1] -
 Add entry to UPDATING (migration guide for libwhisker 1.x users) [1] - Remove
 former maintainer from pkg-descr

Submitted by:	Marcelo Araujo <araujo@bsdmail.org> [1]
PR:		ports/107615 (with modifications)
---
 UPDATING                      | 14 ++++++++++++++
 security/libwhisker/Makefile  | 15 ++++++++-------
 security/libwhisker/distinfo  |  6 +++---
 security/libwhisker/pkg-descr |  4 ----
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/UPDATING b/UPDATING
index 16bc082c99bd..ad20fec6b028 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,20 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070106:
+  AFFECTS: users of security/libwhisker
+  AUTHOR: araujo@bsdmail.org
+
+  Libwhisker 2.0 is *not* backwards-compatible with Libwhisker 1.x.
+  Changing 'use LW' to 'use LW2' in your programs is not enough--you may
+  need to make code changes to your program.
+
+  However, there is a 'bridge' LW.pm module in which will use LW2
+  (libwhisker 2.x) functions to emulate the LW (libwhisker 1.x)
+  functionality.
+
+  See http://www.wiretrip.net/rfp/libwhisker/README2 for more details.
+
 20070104:
   AFFECTS: users of www/phpsurveyor
   AUTHOR: miwi@FreeBSD.org
diff --git a/security/libwhisker/Makefile b/security/libwhisker/Makefile
index c6e2073628fd..82f6c733de3b 100644
--- a/security/libwhisker/Makefile
+++ b/security/libwhisker/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	libwhisker
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	security perl5
 MASTER_SITES=	http://www.wiretrip.net/rfp/${PORTNAME}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	araujo@bsdmail.org
 COMMENT=	Perl module to create HTTP test scripts
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
 
 NO_BUILD=	yes
 USE_PERL5=	yes
 
-PLIST_FILES=	${SITE_PERL_REL}/LW.pm
+PLIST_FILES=	${SITE_PERL_REL}/LW.pm \
+		${SITE_PERL_REL}/LW2.pm
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -30,13 +30,14 @@ do-configure:
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.pl ${INSTALL_TARGET}
+	@${INSTALL_DATA} ${WRKSRC}/compat/LW.pm ${SITE_PERL}
+	@${CHMOD} 444 ${SITE_PERL}/LW2.pm
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/docs ${DOCSDIR}/imgs ${DOCSDIR}/scripts
+	@${MKDIR} ${DOCSDIR}/docs ${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
 
diff --git a/security/libwhisker/distinfo b/security/libwhisker/distinfo
index 8e3547e2377b..fe1d60a7fd59 100644
--- a/security/libwhisker/distinfo
+++ b/security/libwhisker/distinfo
@@ -1,3 +1,3 @@
-MD5 (libwhisker-1.8.tar.gz) = 25166ce0788c9daae4eb4122b7f85f49
-SHA256 (libwhisker-1.8.tar.gz) = 490642d4654f5d05fc1c29374a2d1bc8a0744b4b69db090c3d037dcc0749820b
-SIZE (libwhisker-1.8.tar.gz) = 109681
+MD5 (libwhisker-2.1.tar.gz) = 14e6b4db5fdaf41c6ae4f77f45b6bc8f
+SHA256 (libwhisker-2.1.tar.gz) = ad30078c931228e882754922752ba83fd0bbf44add182230a1a3da9f4890cd36
+SIZE (libwhisker-2.1.tar.gz) = 82169
diff --git a/security/libwhisker/pkg-descr b/security/libwhisker/pkg-descr
index 557c7b0f6765..29ed1ec3c50d 100644
--- a/security/libwhisker/pkg-descr
+++ b/security/libwhisker/pkg-descr
@@ -9,7 +9,3 @@ Libwhisker has a few design principles:
 - Localized: does not require installation to use
 
 WWW: http://www.wiretrip.net/rfp/lw.asp
-
-- pandzilla
-
-jan@atstake.com