Attachment #171505 for bug #210322

Lines 98-103 shebang() { Link Here

(-)Mk/Scripts/qa.sh (+9 lines)
98		98
99	baselibs() {	99	baselibs() {
100	local rc	100	local rc
		101	local found_openssl
101	[ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return	102	[ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return
102	while read f; do	103	while read f; do
103	case ${f} in	104	case ${f} in
Lines 109-120 baselibs() { Link Here
109	err "Bad linking on ${f##* } please add USES=libedit"	110	err "Bad linking on ${f##* } please add USES=libedit"
110	rc=1	111	rc=1
111	;;	112	;;
		113	NEEDED\[libcrypto.so.]\|NEEDED\[libssl.so.])
		114	found_openssl=1
		115	;;
112	esac	116	esac
113	done <<-EOF	117	done <<-EOF
114	$(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \	118	$(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \
115	${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/libexec \	119	${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/libexec \
116	-type f -exec readelf -d {} + 2>/dev/null)	120	-type f -exec readelf -d {} + 2>/dev/null)
117	EOF	121	EOF
		122	if [ -z "${USESSSL}" -a -n "${found_openssl}" ]; then
		123	warn "you need USES=nssl"
		124	elif [ -n "${USESSSL}" -a -z "${found_openssl}" ]; then
		125	warn "you may not need USES=ssl"
		126	fi
118	return ${rc}	127	return ${rc}
119	}	128	}
120		129




# $FreeBSD$
#
# Handle dependency on *ssl ports.
#
# Feature:	SSL_DEFAULT
# Usage:	USES=ssl
# Valid ARGS:	none
#
# The use can choose which ssl library he wants with:
#
# DEFAULT_VERSIONS+=	ssl=openssl
#
# valid values are base, openssl, openssl-devel, libressl,
# and libressl-devel.
#
# The Makefile sets these variables:
# OPENSSLBASE		- "/usr" or ${LOCALBASE}
# OPENSSLDIR		- path to openssl
# OPENSSLLIB		- path to the libs
# OPENSSLINC		- path to the matching includes
# OPENSSLRPATH		- rpath for dynamic linker
#
# MAKE_ENV		- extended with the variables above
# CONFIGURE_ENV		- extended with LDFLAGS
# BUILD_DEPENDS		- are added if needed
# RUN_DEPENDS		- are added if needed
#
# MAINTAINER:	portmgr@FreeBSD.org
#
.if !defined(_INCLUDE_USES_SSL_MK)
_INCLUDE_USES_SSL_MK=	yes

.include "${PORTSDIR}/Mk/bsd.default-versions.mk"

.if ${SSL_DEFAULT} == base
OPENSSLBASE=		/usr
OPENSSLDIR?=		/etc/ssl

.  if !exists(${DESTDIR}/usr/lib/libcrypto.so)
check-depends::
	@${ECHO_CMD} "Dependency error: 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/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
	@${ECHO_CMD} "OpenSSL distribution."
	@${FALSE}
.  endif
.  if exists(${LOCALBASE}/lib/libcrypto.so)
check-depends::
	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
	@${ECHO_CMD} "base system. You can't build against it, while a newer"
	@${ECHO_CMD} "version is installed by a port."
	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
	@${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 # ${SSL_DEFAULT} != base

OPENSSLBASE=		${LOCALBASE}

OPENSSL_PORT=		security/${SSL_DEFAULT}

# Get OPENSSL_SHLIBVER from the port
.sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>

.  if !defined(OPENSSL_SHLIBVER)
.error You are using an unsupported SSL provider ${SSL_DEFAULT}
.  endif

OPENSSLDIR?=		${OPENSSLBASE}/openssl
BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
OPENSSLRPATH=		${LOCALBASE}/lib

.endif

OPENSSLLIB=		${OPENSSLBASE}/lib
OPENSSLINC=		${OPENSSLBASE}/include

MAKE_ENV+=		OPENSSLBASE=${OPENSSLBASE}
MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}

.if defined(OPENSSLRPATH)
.  if defined(USE_OPENSSL_RPATH)
CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
.  endif
MAKE_ENV+=		OPENSSLRPATH=${OPENSSLRPATH}
OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
.endif

LDFLAGS+=		${OPENSSL_LDFLAGS}

.endif




#
# $FreeBSD$
# bsd.openssl.mk - Support for OpenSSL based ports.
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
# The user/port can now set these options in the Makefiles.
#
# WITH_OPENSSL_BASE=yes	- Use the version in the base system.
# WITH_OPENSSL_PORT=yes	- Use the OpenSSL port, even if base is up to date.
#
# USE_OPENSSL_RPATH=yes	- Pass RFLAGS options in CFLAGS,
#			  needed for ports who don't use LDFLAGS.
#
# Overrideable defaults:
#
# OPENSSL_SHLIBVER=	8
# OPENSSL_PORT=		security/openssl
#
# The Makefile sets these variables:
# OPENSSLBASE		- "/usr" or ${LOCALBASE}
# OPENSSLDIR		- path to openssl
# OPENSSLLIB		- path to the libs
# OPENSSLINC		- path to the matching includes
# OPENSSLRPATH		- rpath for dynamic linker
#
# MAKE_ENV		- extended with the variables above
# CONFIGURE_ENV		- extended with LDFLAGS
# BUILD_DEPENDS		- are added if needed
# RUN_DEPENDS		- are added if needed

OpenSSL_Include_MAINTAINER=	dinoex@FreeBSD.org

.include "${PORTSDIR}/Mk/bsd.default-versions.mk"

.if ${SSL_DEFAULT} == base
OPENSSLBASE=		/usr
OPENSSLDIR?=		/etc/ssl

.  if !exists(${DESTDIR}/usr/lib/libcrypto.so)
check-depends::
	@${ECHO_CMD} "Dependency error: 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/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
	@${ECHO_CMD} "OpenSSL distribution."
	@${FALSE}
.  endif
.  if exists(${LOCALBASE}/lib/libcrypto.so)
check-depends::
	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
	@${ECHO_CMD} "base system. You can't build against it, while a newer"
	@${ECHO_CMD} "version is installed by a port."
	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
	@${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 # ${SSL_DEFAULT} != base

OPENSSLBASE=		${LOCALBASE}

OPENSSL_PORT=		security/${SSL_DEFAULT}

# Get OPENSSL_SHLIBVER from the port
.sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>

.  if !defined(OPENSSL_SHLIBVER)
.error You are using an unsupported SSL provider ${SSL_DEFAULT}
.  endif

OPENSSLDIR?=		${OPENSSLBASE}/openssl
BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
OPENSSLRPATH=		${LOCALBASE}/lib

.endif

OPENSSLLIB=		${OPENSSLBASE}/lib
OPENSSLINC=		${OPENSSLBASE}/include

MAKE_ENV+=		OPENSSLBASE=${OPENSSLBASE}
MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}

.if defined(OPENSSLRPATH)
.  if defined(USE_OPENSSL_RPATH)
CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
.  endif
MAKE_ENV+=		OPENSSLRPATH=${OPENSSLRPATH}
OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
.endif

LDFLAGS+=		${OPENSSL_LDFLAGS}

### crypto
#RESTRICTED=		"Contains cryptography."

Lines 1352-1358 PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg Link Here

(-)Mk/bsd.port.mk (-1 / +4 lines)
1352	.endif	1352	.endif
1353		1353
1354	.if defined(USE_OPENSSL)	1354	.if defined(USE_OPENSSL)
1355	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	1355	USES+= ssl
1356	.endif	1356	.endif
1357		1357
1358	.if defined(USE_EMACS)	1358	.if defined(USE_EMACS)
Lines 1524-1529 QA_ENV+= STAGEDIR=${STAGEDIR} \ Link Here
1524	PKGORIGIN=${PKGORIGIN} \	1524	PKGORIGIN=${PKGORIGIN} \
1525	LIB_RUN_DEPENDS='${_LIB_RUN_DEPENDS:C,[^:]:([^:]):?.*,\1,}' \	1525	LIB_RUN_DEPENDS='${_LIB_RUN_DEPENDS:C,[^:]:([^:]):?.*,\1,}' \
1526	PKGBASE=${PKGBASE}	1526	PKGBASE=${PKGBASE}
		1527	.if !empty(USES:Mssl)
		1528	QA_ENV+= USESSSL=yes
		1529	.endif
1527	.if !empty(USES:Mdesktop-file-utils)	1530	.if !empty(USES:Mdesktop-file-utils)
1528	QA_ENV+= USESDESKTOPFILEUTILS=yes	1531	QA_ENV+= USESDESKTOPFILEUTILS=yes
1529	.endif	1532	.endif




		libxslt.so:textproc/libxslt

USE_LDCONFIG=	yes
USES=		libtool gmake pkgconfig compiler:c++11-lang ssl
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	"OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
		OPENSSL_LIBS=-L${OPENSSLLIB}

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

# This port needs OpenSSL 0.9.8b which is present in 7.0 and up
USE_OPENSSL=	yes

.include <bsd.port.pre.mk>

.include "${PORTSDIR}/Mk/bsd.openssl.mk"

# If we use the base OpenSSL either by default or
# by design, we need to remove the openssl dependency
# in pkgconfig/libopkele.pc.




OPTIONS_DEFAULT=	EVENT ANYEVENT SSL

.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>

BUILD_DEPENDS=	p5-Storable>=0:devel/p5-Storable


.endif

.if ${PORT_OPTIONS:MSSL}
USES+=		ssl
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
BUILD_DEPENDS+=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
.endif

RUN_DEPENDS:=	${BUILD_DEPENDS}

.include <bsd.port.mk>

Lines 30-36 USE_RC_SUBR= ${PORTNAME} Link Here

(-)dns/opendd/Makefile (-1 / +1 lines)
30	.endif	30	.endif
31		31
32	.if ${PORT_OPTIONS:MOPENSSL}	32	.if ${PORT_OPTIONS:MOPENSSL}
33	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	33	USES+= ssl
34	CFLAGS+= -I${OPENSSLINC}	34	CFLAGS+= -I${OPENSSLINC}
35	LDFLAGS+= -L${OPENSSLLIB}	35	LDFLAGS+= -L${OPENSSLLIB}
36	MAKE_ENV+= "USE_SOCKET_SSL=yes"	36	MAKE_ENV+= "USE_SOCKET_SSL=yes"

Lines 57-63 VSFTPD_NO_OPTIMIZED= -e "s\|-O2 \|\|" Link Here

(-)ftp/vsftpd-ext/Makefile (-1 / +1 lines)
57	.endif	57	.endif
58		58
59	.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)	59	.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)
60	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	60	USES+= ssl
61	SSL_SUFFIX= -ssl	61	SSL_SUFFIX= -ssl
62	CFLAGS+= -I${OPENSSLINC}	62	CFLAGS+= -I${OPENSSLINC}
63	LDFLAGS+= -L${OPENSSLLIB}	63	LDFLAGS+= -L${OPENSSLLIB}

Lines 33-39 STACKPROTECTOR_DESC= Build with stack-protector Link Here

(-)ftp/vsftpd/Makefile (-1 / +1 lines)
33	.include <bsd.port.options.mk>	33	.include <bsd.port.options.mk>
34		34
35	.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)	35	.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL)
36	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	36	USES+= ssl
37	SSL_SUFFIX= -ssl	37	SSL_SUFFIX= -ssl
38	CFLAGS+= -I${OPENSSLINC}	38	CFLAGS+= -I${OPENSSLINC}
39	LDFLAGS+= -L${OPENSSLLIB}	39	LDFLAGS+= -L${OPENSSLLIB}

Lines 108-117 PLIST_SUB+= LDAP="@comment " Link Here

(-)net/isc-dhcp43-server/Makefile (-2 / +1 lines)
108	.endif	108	.endif
109		109
110	.if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP}	110	.if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP}
111	USE_OPENSSL= yes	111	USES+= ssl
112	CONFIGURE_ARGS+=--with-ldapcrypto	112	CONFIGURE_ARGS+=--with-ldapcrypto
113	LIBS+= -lssl	113	LIBS+= -lssl
114	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
115	.endif	114	.endif
116		115
117	.if ${PORT_OPTIONS:MIPV6}	116	.if ${PORT_OPTIONS:MIPV6}

Lines 18-24 USES= cran:auto-plist Link Here

(-)security/R-cran-openssl/Makefile (-1 / +1 lines)
18	.if ${OSVERSION} < 1000015	18	.if ${OSVERSION} < 1000015
19	WITH_OPENSSL_PORT= yes	19	WITH_OPENSSL_PORT= yes
20	R_POSTCMD_INSTALL_OPTIONS+= --configure-vars="INCLUDE_DIR=${OPENSSLINC} LIB_DIR=${OPENSSLLIB}"	20	R_POSTCMD_INSTALL_OPTIONS+= --configure-vars="INCLUDE_DIR=${OPENSSLINC} LIB_DIR=${OPENSSLLIB}"
21	.include "${PORTSDIR}/Mk/bsd.openssl.mk"	21	USES+= ssl
22	.endif	22	.endif
23		23
24	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 61-66 HASHDIG_TOOLS_DESC= Install hashdig tools Link Here

(-)security/ftimes/Makefile (-2 / +2 lines)
61	MAP_TOOLS_DESC= Install map tools	61	MAP_TOOLS_DESC= Install map tools
62	XMAGIC_DESC= XMagic support	62	XMAGIC_DESC= XMagic support
63		63
		64	SSL_USES= ssl
		65
64	.include <bsd.port.pre.mk>	66	.include <bsd.port.pre.mk>
65		67
66	LIB_DEPENDS+= libpcre.so:devel/pcre	68	LIB_DEPENDS+= libpcre.so:devel/pcre
Lines 110-117 PLIST_SUB+= MAP_TOOLS="@comment " Link Here
110	.endif	112	.endif
111		113
112	.if ${PORT_OPTIONS:MSSL}	114	.if ${PORT_OPTIONS:MSSL}
113	# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
114	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
115	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}	115	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
116	.else	116	.else
117	CONFIGURE_ARGS+= --without-ssl	117	CONFIGURE_ARGS+= --without-ssl




# Other options set via 'make config':

.if ${PORT_OPTIONS:MSSL}
USES+=		ssl
# works when it is defined before bsd.port{.pre}.mk is .included.
# This makes it currently impossible to combine this macro with OPTIONS to
# conditionally include OpenSSL support.
# XXX: is this still true with OptionsNG as of 2015-03?
#.include "${.CURDIR}/../../Mk/bsd.openssl.mk"
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
CFLAGS+=		-I${OPENSSLINC}
LDFLAGS+=		-L${OPENSSLLIB}

Return to bug 210322

Lines 309-321 CONFIGURE_ARGS+= --enable-security-cert-validators="${security_cert_validators}" Link Here

(-)www/squid-devel/Makefile (-7 / +1 lines)
309	# Other options set via 'make config':	309	# Other options set via 'make config':
310		310
311	.if ${PORT_OPTIONS:MSSL}	311	.if ${PORT_OPTIONS:MSSL}
312	# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only	312	USES+= ssl
313	# works when it is defined before bsd.port{.pre}.mk is .included.
314	# This makes it currently impossible to combine this macro with OPTIONS to
315	# conditionally include OpenSSL support.
316	# XXX: is this still true with OptionsNG as of 2015-03?
317	#.include "${.CURDIR}/../../Mk/bsd.openssl.mk"
318	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
319	CONFIGURE_ARGS+= --with-openssl="${OPENSSLBASE}"	313	CONFIGURE_ARGS+= --with-openssl="${OPENSSLBASE}"
320	CFLAGS+= -I${OPENSSLINC}	314	CFLAGS+= -I${OPENSSLINC}
321	LDFLAGS+= -L${OPENSSLLIB}	315	LDFLAGS+= -L${OPENSSLLIB}

Added Link Here

(-)Mk/Uses/ssl.mk (+114 lines)
1	# $FreeBSD$
2	#
3	# Handle dependency on *ssl ports.
4	#
5	# Feature: SSL_DEFAULT
6	# Usage: USES=ssl
7	# Valid ARGS: none
8	#
9	# The use can choose which ssl library he wants with:
10	#
11	# DEFAULT_VERSIONS+= ssl=openssl
12	#
13	# valid values are base, openssl, openssl-devel, libressl,
14	# and libressl-devel.
15	#
16	# The Makefile sets these variables:
17	# OPENSSLBASE - "/usr" or ${LOCALBASE}
18	# OPENSSLDIR - path to openssl
19	# OPENSSLLIB - path to the libs
20	# OPENSSLINC - path to the matching includes
21	# OPENSSLRPATH - rpath for dynamic linker
22	#
23	# MAKE_ENV - extended with the variables above
24	# CONFIGURE_ENV - extended with LDFLAGS
25	# BUILD_DEPENDS - are added if needed
26	# RUN_DEPENDS - are added if needed
27	#
28	# MAINTAINER: portmgr@FreeBSD.org
29	#
30	.if !defined(_INCLUDE_USES_SSL_MK)
31	_INCLUDE_USES_SSL_MK= yes
32
33	.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
34
35	.if ${SSL_DEFAULT} == base
36	OPENSSLBASE= /usr
37	OPENSSLDIR?= /etc/ssl
38
39	. if !exists(${DESTDIR}/usr/lib/libcrypto.so)
40	check-depends::
41	@${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of"
42	@${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your"
43	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
44	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
45	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
46	@${ECHO_CMD} "OpenSSL distribution."
47	@${FALSE}
48	. endif
49	. if exists(${LOCALBASE}/lib/libcrypto.so)
50	check-depends::
51	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
52	@${ECHO_CMD} "base system. You can't build against it, while a newer"
53	@${ECHO_CMD} "version is installed by a port."
54	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
55	@${FALSE}
56	. endif
57
58	# OpenSSL in the base system may not include IDEA for patent licensing reasons.
59	. if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
60	OPENSSL_IDEA= ${MAKE_IDEA}
61	. else
62	OPENSSL_IDEA?= NO
63	. endif
64
65	. if ${OPENSSL_IDEA} == "NO"
66	# XXX This is a hack to work around the fact that /etc/make.conf clobbers
67	# our CFLAGS. It might not be enough for all future ports.
68	. if defined(HAS_CONFIGURE)
69	CFLAGS+= -DNO_IDEA
70	. else
71	OPENSSL_CFLAGS+= -DNO_IDEA
72	. endif
73	MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
74	. endif
75
76	.else # ${SSL_DEFAULT} != base
77
78	OPENSSLBASE= ${LOCALBASE}
79
80	OPENSSL_PORT= security/${SSL_DEFAULT}
81
82	# Get OPENSSL_SHLIBVER from the port
83	.sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>
84
85	. if !defined(OPENSSL_SHLIBVER)
86	.error You are using an unsupported SSL provider ${SSL_DEFAULT}
87	. endif
88
89	OPENSSLDIR?= ${OPENSSLBASE}/openssl
90	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
91	RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
92	OPENSSLRPATH= ${LOCALBASE}/lib
93
94	.endif
95
96	OPENSSLLIB= ${OPENSSLBASE}/lib
97	OPENSSLINC= ${OPENSSLBASE}/include
98
99	MAKE_ENV+= OPENSSLBASE=${OPENSSLBASE}
100	MAKE_ENV+= OPENSSLDIR=${OPENSSLDIR}
101	MAKE_ENV+= OPENSSLINC=${OPENSSLINC}
102	MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB}
103
104	.if defined(OPENSSLRPATH)
105	. if defined(USE_OPENSSL_RPATH)
106	CFLAGS+= -Wl,-rpath,${OPENSSLRPATH}
107	. endif
108	MAKE_ENV+= OPENSSLRPATH=${OPENSSLRPATH}
109	OPENSSL_LDFLAGS+= -Wl,-rpath,${OPENSSLRPATH}
110	.endif
111
112	LDFLAGS+= ${OPENSSL_LDFLAGS}
113
114	.endif

Removed Link Here

(-)Mk/bsd.openssl.mk (-116 lines)
1	#
2	# $FreeBSD$
3	# bsd.openssl.mk - Support for OpenSSL based ports.
4	#
5	# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
6	#
7	# The user/port can now set these options in the Makefiles.
8	#
9	# WITH_OPENSSL_BASE=yes - Use the version in the base system.
10	# WITH_OPENSSL_PORT=yes - Use the OpenSSL port, even if base is up to date.
11	#
12	# USE_OPENSSL_RPATH=yes - Pass RFLAGS options in CFLAGS,
13	# needed for ports who don't use LDFLAGS.
14	#
15	# Overrideable defaults:
16	#
17	# OPENSSL_SHLIBVER= 8
18	# OPENSSL_PORT= security/openssl
19	#
20	# The Makefile sets these variables:
21	# OPENSSLBASE - "/usr" or ${LOCALBASE}
22	# OPENSSLDIR - path to openssl
23	# OPENSSLLIB - path to the libs
24	# OPENSSLINC - path to the matching includes
25	# OPENSSLRPATH - rpath for dynamic linker
26	#
27	# MAKE_ENV - extended with the variables above
28	# CONFIGURE_ENV - extended with LDFLAGS
29	# BUILD_DEPENDS - are added if needed
30	# RUN_DEPENDS - are added if needed
31
32	OpenSSL_Include_MAINTAINER= dinoex@FreeBSD.org
33
34	.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
35
36	.if ${SSL_DEFAULT} == base
37	OPENSSLBASE= /usr
38	OPENSSLDIR?= /etc/ssl
39
40	. if !exists(${DESTDIR}/usr/lib/libcrypto.so)
41	check-depends::
42	@${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of"
43	@${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your"
44	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
45	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
46	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
47	@${ECHO_CMD} "OpenSSL distribution."
48	@${FALSE}
49	. endif
50	. if exists(${LOCALBASE}/lib/libcrypto.so)
51	check-depends::
52	@${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD"
53	@${ECHO_CMD} "base system. You can't build against it, while a newer"
54	@${ECHO_CMD} "version is installed by a port."
55	@${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE."
56	@${FALSE}
57	. endif
58
59	# OpenSSL in the base system may not include IDEA for patent licensing reasons.
60	. if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
61	OPENSSL_IDEA= ${MAKE_IDEA}
62	. else
63	OPENSSL_IDEA?= NO
64	. endif
65
66	. if ${OPENSSL_IDEA} == "NO"
67	# XXX This is a hack to work around the fact that /etc/make.conf clobbers
68	# our CFLAGS. It might not be enough for all future ports.
69	. if defined(HAS_CONFIGURE)
70	CFLAGS+= -DNO_IDEA
71	. else
72	OPENSSL_CFLAGS+= -DNO_IDEA
73	. endif
74	MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
75	. endif
76
77	.else # ${SSL_DEFAULT} != base
78
79	OPENSSLBASE= ${LOCALBASE}
80
81	OPENSSL_PORT= security/${SSL_DEFAULT}
82
83	# Get OPENSSL_SHLIBVER from the port
84	.sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk>
85
86	. if !defined(OPENSSL_SHLIBVER)
87	.error You are using an unsupported SSL provider ${SSL_DEFAULT}
88	. endif
89
90	OPENSSLDIR?= ${OPENSSLBASE}/openssl
91	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
92	RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
93	OPENSSLRPATH= ${LOCALBASE}/lib
94
95	.endif
96
97	OPENSSLLIB= ${OPENSSLBASE}/lib
98	OPENSSLINC= ${OPENSSLBASE}/include
99
100	MAKE_ENV+= OPENSSLBASE=${OPENSSLBASE}
101	MAKE_ENV+= OPENSSLDIR=${OPENSSLDIR}
102	MAKE_ENV+= OPENSSLINC=${OPENSSLINC}
103	MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB}
104
105	.if defined(OPENSSLRPATH)
106	. if defined(USE_OPENSSL_RPATH)
107	CFLAGS+= -Wl,-rpath,${OPENSSLRPATH}
108	. endif
109	MAKE_ENV+= OPENSSLRPATH=${OPENSSLRPATH}
110	OPENSSL_LDFLAGS+= -Wl,-rpath,${OPENSSLRPATH}
111	.endif
112
113	LDFLAGS+= ${OPENSSL_LDFLAGS}
114
115	### crypto
116	#RESTRICTED= "Contains cryptography."

Lines 177-183 SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ Link Here

(-)Mk/bsd.sanity.mk (-1 / +3 lines)
177	PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \	177	PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
178	USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \	178	USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
179	UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD	179	UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD
180	SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_BDB USE_MYSQL WANT_MYSQL_VER	180	SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \
		181	USE_BDB USE_MYSQL WANT_MYSQL_VER USE_OPENSSL
181	SANITY_NOTNEEDED= WX_UNICODE	182	SANITY_NOTNEEDED= WX_UNICODE
182		183
183	USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes	184	USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes
Lines 221-226 USE_FIREBIRD_ALT= USES=firebird Link Here
221	USE_BDB_ALT= USES=bdb:${USE_BDB}	222	USE_BDB_ALT= USES=bdb:${USE_BDB}
222	USE_MYSQL_ALT= USES=mysql:${USE_MYSQL}	223	USE_MYSQL_ALT= USES=mysql:${USE_MYSQL}
223	WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER}	224	WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER}
		225	USE_OPENSSL_ALT= USES=ssl
224		226
225	.for a in ${SANITY_DEPRECATED}	227	.for a in ${SANITY_DEPRECATED}
226	.if defined(${a})	228	.if defined(${a})

Lines 19-25 LIB_DEPENDS= libcurl.so:ftp/curl \ Link Here

(-)devel/libopkele/Makefile (-6 / +1 lines)
19	libxslt.so:textproc/libxslt	19	libxslt.so:textproc/libxslt
20		20
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22	USES= libtool gmake pkgconfig compiler:c++11-lang	22	USES= libtool gmake pkgconfig compiler:c++11-lang ssl
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	CONFIGURE_ENV= "OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \	24	CONFIGURE_ENV= "OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
25	OPENSSL_LIBS=-L${OPENSSLLIB}	25	OPENSSL_LIBS=-L${OPENSSLLIB}
Lines 27-39 CPPFLAGS+= -I${LOCALBASE}/include Link Here
27	CFLAGS+= -I${LOCALBASE}/include	27	CFLAGS+= -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	28	LDFLAGS+= -L${LOCALBASE}/lib
29		29
30	# This port needs OpenSSL 0.9.8b which is present in 7.0 and up
31	USE_OPENSSL= yes
32
33	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
34		31
35	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
36
37	# If we use the base OpenSSL either by default or	32	# If we use the base OpenSSL either by default or
38	# by design, we need to remove the openssl dependency	33	# by design, we need to remove the openssl dependency
39	# in pkgconfig/libopkele.pc.	34	# in pkgconfig/libopkele.pc.

Lines 26-32 SSL_DESC= Dependency to SSL lib Link Here

(-)devel/p5-Event-RPC/Makefile (-4 / +2 lines)
26	OPTIONS_DEFAULT= EVENT ANYEVENT SSL	26	OPTIONS_DEFAULT= EVENT ANYEVENT SSL
27		27
28	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>
29	.include <bsd.port.pre.mk>
30		29
31	BUILD_DEPENDS= p5-Storable>=0:devel/p5-Storable	30	BUILD_DEPENDS= p5-Storable>=0:devel/p5-Storable
32		31
Lines 43-53 BUILD_DEPENDS+= p5-Glib2>=0:devel/p5-Glib2 Link Here
43	.endif	42	.endif
44		43
45	.if ${PORT_OPTIONS:MSSL}	44	.if ${PORT_OPTIONS:MSSL}
46	# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk	45	USES+= ssl
47	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
48	BUILD_DEPENDS+= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL	46	BUILD_DEPENDS+= p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
49	.endif	47	.endif
50		48
51	RUN_DEPENDS:= ${BUILD_DEPENDS}	49	RUN_DEPENDS:= ${BUILD_DEPENDS}
52		50
53	.include <bsd.port.post.mk>	51	.include <bsd.port.mk>