5 files changed, 50 insertions, 25 deletions

diff --git a/finance/p5-Business-WorldPay-Junior/Makefile b/finance/p5-Business-WorldPay-Junior/Makefile
index 24d154ea094a..213bdd5fabb9 100644
--- a/finance/p5-Business-WorldPay-Junior/Makefile
+++ b/finance/p5-Business-WorldPay-Junior/Makefile
@@ -5,24 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=	Business-OnlinePayment-WorldPay-Junior
-PORTVERSION=	1.03
-CATEGORIES=	misc perl5
+PORTNAME=	Business-WorldPay-Junior
+PORTVERSION=	1.06
+CATEGORIES=	finance perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Business
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An Business::OnlinePayment backend module for a WorldPay Select Junior service
+COMMENT=	Perl module to handle WorldPay Junior for payment services
 
-BUILD_DEPENDS=	${SITE_PERL}/Business/CreditCard.pm:${PORTSDIR}/misc/p5-Business-CreditCard \
-		${SITE_PERL}/Business/OnlinePayment.pm:${PORTSDIR}/misc/p5-Business-OnlinePayment
+BUILD_DEPENDS=	${SITE_PERL}/Business/CreditCard.pm:${PORTSDIR}/finance/p5-Business-CreditCard \
+		${SITE_PERL}/Business/OnlinePayment.pm:${PORTSDIR}/finance/p5-Business-OnlinePayment \
+		$${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-MAN3=		Business::OnlinePayment::WorldPay::Junior.3
+MAN3=		Business::WorldPay::Junior.3
+
+post-patch:
+	@${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
+		-e '$$_="" if /use 5/;' \
+		-e '$$_="" if /use warnings/;' \
+		${WRKSRC}/Junior.pm
 
 .include <bsd.port.mk>
diff --git a/finance/p5-Business-WorldPay-Junior/distinfo b/finance/p5-Business-WorldPay-Junior/distinfo
index 1e76eb609d6d..99f5a91e2e3c 100644
--- a/finance/p5-Business-WorldPay-Junior/distinfo
+++ b/finance/p5-Business-WorldPay-Junior/distinfo
@@ -1 +1 @@
-MD5 (Business-OnlinePayment-WorldPay-Junior-1.03.tar.gz) = 3683f9ea4baf1e3e15e658518dd32051
+MD5 (Business-WorldPay-Junior-1.06.tar.gz) = bcd9b98d21cedcac5fb8b7da0e0012f6
diff --git a/finance/p5-Business-WorldPay-Junior/files/patch-Makefile.PL b/finance/p5-Business-WorldPay-Junior/files/patch-Makefile.PL
new file mode 100644
index 000000000000..80d598a8c922
--- /dev/null
+++ b/finance/p5-Business-WorldPay-Junior/files/patch-Makefile.PL
@@ -0,0 +1,13 @@
+--- Makefile.PL.orig	Fri Mar 14 11:35:10 2003
++++ Makefile.PL	Sat Mar 15 10:40:05 2003
+@@ -3,9 +3,6 @@
+ # the contents of the Makefile that is written.
+ WriteMakefile(
+     'NAME'		=> 'Business::WorldPay::Junior',
+-    'VERSION_FROM'	=> 'Junior.pm', # finds $VERSION
++    'VERSION'		=> '1.06',
+     'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1
+-    ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
+-      (ABSTRACT_FROM => 'Junior.pm', # retrieve abstract from module
+-       AUTHOR     => 'Jason Clifford <jason@jasonclifford.com>') : ()),
+ );
diff --git a/finance/p5-Business-WorldPay-Junior/pkg-descr b/finance/p5-Business-WorldPay-Junior/pkg-descr
index b1ea8dd7e8ee..6ce6cc2ae9fb 100644
--- a/finance/p5-Business-WorldPay-Junior/pkg-descr
+++ b/finance/p5-Business-WorldPay-Junior/pkg-descr
@@ -5,3 +5,5 @@ This module aims for simplicity. All it does is track the transaction and
 then verify the callback data supplied by WorldPay after a payment has been
 made. The module is designed with the requirement to immediately verify that
 a payment has been made and is as expected in mind.
+
+WWW: http://search.cpan.org/dist/Business-WorldPay-Junior/
diff --git a/finance/p5-Business-WorldPay-Junior/pkg-plist b/finance/p5-Business-WorldPay-Junior/pkg-plist
index efe3e405ed71..9b13ca4da55f 100644
--- a/finance/p5-Business-WorldPay-Junior/pkg-plist
+++ b/finance/p5-Business-WorldPay-Junior/pkg-plist
@@ -1,17 +1,20 @@
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/WorldPay/Junior.pm
-lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/WorldPay/get-rates.pl
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/authorised.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/callback.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/db_connect.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/errstr.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/exchange_rate.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/new.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/register.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior/valid_callback_host.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/WorldPay/Junior/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/WorldPay/Junior
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/WorldPay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay/Junior
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Business/OnlinePayment/WorldPay
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Business/OnlinePayment/WorldPay
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/new.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/callback.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/valid_callback_host.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/register.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/authorised.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/errstr.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/exchange_rate.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/db_connect.al
+%%SITE_PERL%%/auto/Business/WorldPay/Junior/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior/.packlist
+%%SITE_PERL%%/Business/WorldPay/Junior.pm
+%%SITE_PERL%%/Business/WorldPay/get-rates.pl
+lib/perllocal.pod-Business-WorldPay-Junior
+@dirrm %%SITE_PERL%%/auto/Business/WorldPay/Junior
+@dirrm %%SITE_PERL%%/auto/Business/WorldPay
+@dirrm %%SITE_PERL%%/Business/WorldPay
+@unexec rmdir %D/%%SITE_PERL%%/auto/Business 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true