Complete move of p5-SSLeay to p5-Crypt-SSLeay

6 files changed, 2 insertions, 86 deletions

diff --git a/security/Makefile b/security/Makefile
index 529952686ed..82fd3d9e7e7 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.258 2006/01/03 21:10:39 adrianp Exp $
+# $NetBSD: Makefile,v 1.259 2006/01/20 20:39:06 wiz Exp $
 #
 
 COMMENT=	Security tools
@@ -149,6 +149,7 @@ SUBDIR+=	p5-Crypt-RSA
 SUBDIR+=	p5-Crypt-RandPasswd
 SUBDIR+=	p5-Crypt-Random
 SUBDIR+=	p5-Crypt-Rijndael
+SUBDIR+=	p5-Crypt-SSLeay
 SUBDIR+=	p5-Crypt-SmbHash
 SUBDIR+=	p5-Crypt-Twofish
 SUBDIR+=	p5-Digest
@@ -169,7 +170,6 @@ SUBDIR+=	p5-Net-DNS-SEC
 SUBDIR+=	p5-Net-SSH
 SUBDIR+=	p5-Net-SSLeay
 SUBDIR+=	p5-SHA
-SUBDIR+=	p5-SSLeay
 SUBDIR+=	p5-Tie-EncryptedHash
 SUBDIR+=	pakemon
 SUBDIR+=	pam-dbm
diff --git a/security/p5-SSLeay/DESCR b/security/p5-SSLeay/DESCR
deleted file mode 100644
index 3e45d700a90..00000000000
--- a/security/p5-SSLeay/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-This perl module provides support for the https protocol under LWP,
-so that a LWP::UserAgent can make https GET & HEAD & POST requests.
-Please see perldoc LWP for more information on POST requests.
-
-The Crypt::SSLeay package contains Net::SSL, which is automatically
-loaded by LWP::Protocol::https on https requests, and provides the
-necessary SSL glue for that module to work via these deprecated
-modules:
-
-   Crypt::SSLeay::CTX
-   Crypt::SSLeay::Conn
-   Crypt::SSLeay::X509
-
-Work on Crypt::SSLeay has been continued only to provide https
-support for the LWP - libwww perl libraries. If you want access to
-the OpenSSL API via perl, check out Sampo's Net::SSLeay.
diff --git a/security/p5-SSLeay/Makefile b/security/p5-SSLeay/Makefile
deleted file mode 100644
index 1f0857a776f..00000000000
--- a/security/p5-SSLeay/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2005/08/06 06:19:31 jlam Exp $
-#
-
-DISTNAME=	Crypt-SSLeay-0.51
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	5
-SVR4_PKGNAME=	p5csl
-CATEGORIES=	security perl5 www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Crypt/}
-
-MAINTAINER=	shell@NetBSD.org
-COMMENT=	Crypt::SSLeay - OpenSSL glue that provides LWP https support
-
-DEPENDS+=	p5-libwww>=5.48:../../www/p5-libwww
-
-PERL5_PACKLIST=		auto/Crypt/SSLeay/.packlist
-
-SUBST_CLASSES+=		openssl
-SUBST_STAGE.openssl=	pre-configure
-SUBST_MESSAGE.openssl=	"Fixing path to OpenSSL."
-SUBST_FILES.openssl=	Makefile.PL
-SUBST_SED.openssl=	-e 's|%%SSLBASE%%|${BUILDLINK_PREFIX.openssl}|g'
-
-.include "../../lang/perl5/module.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-SSLeay/PLIST b/security/p5-SSLeay/PLIST
deleted file mode 100644
index 54e74b5e5af..00000000000
--- a/security/p5-SSLeay/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:25 zuntum Exp $
diff --git a/security/p5-SSLeay/distinfo b/security/p5-SSLeay/distinfo
deleted file mode 100644
index da82cf295b0..00000000000
--- a/security/p5-SSLeay/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 13:10:11 agc Exp $
-
-SHA1 (Crypt-SSLeay-0.51.tar.gz) = dea8e37e2430e351688125f5a641d76f55dbe25c
-RMD160 (Crypt-SSLeay-0.51.tar.gz) = 963ee2616742b3983a06eaee3059aafa9b866e0a
-Size (Crypt-SSLeay-0.51.tar.gz) = 117555 bytes
-SHA1 (patch-aa) = f79576ad49381a5fef228537502770f22ae00e41
diff --git a/security/p5-SSLeay/patches/patch-aa b/security/p5-SSLeay/patches/patch-aa
deleted file mode 100644
index 2ce5d7205da..00000000000
--- a/security/p5-SSLeay/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/02/09 08:09:09 shell Exp $
-
---- Makefile.PL.orig	Sun Feb  9 14:08:27 2003
-+++ Makefile.PL
-@@ -13,7 +13,7 @@ my $currdir = dirname($0) || '.';
- chdir($currdir) || die("can't change to $currdir: $!");
- 
- # FIND POSSIBLE SSL INSTALLATIONS
--my @POSSIBLE_SSL_DIRS = qw(/usr/local/openssl /usr/local/ssl /local/ssl /opt/ssl /usr/local /local /usr);
-+my @POSSIBLE_SSL_DIRS = qw(%%SSLBASE%%);
- if($^O eq 'MSWin32') {
-     unshift(@POSSIBLE_SSL_DIRS, 'c:/openssl');
- }
-@@ -40,7 +40,8 @@ if (@CANDIDATE == 1) {
-     }
- }
- 
--my $SSL_DIR;
-+my $SSL_DIR = $CANDIDATE[0][0];
-+<<__SKIP__;
- if($opt_default && (@CANDIDATE == 1) && $CANDIDATE[0][0]) {
-     $SSL_DIR = $CANDIDATE[0][0];
-     print "Using --default OpenSSL candidate found at $SSL_DIR\n";
-@@ -51,9 +52,10 @@ if($opt_default && (@CANDIDATE == 1) && 
- 	unless($CANDIDATE[0][0]) {
- 	    print "No OpenSSL installation found, usually in $POSSIBLE_SSL_DIRS[0]\n";
- 	}
--	$SSL_DIR = prompt "Which OpenSSL build path do you want to link against?", $CANDIDATE[0][0];
-+	$SSL_DIR = $CANDIDATE[0][0];
-     }
- }
-+__SKIP__
- 
- my $candidate = &Candidate($SSL_DIR);
- unless($candidate) {