4 files changed, 8 insertions, 56 deletions

diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index 23715d02c34b..559daefab859 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	Crypt-Cracklib
-PORTVERSION=	0.01
+PORTVERSION=	1.0
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Alec Muffet's cracklib library
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=INC="-I${LOCALBASE}/include"
+CONFIGURE_ARGS=	INC="-I${LOCALBASE}/include" DEFINE="-DCRACKLIB_DICTPATH=\\\"${PREFIX}/libdata/cracklib/pw_dict\\\""
 
 MAN3=		Crypt::Cracklib.3
 
 post-patch:
-	${PERL} -pi -e "s@INCLUDE@${LOCALBASE}/include@g;\
-			s@FBSDLIB@${LOCALBASE}/lib@g" ${WRKSRC}/Makefile.PL
+	${REINPLACE_CMD} -e 's/crack.h/packer.h/' ${WRKSRC}/Cracklib.*
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-Cracklib/distinfo b/security/p5-Crypt-Cracklib/distinfo
index bef31206662c..8747973e903a 100644
--- a/security/p5-Crypt-Cracklib/distinfo
+++ b/security/p5-Crypt-Cracklib/distinfo
@@ -1,3 +1,3 @@
-MD5 (Crypt-Cracklib-0.01.tar.gz) = a24234aeb3eb9eac71c344f9ca736b7b
-SHA256 (Crypt-Cracklib-0.01.tar.gz) = 6421220935a80ce1664ab0baabd0cbfd5c8a521a8eb12f57bd9f07b5641c7386
-SIZE (Crypt-Cracklib-0.01.tar.gz) = 3022
+MD5 (Crypt-Cracklib-1.0.tar.gz) = 344068eb9403899ad9e19627d099fabd
+SHA256 (Crypt-Cracklib-1.0.tar.gz) = 96d84f7fb46cf1bdf1109a676ef2eaea363da503643026728668e798bcafa007
+SIZE (Crypt-Cracklib-1.0.tar.gz) = 18271
diff --git a/security/p5-Crypt-Cracklib/files/patch-Makefile.PL b/security/p5-Crypt-Cracklib/files/patch-Makefile.PL
deleted file mode 100644
index 3deaac54ab62..000000000000
--- a/security/p5-Crypt-Cracklib/files/patch-Makefile.PL
+++ /dev/null
@@ -1,48 +0,0 @@
---- Makefile.PL	Fri Nov 27 19:50:29 1998
-+++ Makefile.PL.new	Fri Jan 26 21:36:22 2001
-@@ -4,6 +4,7 @@
- use ExtUtils::MakeMaker;
- use Config qw(%Config);
- 
-+if (0 ne 0) {
- sub MY::libscan {
- 	my ($self,$path) = @_;
- 
-@@ -16,8 +17,10 @@
- }
- 
- print "\nEnter the directory where crack.h/packer.h is located\n";
-+}
- my $include = '/usr/local/include';
- my $incfile = '-Dpacker=1';
-+if (0 ne 0) {
- print "[$include] ";
- 
- while(<>) {
-@@ -38,7 +41,9 @@
- }
- 
- print "\nEnter the directory where libcrack.(so|a) is located\n";
-+}
- my $lib = '/usr/local/lib';
-+if (0 ne 0) {
- print "[$lib] ";
- 
- while(<>) {
-@@ -50,13 +55,14 @@
- 		last if -f "$lib/libcrack.so" or -f "$lib/libcrack.a";
- 	}
- }
-+}
- 
- WriteMakefile(
- 	'NAME'		=> 'Crypt::Cracklib',
- 	'VERSION_FROM'	=> 'Cracklib.pm',
--	'LIBS'		=> ["-L$lib -lcrack"],
-+	'LIBS'		=> ["-LFBSDLIB -lcrack"],
- 	'DEFINE'	=> $incfile,
--	'INC'		=> "-I$include",
-+	'INC'		=> "-IINCLUDE",
- 	'dist'		=> {	COMPRESS => 'gzip -9f',
- 				SUFFIX   => 'gz',
- 				DIST_DEFAULT => 'tardist',
diff --git a/security/p5-Crypt-Cracklib/pkg-descr b/security/p5-Crypt-Cracklib/pkg-descr
index b8a6d43e42f4..b75002c27dcf 100644
--- a/security/p5-Crypt-Cracklib/pkg-descr
+++ b/security/p5-Crypt-Cracklib/pkg-descr
@@ -1,3 +1,4 @@
 Crypt::Cracklib is a perl interface to Alec Muffet's cracklib library.
 
 --will
+WWW: http://search.cpan.org/dist/Crypt-Cracklib/