Update all ports using OpenSSL and RSA to work without rsaref since

it is no longer required. Apologies to the various maintainers whom I
did not yet hear back from, but the ports freeze is coming up in a few
hours and I will be verifying all of these ports on a 4.1 machine
myself to catch any problems.

13 files changed, 26 insertions, 64 deletions

diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 8e5fdc13ec00..1e8c1528f74d 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.hitachi-ms.co.jp/pub/bjorb/
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 .if !defined(BATCH)
 INSTALL_TARGET=		install certificate
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index ae2a1b27b0db..ca02d8727d80 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
 
 MAINTAINER=	hetzels@westbend.net
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 INSTALLS_SHLIB=	yes
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index ae2a1b27b0db..ca02d8727d80 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
 
 MAINTAINER=	hetzels@westbend.net
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 INSTALLS_SHLIB=	yes
 
diff --git a/security/keynote/Makefile b/security/keynote/Makefile
index 6ef6cfcbfbba..92c267649532 100644
--- a/security/keynote/Makefile
+++ b/security/keynote/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.cis.upenn.edu/~angelos/Code/
 
 MAINTAINER=	kris@FreeBSD.org
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 9be0d009e818..c0aec37774de 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -16,14 +16,11 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	green@FreeBSD.org
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 .include <bsd.port.pre.mk>
 
 CRYPTOLIBS=	-L${OPENSSLLIB} -lcrypto
-.if defined(OPENSSL_RSAREF)
-CRYPTOLIBS+=	-lRSAglue -L${LOCALBASE}/lib -lrsaref
-.endif
 # Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
 MAKE_ENV+=	DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}"
 .if ${OSVERSION} < 400014
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 1f7bc50bcaa8..e2e7b5141299 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,76 +5,41 @@
 # $FreeBSD$
 #
 
-# Pick an initial default, else it doesn't get set in the INDEX.
+PORTNAME=	pgp
+PORTVERSION=	2.6.3i
 CATEGORIES=	security
-DISTNAME=	pgp262s
+MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
+		ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
+DISTNAME=	pgp263is
 
 MAINTAINER=	ache@FreeBSD.org
 
-# Need to define USA_RESIDENT to YES or NO
-IS_INTERACTIVE=	YES
-RESTRICTED=	"Crypto"
+WRKSRC=		${WRKDIR}/src
+FILESDIR=	${.CURDIR}/files.non_usa
+PATCHDIR=	${.CURDIR}/patches.non_usa
+
 MAKEFILE=	makefile
 ALL_TARGET=	freebsd-${MACHINE_ARCH} OS_CFLAGS="${CFLAGS}"
 PGPLIB=		${PREFIX}/lib/pgp
 MAN1=		pgp.1
 
 do-install:
-	cd ${WRKSRC}; install -c -o bin -g bin -m 555 pgp ${PREFIX}/bin
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} -c -o bin -g bin -m 555 pgp ${PREFIX}/bin
 	cd ${WRKSRC}/../doc; \
-		  install -c -o bin -g bin -m 444 pgp.1 ${PREFIX}/man/man1
+		  ${INSTALL_MAN} -c -o bin -g bin -m 444 pgp.1 ${PREFIX}/man/man1
 	-${MKDIR} ${PGPLIB}
 	${CHMOD} 555 ${PGPLIB}
 	cd ${WRKSRC}/..; \
-	    install -c -o bin -g bin -m 444 pgp.hlp \
+	    ${INSTALL_DATA} -c -o bin -g bin -m 444 pgp.hlp \
 			      doc/pgpdoc1.txt doc/pgpdoc2.txt ${PGPLIB}; \
 	    [ -f ${PGPLIB}/language.txt ] || \
-		      install -c -o bin -g bin -m 444 language.txt ${PGPLIB}; \
+		      ${INSTALL_DATA} -c -o bin -g bin -m 444 language.txt ${PGPLIB}; \
 	    [ -f ${PGPLIB}/config.txt ] || \
-		      install -c -o bin -g bin -m 444 config.txt ${PGPLIB}
+		      ${INSTALL_DATA} -c -o bin -g bin -m 444 config.txt ${PGPLIB}
 	-${PREFIX}/bin/pgp > /dev/null  2>&1  # update .idx file
 
-.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
-pre-fetch:
-	@${ECHO_MSG}
-	@${ECHO_MSG} You must set variable USA_RESIDENT to YES, if you are USA resident
-	@${ECHO_MSG} or to NO, if you aren\'t USA resident to build this package
-	@${FALSE}
-.elif defined(USA_RESIDENT)
-.if ${USA_RESIDENT} == YES
-PORTNAME=	pgp
-PORTVERSION=	2.6.2
-MASTER_SITES=   ftp://utopia.hacktic.nl/pub/crypto/pgp/unix/
-DISTNAME=	pgp262s
-
-WRKSRC=		${WRKDIR}/src
-BUILD_DEPENDS+=	gmake:${PORTSDIR}/devel/gmake
-LIB_DEPENDS+=	rsaref.2:${PORTSDIR}/security/rsaref
-USE_ZIP=	yes
-FILESDIR=	${.CURDIR}/files.usa
-PATCHDIR=	${.CURDIR}/patches.usa
-
-post-extract:
-	cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) -aa $(DISTNAME)i \
-		$(EXTRACT_AFTER_ARGS)
-	cd ${WRKDIR}; ${RM} -f *.zip
-
-.else
-PORTNAME=	pgp
-PORTVERSION=	2.6.3ia
-MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
-		ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
-DISTNAME=	pgp263is
-
-WRKSRC=		${WRKDIR}/src
-FILESDIR=	${.CURDIR}/files.non_usa
-PATCHDIR=	${.CURDIR}/patches.non_usa
-
 post-extract:
 	cd ${WRKDIR}; $(TAR) -xf pgp263ii.tar; \
 		${RM} -f pgp263ii.tar
 
-.endif
-.endif
-
 .include <bsd.port.mk>
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 90ae5588926e..f501a13b3362 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	sumikawa@FreeBSD.org
 BROKEN=		"You must upgrade the OS"
 .endif
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 GNU_CONFIGURE=	yes
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 90ae5588926e..f501a13b3362 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	sumikawa@FreeBSD.org
 BROKEN=		"You must upgrade the OS"
 .endif
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 GNU_CONFIGURE=	yes
diff --git a/security/slush/Makefile b/security/slush/Makefile
index 9671c98df0b8..d491540026ea 100644
--- a/security/slush/Makefile
+++ b/security/slush/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	shipley@dis.org
 
 GNU_CONFIGURE=	yes
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} <= 300000
diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index 9a088df68229..433640077415 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	sslproxy.2000_Jan_29
 
 MAINTAINER=	alexlh@funk.org
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sslproxy ${PREFIX}/bin/sslproxy
diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index cc8c4b09bd6b..fe99fad94b32 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ZGabor@CoDe.HU
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 WRKSRC=		${WRKDIR}/sslwrap205
 
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 61e0da16f39a..0061ad465abe 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
-USE_OPENSSL=	RSA
+USE_OPENSSL=	YES
 
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/run
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 46ee9b022ee1..fdeedbef6a8d 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	greg@hewgill.com
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libbz2.a:${PORTSDIR}/archivers/bzip2
 
-USE_OPENSSL=	NORSA
+USE_OPENSSL=	YES
 USE_PERL5=	yes
 
 MAN1=		zebedee.1 ftpgw.tcl.1