Date: Mon, 4 Jul 2016 10:01:09 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418011 - in head: archivers/py-attic dns/ldns net/openntpd security/bro www/aws-demos Message-ID: <201607041001.u64A19La026614@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jul 4 10:01:09 2016 New Revision: 418011 URL: https://svnweb.freebsd.org/changeset/ports/418011 Log: Fix ports depending on security/(open|libre)ssl directly. Sponsored by: Absolight Modified: head/archivers/py-attic/Makefile (contents, props changed) head/dns/ldns/Makefile (contents, props changed) head/net/openntpd/Makefile (contents, props changed) head/security/bro/Makefile (contents, props changed) head/www/aws-demos/Makefile (contents, props changed) Modified: head/archivers/py-attic/Makefile ============================================================================== --- head/archivers/py-attic/Makefile Mon Jul 4 09:47:25 2016 (r418010) +++ head/archivers/py-attic/Makefile Mon Jul 4 10:01:09 2016 (r418011) @@ -24,13 +24,14 @@ USE_OPENSSL= yes STRIP_FILES= hashindex.so platform_freebsd.so chunker.so crypto.so PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} < 1000015 -BUILD_DEPENDS+= openssl>=1.0:security/openssl -RUN_DEPENDS+= openssl>=1.0:security/openssl +WITH_OPENSSL_PORT= yes .endif +.include <bsd.port.pre.mk> + .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: head/dns/ldns/Makefile ============================================================================== --- head/dns/ldns/Makefile Mon Jul 4 09:47:25 2016 (r418010) +++ head/dns/ldns/Makefile Mon Jul 4 10:01:09 2016 (r418011) @@ -80,7 +80,7 @@ INSTALL_TARGET+=install-manpages .if ${PORT_OPTIONS:MGOST} . if ${OSVERSION} < 1000015 -BUILD_DEPENDS+= openssl>=1.0:security/openssl +WITH_OPENSSL_PORT= yes CONFLICTS+= libressl-* . endif .else Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Mon Jul 4 09:47:25 2016 (r418010) +++ head/net/openntpd/Makefile Mon Jul 4 10:01:09 2016 (r418011) @@ -28,7 +28,6 @@ OPTIONS_DEFAULT= RESSL # Requires libtls from LibreSSL RESSL_USE= openssl=yes RESSL_VARS= with_openssl_port=yes \ - openssl_port=security/libressl RESSL_CONFIGURE_WITH= cacert=${LOCALBASE}/etc/ssl/cert.pem RESSL_CPPFLAGS= -I${LOCALBASE}/include RESSL_LDFLAGS= -L${LOCALBASE}/lib @@ -41,4 +40,10 @@ pre-build: post-install: cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MRESSL} && empty(SSL_DEFAULT:Mlibressl*) +IGNORE= Requires LibreSSL from ports, define DEFAULT_VERSIONS+=ssl=libressl in your make.conf and rebuild everything. +.endif + +.include <bsd.port.post.mk> Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Mon Jul 4 09:47:25 2016 (r418010) +++ head/security/bro/Makefile Mon Jul 4 10:01:09 2016 (r418011) @@ -68,6 +68,8 @@ PORTS_SSL_DESC= Build with OpenSSL from OPTIONS_EXCLUDE=NLS DOCS +PORTS_SSL_VARS= WITH_OPENSSL_PORT=yes + .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MBROCCOLI} @@ -134,8 +136,6 @@ CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=fa .if ${PORT_OPTIONS:MPORTS_SSL} CMAKE_ARGS+= -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl -RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl .else .if ${SSL_DEFAULT} != base IGNORE= the SSL option is requred when using SSL from ports Modified: head/www/aws-demos/Makefile ============================================================================== --- head/www/aws-demos/Makefile Mon Jul 4 09:47:25 2016 (r418010) +++ head/www/aws-demos/Makefile Mon Jul 4 10:01:09 2016 (r418011) @@ -69,7 +69,8 @@ DEMO_DIRS+= zdemo .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSSL} -LIB_DEPENDS+= libssl.so:security/openssl +USES+= ssl +WITH_OPENSSL_PORT= yes CONF_ARGS+= SOCKET=openssl DEMO_DIRS+= agent DEMO_DIRS+= runme
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607041001.u64A19La026614>