Date: Tue, 19 Nov 2002 22:58:00 +0100 From: Marc Recht <marc@informatik.uni-bremen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: knu@FreeBSD.org Subject: ports/45495: fix for bsd.port.mk Message-ID: <38850000.1037743080@leeloo.intern.geht.de>
next in thread | raw e-mail | index | archive | help
>Number: 45495
>Category: ports
>Synopsis: Fix port bsd.port.mk to build when there is no system ssl
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 19 14:00:06 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Marc Recht <marc@informatik.uni-bremen.de>
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD leeloo.intern.geht.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0:
Tue Nov 19 19:05:23 CET 2002
root@leeloo.intern.geht.de:/usr/obj/usr/src/sys/LEELOO i386
>Description:
If ${OSVERSION} >= 400014 then bsd.port.mk tries to use the system ssl and
fails
if none is available. Since it could be that the openssl port is installed,
it
should check for it, too. The attached patch fixes that problem.
>How-To-Repeat:
Remove system ssl and try to build a port with USE_SSL.
>Fix:
--- bsd.port.mk.orig Tue Nov 19 20:19:21 2002
+++ bsd.port.mk Tue Nov 19 20:23:56 2002
@@ -734,7 +734,7 @@
.if defined(USE_OPENSSL)
.if ${OSVERSION} >= 400014
-.if !exists(/usr/lib/libcrypto.so)
+.if !exists(/usr/lib/libcrypto.so) &&
!exists(${LOCALBASE}/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"
@@ -744,8 +744,14 @@
@${ECHO_CMD} "OpenSSL distribution."
@${FALSE}
.else
+.if exists(/usr/lib/libcrypto.so)
OPENSSLBASE= /usr
OPENSSLDIR= /etc/ssl
+.else
+LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl
+OPENSSLBASE?= ${LOCALBASE}
+OPENSSLDIR?= ${OPENSSLBASE}/openssl
+.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}
@@ -764,7 +770,7 @@
.endif
.endif
.else
-LIB_DEPENDS+= crypto.2:${PORTSDIR}/security/openssl
+LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl
OPENSSLBASE?= ${LOCALBASE}
OPENSSLDIR?= ${OPENSSLBASE}/openssl
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
X-send-pr-version: 3.113
X-GNATS-Notify:
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?38850000.1037743080>