- get rid of duplicate code in Makefiles.

- Fix USE_OPENSSL_PORT and USE_OPENSSL_BASE
- drop obsolete/broken USE_OPENSSL

7 files changed, 125 insertions, 39 deletions

diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
index 3de6bdb4a6d..2472e098188 100644
--- a/security/hpn-ssh/Makefile
+++ b/security/hpn-ssh/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	openssh
+PORTREVISION=	1
 PORTVERSION=	3.2.3p1
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -20,7 +21,6 @@ MLINKS=	ssh.1 slogin.1
 MAN8=	sftp-server.8 sshd.8
 
 CRYPTOLIBS=	-L${OPENSSLLIB} -lcrypto
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-md5-passwords
 CLEAN=		etc/ssh_config etc/sshd_config etc/moduli \
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+=	--with-tcp-wrappers
 .endif
 
 .if defined(OPENSSH_OVERWRITE_BASE)
+USE_OPELSSL_BASE=	yes
 PKGNAMESUFFIX=	-overwrite-base
 PREFIX=		/usr
 MANPREFIX=	${PREFIX}/share
@@ -78,16 +79,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 430000 || exists(${LOCALBASE}/lib/libcrypto.so.3)
-OPENSSLBASE=	${LOCALBASE}
-OPENSSLDIR=	${OPENSSLBASE}/openssl
-LIB_DEPENDS+=	crypto.3:${PORTSDIR}/security/openssl
-OPENSSLLIB=	${OPENSSLBASE}/lib
-OPENSSLINC=	${OPENSSLBASE}/include
-MAKE_ENV+=	OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
-		OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-
+.include <${PORTSDIR}/security/openssl/Makefile.ssl>
+CONFIGURE_ARGS+=	--with-ssl-dir=${OPENSSLBASE}
 
 .include <bsd.port.post.mk>
diff --git a/security/hpn-ssh/distinfo b/security/hpn-ssh/distinfo
index 0767cb06a25..8433204f3ca 100644
--- a/security/hpn-ssh/distinfo
+++ b/security/hpn-ssh/distinfo
@@ -1,3 +1,2 @@
 MD5 (openssh-3.2.3p1.tar.gz) = f153ccdb5a91fa06ec78d0c6313f4d77
-MD5 (openssh-3.1p1-gssapi-20020325.diff) = a5002539db6b838190ad92bc627f6b5e
-MD5 (openssh-mit-krb5-20020326.diff) = 2f83bf4f0185f20672c68856aee643c8
+MD5 (openssh-3.2.3p1-gssapi-20020527.diff) = 27f170956f607b951ffda48da588b00a
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 3de6bdb4a6d..2472e098188 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	openssh
+PORTREVISION=	1
 PORTVERSION=	3.2.3p1
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -20,7 +21,6 @@ MLINKS=	ssh.1 slogin.1
 MAN8=	sftp-server.8 sshd.8
 
 CRYPTOLIBS=	-L${OPENSSLLIB} -lcrypto
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-md5-passwords
 CLEAN=		etc/ssh_config etc/sshd_config etc/moduli \
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+=	--with-tcp-wrappers
 .endif
 
 .if defined(OPENSSH_OVERWRITE_BASE)
+USE_OPELSSL_BASE=	yes
 PKGNAMESUFFIX=	-overwrite-base
 PREFIX=		/usr
 MANPREFIX=	${PREFIX}/share
@@ -78,16 +79,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 430000 || exists(${LOCALBASE}/lib/libcrypto.so.3)
-OPENSSLBASE=	${LOCALBASE}
-OPENSSLDIR=	${OPENSSLBASE}/openssl
-LIB_DEPENDS+=	crypto.3:${PORTSDIR}/security/openssl
-OPENSSLLIB=	${OPENSSLBASE}/lib
-OPENSSLINC=	${OPENSSLBASE}/include
-MAKE_ENV+=	OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
-		OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-
+.include <${PORTSDIR}/security/openssl/Makefile.ssl>
+CONFIGURE_ARGS+=	--with-ssl-dir=${OPENSSLBASE}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index 0767cb06a25..8433204f3ca 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,3 +1,2 @@
 MD5 (openssh-3.2.3p1.tar.gz) = f153ccdb5a91fa06ec78d0c6313f4d77
-MD5 (openssh-3.1p1-gssapi-20020325.diff) = a5002539db6b838190ad92bc627f6b5e
-MD5 (openssh-mit-krb5-20020326.diff) = 2f83bf4f0185f20672c68856aee643c8
+MD5 (openssh-3.2.3p1-gssapi-20020527.diff) = 27f170956f607b951ffda48da588b00a
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index dd0343f0278..88b1aeb13de 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openssh
 PORTVERSION=	3.2.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/ \
 		ftp://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/ \
@@ -19,8 +20,6 @@ PATCHFILES=	openbsd28_${PORTVERSION}.patch
 
 MAINTAINER=	dinoex@FreeBSD.org
 
-USE_OPENSSL=	yes
-
 MAN1=		scp.1 slogin.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 \
 		ssh-keyscan.1 sftp.1
 MAN8=		sshd.8 sftp-server.8
@@ -31,15 +30,8 @@ FIXME=		lib/Makefile scp/Makefile sftp/Makefile sftp-server/Makefile \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 430000 || exists(${LOCALBASE}/lib/libcrypto.so.3)
-OPENSSLBASE=	${LOCALBASE}
-OPENSSLDIR=	${OPENSSLBASE}/openssl
-LIB_DEPENDS+=	crypto.3:${PORTSDIR}/security/openssl
-OPENSSLLIB=	${OPENSSLBASE}/lib
-OPENSSLINC=	${OPENSSLBASE}/include
-MAKE_ENV+=	OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
-		OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
-.endif
+.include <${PORTSDIR}/security/openssl/Makefile.ssl>
+
 CRYPTOLIBS=	-L${OPENSSLLIB} -lcrypto
 # Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
 MAKE_ENV+=	DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}"
diff --git a/security/openssl-beta/Makefile.ssl b/security/openssl-beta/Makefile.ssl
new file mode 100644
index 00000000000..265c96da3b4
--- /dev/null
+++ b/security/openssl-beta/Makefile.ssl
@@ -0,0 +1,56 @@
+# makefile for use of:	OpenSSH
+# Date created:		31 May 2002
+# Whom:			dinoex
+#
+# $FreeBSD$
+#
+
+.if defined(USE_OPENSSL_BASE)
+OPENSSLBASE=		/usr
+OPENSSLDIR=		/etc/ssl
+
+.if !exists(/usr/lib/libcrypto.so)
+.BEGIN:
+	@${ECHO_CMD} "This port requires the OpenSSL library, which is part of"
+	@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
+	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
+	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/handbook/openssl.html\", for instance)"
+	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
+	@${ECHO_CMD} "OpenSSL distribution."
+	@${FALSE}
+.endif
+
+# OpenSSL in the base system may not include IDEA for patent licensing reasons.
+.if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
+OPENSSL_IDEA=		${MAKE_IDEA}
+.else
+OPENSSL_IDEA?=		NO
+.endif
+
+.if ${OPENSSL_IDEA} == "NO"
+# XXX This is a hack to work around the fact that /etc/make.conf clobbers
+#     our CFLAGS. It might not be enough for all future ports.
+.if defined(HAS_CONFIGURE)
+CFLAGS+=		-DNO_IDEA
+.else
+OPENSSL_CFLAGS+=	-DNO_IDEA
+.endif
+MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
+.endif
+
+.else
+
+OPENSSLBASE=		${LOCALBASE}
+OPENSSLDIR=		${OPENSSLBASE}/openssl
+LIB_DEPENDS+=		crypto.3:${PORTSDIR}/security/openssl
+
+.endif
+
+OPENSSLLIB=		${OPENSSLBASE}/lib
+OPENSSLINC=		${OPENSSLBASE}/include
+MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
+			OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
+
+### crypto
+#RESTRICTED=		"Contains cryptography."
+
diff --git a/security/openssl/Makefile.ssl b/security/openssl/Makefile.ssl
new file mode 100644
index 00000000000..265c96da3b4
--- /dev/null
+++ b/security/openssl/Makefile.ssl
@@ -0,0 +1,56 @@
+# makefile for use of:	OpenSSH
+# Date created:		31 May 2002
+# Whom:			dinoex
+#
+# $FreeBSD$
+#
+
+.if defined(USE_OPENSSL_BASE)
+OPENSSLBASE=		/usr
+OPENSSLDIR=		/etc/ssl
+
+.if !exists(/usr/lib/libcrypto.so)
+.BEGIN:
+	@${ECHO_CMD} "This port requires the OpenSSL library, which is part of"
+	@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
+	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
+	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/handbook/openssl.html\", for instance)"
+	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
+	@${ECHO_CMD} "OpenSSL distribution."
+	@${FALSE}
+.endif
+
+# OpenSSL in the base system may not include IDEA for patent licensing reasons.
+.if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
+OPENSSL_IDEA=		${MAKE_IDEA}
+.else
+OPENSSL_IDEA?=		NO
+.endif
+
+.if ${OPENSSL_IDEA} == "NO"
+# XXX This is a hack to work around the fact that /etc/make.conf clobbers
+#     our CFLAGS. It might not be enough for all future ports.
+.if defined(HAS_CONFIGURE)
+CFLAGS+=		-DNO_IDEA
+.else
+OPENSSL_CFLAGS+=	-DNO_IDEA
+.endif
+MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
+.endif
+
+.else
+
+OPENSSLBASE=		${LOCALBASE}
+OPENSSLDIR=		${OPENSSLBASE}/openssl
+LIB_DEPENDS+=		crypto.3:${PORTSDIR}/security/openssl
+
+.endif
+
+OPENSSLLIB=		${OPENSSLBASE}/lib
+OPENSSLINC=		${OPENSSLBASE}/include
+MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
+			OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
+
+### crypto
+#RESTRICTED=		"Contains cryptography."
+