Date: Sun, 9 Jun 2002 06:01:39 +0200 (CEST) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39054: Support USE_OPENSSL=yes in bsd.port.mk Message-ID: <200206090401.g5941dM8041437@home.dinoex.sub.org>
next in thread | raw e-mail | index | archive | help
>Number: 39054
>Category: ports
>Synopsis: Support USE_OPENSSL=yes in bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 08 21:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Dirk Meyer
>Release: FreeBSD 4.6-RC i386
>Organization:
privat
>Environment:
System: FreeBSD 4.6-RC i386
>Description:
SSL was updated in the ports,
opennsh and other ports depends on the newer version of SSL
>How-To-Repeat:
USE_OPENSSL is not maintained, some open PR#
>Fix:
move this out of bad.port.mk and give user the choice.
apply or approve the patch:
diff -u -r1.413 bsd.port.mk
--- bsd.port.mk 7 Jun 2002 21:30:47 -0000 1.413
+++ bsd.port.mk 9 Jun 2002 03:56:01 -0000
@@ -731,47 +731,7 @@
.endif
.if defined(USE_OPENSSL)
-.if ${OSVERSION} >= 400014
-.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}
-.else
-OPENSSLBASE= /usr
-OPENSSLDIR= /etc/ssl
-# 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
-.endif
-.else
-LIB_DEPENDS+= crypto.2:${PORTSDIR}/security/openssl
-OPENSSLBASE?= ${LOCALBASE}
-OPENSSLDIR?= ${OPENSSLBASE}/openssl
-.endif
-OPENSSLLIB= ${OPENSSLBASE}/lib
-OPENSSLINC= ${OPENSSLBASE}/include
-MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
- OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
-### crypto
-#RESTRICTED= "Contains cryptography."
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
.if defined(EMACS_PORT_NAME)
diff -Nu bsd.openssl.mk.orig ./bsd.openssl.mk
--- bsd.openssl.mk.orig Thu Jan 1 01:00:00 1970
+++ bsd.openssl.mk Sun Jun 9 05:51:55 2002
@@ -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."
+
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206090401.g5941dM8041437>