Attachment 179252 Details for Bug 215996 – patch3

[patch] patch3

default.patch (text/plain), 27.31 KB, created by Tijl Coosemans on 2017-01-23 11:48:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2017-01-23 11:48:19 UTC

Size: 27.31 KB

patch

obsolete

>Index: Mk/bsd.default-versions.mk
>===================================================================
>--- Mk/bsd.default-versions.mk	(revision 432209)
>+++ Mk/bsd.default-versions.mk	(working copy)
>@@ -41,7 +41,7 @@ FPC_DEFAULT?=		3.0.0
> GCC_DEFAULT?=		4.9
> # Possible values: 7, 8, 9, agpl
> GHOSTSCRIPT_DEFAULT?=	agpl
>-.if defined(ARCH) && ${ARCH} == amd64
>+.if ${ARCH} == amd64
> # Possible values: c6, c6_64, c7
> LINUX_DEFAULT?=		c6_64
> .else
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 432209)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -1266,8 +1266,6 @@ GROUPS_BLACKLIST=	_dhcp _pflogd _ypldap 
> LDCONFIG_DIR=	libdata/ldconfig
> LDCONFIG32_DIR=	libdata/ldconfig32
> 
>-.endif
>-
> # At least KDE needs TMPDIR for the package building,
> # so we're setting it to the known default value.
> .if defined(PACKAGE_BUILDING)
>@@ -1280,8 +1278,12 @@ WITH_DEBUG=	yes
> .endif
> .endif
> 
>+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
> .include "${PORTSDIR}/Mk/bsd.options.mk"
> 
>+.endif
>+# End of options section.
>+
> # Start of pre-makefile section.
> .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
> 
>@@ -1291,8 +1293,6 @@ WITH_DEBUG=	yes
> 
> _PREMKINCLUDED=	yes
> 
>-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
>-
> .if defined(PORTVERSION)
> .if ${PORTVERSION:M*[-_,]*}x != x
> IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
>Index: Tools/scripts/chkversion.pl
>===================================================================
>--- Tools/scripts/chkversion.pl	(revision 432209)
>+++ Tools/scripts/chkversion.pl	(working copy)
>@@ -127,7 +127,6 @@ foreach (qw(ARCH OPSYS OSREL OSVERSION U
>     my @cachedenv = readfrom $portsdir, $make, "-V$_";
>     $ENV{$_} = $cachedenv[0];
> }
>-$ENV{WITH_OPENSSL_BASE} = 'yes';
> 
> my %pkgname;
> my %pkgorigin;
>Index: benchmarks/wrk/Makefile
>===================================================================
>--- benchmarks/wrk/Makefile	(revision 432209)
>+++ benchmarks/wrk/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	wrk
> PORTVERSION=	4.0.2
>+PORTREVISION=	1
> CATEGORIES=	benchmarks www
> 
> MAINTAINER=	osa@FreeBSD.org
>@@ -15,11 +16,9 @@ LIB_DEPENDS=	libluajit-5.1.so:lang/luaji
> USE_GITHUB=	yes
> GH_ACCOUNT=	wg
> 
>-USES=		gmake
>-USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
>+USES=		gmake ssl
> CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MATH
>-MAKE_ENV+=	WITH_OPENSSL=${LOCALBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
>+MAKE_ENV+=	WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
> 
> PLIST_FILES=	bin/wrk
> 
>Index: databases/mariadb100-client/files/patch-cmake_ssl.cmake
>===================================================================
>--- databases/mariadb100-client/files/patch-cmake_ssl.cmake	(nonexistent)
>+++ databases/mariadb100-client/files/patch-cmake_ssl.cmake	(working copy)
>@@ -0,0 +1,24 @@
>+--- cmake/ssl.cmake.orig	2016-08-24 15:07:34 UTC
>++++ cmake/ssl.cmake
>+@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL)
>+       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
>+     ENDIF()
>+ 
>+-    # On mac this list is <.dylib;.so;.a>
>+-    # We prefer static libraries, so we revert it here.
>+-    IF (WITH_SSL_PATH)
>+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
>+-    ENDIF()
>+     MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
>+     FIND_LIBRARY(OPENSSL_LIBRARIES
>+                  NAMES ssl ssleay32 ssleay32MD
>+@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL)
>+     FIND_LIBRARY(CRYPTO_LIBRARY
>+                  NAMES crypto libeay32
>+                  HINTS ${OPENSSL_ROOT_DIR}/lib)
>+-    IF (WITH_SSL_PATH)
>+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
>+-    ENDIF()
>+ 
>+     IF(OPENSSL_INCLUDE_DIR AND
>+        OPENSSL_LIBRARIES   AND
>
>Property changes on: databases/mariadb100-client/files/patch-cmake_ssl.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mariadb100-server/Makefile
>===================================================================
>--- databases/mariadb100-server/Makefile	(revision 432209)
>+++ databases/mariadb100-server/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME?=	mariadb
> PORTVERSION=	10.0.29
>+PORTREVISION=	1
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
> 		http://mirrors.supportex.net/${SITESDIR}/ \
>@@ -95,8 +96,6 @@ OPTIONS_SUB=	yes
> .endif
> 
> FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
>-# See PR209419, MariaDB 10.0 fails to build with base SSL libs
>-WITH_OPENSSL_PORT=	yes
> 
> .if defined(CLIENT_ONLY)
> # MySQL-Client part
>Index: databases/mariadb100-server/files/patch-cmake_ssl.cmake
>===================================================================
>--- databases/mariadb100-server/files/patch-cmake_ssl.cmake	(nonexistent)
>+++ databases/mariadb100-server/files/patch-cmake_ssl.cmake	(working copy)
>@@ -0,0 +1,24 @@
>+--- cmake/ssl.cmake.orig	2016-08-24 15:07:34 UTC
>++++ cmake/ssl.cmake
>+@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL)
>+       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
>+     ENDIF()
>+ 
>+-    # On mac this list is <.dylib;.so;.a>
>+-    # We prefer static libraries, so we revert it here.
>+-    IF (WITH_SSL_PATH)
>+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
>+-    ENDIF()
>+     MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
>+     FIND_LIBRARY(OPENSSL_LIBRARIES
>+                  NAMES ssl ssleay32 ssleay32MD
>+@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL)
>+     FIND_LIBRARY(CRYPTO_LIBRARY
>+                  NAMES crypto libeay32
>+                  HINTS ${OPENSSL_ROOT_DIR}/lib)
>+-    IF (WITH_SSL_PATH)
>+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
>+-    ENDIF()
>+ 
>+     IF(OPENSSL_INCLUDE_DIR AND
>+        OPENSSL_LIBRARIES   AND
>
>Property changes on: databases/mariadb100-server/files/patch-cmake_ssl.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/owncloudclient/Makefile
>===================================================================
>--- deskutils/owncloudclient/Makefile	(revision 432209)
>+++ deskutils/owncloudclient/Makefile	(working copy)
>@@ -38,17 +38,6 @@ DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRI
> 
> PLIST_SUB=	VERSION=${PORTVERSION}
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${OPSYS} != FreeBSD
>-WITH_OPENSSL_PORT=	yes
>-
>-# CMake 3.3.x will use $PATH when looking for headers and libraries by default,
>-# and OpenSSL from base will end up being used. Make sure ${LOCALBASE} is
>-# preferred over $PATH.
>-CMAKE_ARGS+=		-DCMAKE_PREFIX_PATH=${LOCALBASE}
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
>Index: devel/efl/Makefile
>===================================================================
>--- devel/efl/Makefile	(revision 432209)
>+++ devel/efl/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	efl
> PORTVERSION=	1.18.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel enlightenment
> MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
> 
>@@ -129,7 +129,6 @@ PLIST_SUB+=			AUDIO="@comment "
> 
> .if ${PORT_OPTIONS:MSSL}
> USES+=				ssl
>-WITH_OPENSSL_PORT=		yes
> .else
> CONFIGURE_ARGS+=		--with-crypto=none
> .endif
>Index: devel/efl/files/extra-patch-configure.ac
>===================================================================
>--- devel/efl/files/extra-patch-configure.ac	(revision 432209)
>+++ devel/efl/files/extra-patch-configure.ac	(nonexistent)
>@@ -1,11 +0,0 @@
>---- configure.ac.orig	2014-12-11 10:36:05.000000000 +0100
>-+++ configure.ac	2014-12-28 00:57:35.000000000 +0100
>-@@ -351,7 +351,7 @@
>-       ;;
>- 
>-    openssl)
>--      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
>-+      requirements_libs_crypto="${ECORE_CON_LIBS} ${requirements_libs_crypto}"
>-       ;;
>- esac
>- AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
>
>Property changes on: devel/efl/files/extra-patch-configure.ac
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/efl/files/patch-configure.ac
>===================================================================
>--- devel/efl/files/patch-configure.ac	(revision 432209)
>+++ devel/efl/files/patch-configure.ac	(working copy)
>@@ -1,6 +1,15 @@
>---- configure.ac.orig	2015-06-12 05:40:48.754367679 -0700
>-+++ configure.ac	2015-06-12 05:45:05.521352761 -0700
>-@@ -414,12 +414,12 @@
>+--- configure.ac.orig	2016-12-07 14:25:43 UTC
>++++ configure.ac
>+@@ -386,7 +386,7 @@ case "$build_crypto" in
>+       ;;
>+ 
>+    openssl)
>+-      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
>++      have_openssl="yes"
>+       ;;
>+ esac
>+ AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
>+@@ -442,12 +442,12 @@ AC_CHECK_HEADERS([ \
>  execinfo.h \
>  mcheck.h \
>  sys/epoll.h \
>@@ -14,7 +23,7 @@
>  ])
>  
>  EFL_CHECK_PATH_MAX
>-@@ -3995,6 +3995,7 @@
>+@@ -4732,6 +4732,7 @@ EFL_ADD_LIBS([EIO], [-lm])
>  ### Checks for linker characteristics
>  
>  ### Checks for library functions
>Index: dns/knot1/Makefile
>===================================================================
>--- dns/knot1/Makefile	(revision 432209)
>+++ dns/knot1/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	knot
> PORTVERSION=	1.6.8
>+PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
> 		http://dns-lab.com/downloads/knot-dns/
>@@ -18,14 +19,12 @@ LIB_DEPENDS=	liburcu.so:sysutils/liburcu
> 
> CONFLICTS=	knot-2.* knot2-.*
> 
>-USES=		alias bison libtool pkgconfig tar:xz
>+USES=		alias bison libtool pkgconfig ssl tar:xz
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-storage=/var/db/knot \
> 		--with-rundir=/var/run/knot \
> 		--with-openssl=${OPENSSLBASE}
> USE_LDCONFIG=	yes
>-USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
> 
> INSTALL_TARGET=	install-strip
> 
>Index: dns/validns/Makefile
>===================================================================
>--- dns/validns/Makefile	(revision 432209)
>+++ dns/validns/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	validns
> PORTVERSION=	0.8
>+PORTREVISION=	1
> CATEGORIES=	dns security
> MASTER_SITES=	http://www.validns.net/download/
> 
>@@ -14,7 +15,6 @@ LICENSE=	BSD2CLAUSE
> LIB_DEPENDS=	libJudy.so:devel/judy
> 
> USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=yes
> 
> ALL_TARGET=
> 
>@@ -31,16 +31,14 @@ OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
> 
>+.if ${SSL_DEFAULT:Mopenssl-devel}
>+BROKEN=		Does not build with openssl-devel
>+.endif
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${SSL_DEFAULT:Mopenssl-devel}
>-BROKEN=		Does not build with openssl-devel
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: ftp/curl/Makefile
>===================================================================
>--- ftp/curl/Makefile	(revision 432209)
>+++ ftp/curl/Makefile	(working copy)
>@@ -21,6 +21,7 @@ OPTIONS_RADIO_RESOLV=	CARES THREADED_RES
> OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> OPTIONS_DEFAULT=	CA_BUNDLE COOKIES HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
>+OPTIONS_DEFAULT+=	GSSAPI_${"${SSL_DEFAULT}" == "base":?BASE:NONE}
> CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
> CA_BUNDLE_IMPLIES=	OPENSSL
> COOKIES_DESC=		Cookies support
>@@ -33,14 +34,6 @@ SMB_DESC=		SMB/CIFS support
> THREADED_RESOLVER_DESC=	Threaded DNS resolver
> TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support
> 
>-.include <${.CURDIR}/../../Mk/bsd.default-versions.mk>
>-
>-.if ${SSL_DEFAULT} != base
>-OPTIONS_DEFAULT+=	GSSAPI_NONE
>-.else
>-OPTIONS_DEFAULT+=	GSSAPI_BASE
>-.endif
>-
> CONFIGURE_ARGS=	--disable-werror \
> 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
> 		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \
>Index: irc/irssi-fish/Makefile
>===================================================================
>--- irc/irssi-fish/Makefile	(revision 432209)
>+++ irc/irssi-fish/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	irssi-fish
> DISTVERSION=	1.4.20160122
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	irc security
> 
> MAINTAINER=	ashish@FreeBSD.org
>@@ -18,15 +18,15 @@ GH_PROJECT=	FiSH-irssi
> GH_ACCOUNT=	falsovsky
> GH_TAGNAME=	2b0c1c09
> 
>-USES=		cmake pkgconfig
>+USES=		cmake pkgconfig ssl
>+CMAKE_ARGS=	-D__pkg_config_checked_OPENSSL=1 -DOPENSSL_FOUND=1 \
>+		-DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \
>+		-DOPENSSL_LIBRARY_DIRS=${OPENSSLLIB}
> USE_LDCONFIG=	yes
> 
> PLIST_FILES=	lib/irssi/modules/libfish.so
> PORTDOCS=	README.md FiSH-irssi.txt
> 
>-USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
>-
> post-patch:
> 	${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE},g" \
> 			 -e "s,share/doc/FiSH-irssi,${DOCSDIR_REL},g" ${WRKSRC}/CMakeLists.txt
>Index: net/freeradius2/Makefile
>===================================================================
>--- net/freeradius2/Makefile	(revision 432209)
>+++ net/freeradius2/Makefile	(working copy)
>@@ -29,9 +29,8 @@ CONFLICTS_INSTALL=	gnu-radius-[0-9].* op
> USE_RC_SUBR=	radiusd
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf gmake libtool shebangfix tar:bzip2
>+USES=		autoreconf gmake libtool shebangfix ssl tar:bzip2
> SHEBANG_FILES=	scripts/radsqlrelay src/modules/rlm_counter/rad_counter
>-USE_OPENSSL=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> CFLAGS+=	${CPPFLAGS}
> LIBS+=		-L${LOCALBASE}/lib
>@@ -82,7 +81,7 @@ _REQUIRE=	NETWORKING SERVERS
> 
> OPTIONS_DEFINE=	USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \
> 		PGSQL UNIXODBC FIREBIRD PERL PYTHON OCI8 RUBY DHCP \
>-		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR SSL_PORT DOCS
>+		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR DOCS
> OPTIONS_DEFAULT=USER PERL PYTHON
> 
> DHCP_DESC=		With DHCP support (EXPERIMENTAL)
>@@ -96,7 +95,6 @@ EXPERIMENTAL_DESC=	Build experimental mo
> UDPFROMTO_DESC=		Compile in UDPFROMTO support
> DEVELOPER_DESC=		Enable developer options
> EDIR_DESC=		Enable eDirectory support (implies LDAP)
>-SSL_PORT_DESC=		Use OpenSSL from the ports collection
> 
> .include <bsd.port.options.mk>
> 
>@@ -285,10 +283,6 @@ CFLAGS!=	${ECHO} ${CFLAGS} | ${SED} -Ee 
> CONFIGURE_ARGS+=--with-udpfromto
> .endif
> 
>-.if ${PORT_OPTIONS:MSSL_PORT}
>-WITH_OPENSSL_PORT=yes
>-.endif
>-
> .if empty(PORT_OPTIONS:MDOCS)
> CONFIGURE_ARGS+=--without-docdir
> PLIST_SUB+=	PORTDOCS="@comment "
>Index: net/freeradius3/Makefile
>===================================================================
>--- net/freeradius3/Makefile	(revision 432209)
>+++ net/freeradius3/Makefile	(working copy)
>@@ -43,7 +43,7 @@ OPTIONS_SUB=	yes
> OPTIONS_DEFINE=	USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \
> 		PGSQL UNIXODBC FIREBIRD REDIS PYTHON RUBY \
> 		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
>-		FREETDS IDN SSL_PORT DOCS SQLITE3
>+		FREETDS IDN DOCS SQLITE3
> OPTIONS_DEFAULT=USER PERL
> 
> USER_DESC=		Run as user freeradius, group freeradius
>@@ -56,7 +56,6 @@ UDPFROMTO_DESC=		Compile in UDPFROMTO su
> DEVELOPER_DESC=		Enable developer options
> EDIR_DESC=		Enable eDirectory support (implies LDAP)
> REST_DESC=		Enable RESTful API support
>-SSL_PORT_DESC=		Use OpenSSL from the ports collection
> 
> SQLITE3_CONFIGURE_WITH=rlm_sql_sqlite
> SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
>@@ -282,10 +281,6 @@ CONFIGURE_ARGS+=--quiet
> CONFIGURE_ARGS+=--with-udpfromto
> .endif
> 
>-.if ${PORT_OPTIONS:MSSL_PORT}
>-WITH_OPENSSL_PORT=yes
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> # if we're installing, place sample configs into ${EXAMPLESDIR}
>Index: net-im/jabberd/Makefile
>===================================================================
>--- net-im/jabberd/Makefile	(revision 432209)
>+++ net-im/jabberd/Makefile	(working copy)
>@@ -102,10 +102,6 @@ EXPERIMENTAL_DESC=	Enable experimental f
> 
> .include <bsd.port.options.mk>
> 
>-.if ${OPSYS} != FreeBSD
>-WITH_OPENSSL_PORT=	yes
>-.endif
>-
> .if ${PORT_OPTIONS:MPGSQL}
> _REQUIRE+=		postgresql
> .endif
>Index: net-mgmt/virt-viewer/Makefile
>===================================================================
>--- net-mgmt/virt-viewer/Makefile	(revision 432209)
>+++ net-mgmt/virt-viewer/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	virt-viewer
> PORTVERSION=	4.0
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
> 
>@@ -19,9 +20,6 @@ LIB_DEPENDS=	libvirt.so:devel/libvirt \
> 		libgtk-vnc-2.0.so:net/gtk-vnc \
> 		libspice-client-glib-2.0.so:deskutils/spice-gtk
> 
>-USE_OPENSSL=yes
>-WITH_OPENSSL_PORT=yes
>-
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> 
>Index: security/opencryptoki/Makefile
>===================================================================
>--- security/opencryptoki/Makefile	(revision 432209)
>+++ security/opencryptoki/Makefile	(working copy)
>@@ -18,9 +18,6 @@ LIB_DEPENDS=	libtspi.so:security/trouser
> 
> USES=		alias autoreconf gmake libtool ssl tar:tgz
> USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
>-.if exists(/usr/include/openssl/md2.h)
>-WITH_OPENSSL_PORT=yes
>-.endif
> WRKSRC=		${WRKDIR}/${PORTNAME}
> INSTALL_TARGET=	install-strip
> GNU_CONFIGURE=	yes
>Index: security/softhsm2/Makefile
>===================================================================
>--- security/softhsm2/Makefile	(revision 432209)
>+++ security/softhsm2/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	softhsm
> PORTVERSION=	2.2.0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://dist.opendnssec.org/source/ \
> 		http://dist.opendnssec.org/source/testing/
>@@ -35,13 +36,12 @@ OPTIONS_DEFAULT=	CRYP_OPEN
> CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
> CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
> CRYP_OPEN_USE=		openssl=yes
>-CRYP_OPEN_VARS=		WITH_OPENSSL_PORT=yes
> CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if ${SSL_DEFAULT:Mlibressl*}
> CONFIGURE_ARGS+=	--disable-gost
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: sysutils/ori/Makefile
>===================================================================
>--- sysutils/ori/Makefile	(revision 432209)
>+++ sysutils/ori/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ori
> PORTVERSION=	0.8.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	sysutils net
> MASTER_SITES=	http://cdn.bitbucket.org/orifs/ori/downloads/
> 
>@@ -13,9 +13,10 @@ COMMENT=	Ori distributed file system
> LIB_DEPENDS=	libevent.so:devel/libevent2 \
> 		libboost_date_time.so:devel/boost-libs
> 
>-USES=		execinfo fuse pkgconfig scons tar:xz
>-USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
>+USES=		execinfo fuse pkgconfig scons ssl tar:xz
>+CPPPATH=	${OPENSSLINC}
>+LIBPATH=	${OPENSSLLIB}
>+MAKE_ARGS=	LIBS="ssl crypto"
> 
> PLIST_FILES=	bin/ori \
> 		bin/oridbg \
>Index: sysutils/ori/files/patch-SConstruct
>===================================================================
>--- sysutils/ori/files/patch-SConstruct	(nonexistent)
>+++ sysutils/ori/files/patch-SConstruct	(working copy)
>@@ -0,0 +1,18 @@
>+--- SConstruct.orig	2014-01-17 06:40:03 UTC
>++++ SConstruct
>+@@ -302,15 +302,6 @@ if (env["WITH_MDNS"]) and (sys.platform 
>+ 	print 'Please install libdns_sd'
>+ 	Exit(1)
>+ 
>+-if env["HAS_PKGCONFIG"]:
>+-    if not conf.CheckPkg("openssl"):
>+-        print 'openssl is not registered in pkg-config'
>+-        Exit(1)
>+-    if not conf.CheckPkgMinVersion("openssl", "1.0.0"):
>+-        print 'openssl version 1.0.0 or above required'
>+-        Exit(1)
>+-    env.ParseConfig('pkg-config --libs --cflags openssl')
>+-
>+ conf.Finish()
>+ 
>+ Export('env')
>
>Property changes on: sysutils/ori/files/patch-SConstruct
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/syslog-ng36/Makefile
>===================================================================
>--- sysutils/syslog-ng36/Makefile	(revision 432209)
>+++ sysutils/syslog-ng36/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	syslog-ng
> PORTVERSION=	3.6.4
>+PORTREVISION=	1
> .if !defined(MASTERDIR)
> PKGNAMESUFFIX=	36
> .endif
>@@ -52,8 +53,7 @@ CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MOPENSSL}
>-USE_OPENSSL=		yes
>-WITH_OPENSSL_PORT=	yes
>+USES+=			ssl
> CONFIGURE_ARGS+=	--enable-ssl
> CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
> 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
>Index: www/mod_tsa/Makefile
>===================================================================
>--- www/mod_tsa/Makefile	(revision 432209)
>+++ www/mod_tsa/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mod_tsa
> PORTVERSION=	1.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www
> MASTER_SITES=	http://am.nesiac.org/static/ \
> 		http://ubique.spb.ru/src/
>@@ -21,8 +21,7 @@ CONFIGURE_ARGS=	--with-openssl-incdir=${
> 				--with-apxs=${APXS}
> MAKE_ARGS+=	APXS=${APXS}
> 
>-USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
>+USES=		ssl
> USE_APACHE=	22+
> AP_EXTRAS+=	-DMOD_TSA_VERSION=\\\"mod_tsa/${PORTVERSION}\\\"
> AP_FAST_BUILD=	yes
>@@ -51,7 +50,7 @@ AP_LIB+=	-lpq
> .endif
> 
> .if ${PORT_OPTIONS:MFIREBIRD}
>-USE+=			firebird
>+USES+=			firebird
> CONFIGURE_ARGS+=	--enable-firebird=yes
> SRC_FILE+=	db_firebird.c
> AP_LIB+=	-lgds
>Index: www/nginx/Makefile
>===================================================================
>--- www/nginx/Makefile	(revision 432209)
>+++ www/nginx/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nginx
> PORTVERSION=	1.10.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> PORTEPOCH=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/
>@@ -446,6 +446,9 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_ct
> .endif
> NGINX_OPENSSL=	yes
> USE_HTTP_SSL=	yes
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
>+IGNORE=		CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
>+.endif
> .endif
> 
> .if ${PORT_OPTIONS:MECHO}
>@@ -1158,9 +1161,9 @@ USERS?=	${WWWOWN}
> GROUPS?=${WWWGRP}
> 
> .if defined(NGINX_OPENSSL)
>-USE_OPENSSL=	yes
>-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
>-WITH_OPENSSL_PORT=yes
>+USES+=		ssl
>+.if ${SSL_DEFAULT:Mopenssl-devel}
>+BROKEN=		Does not build with openssl-devel
> .endif
> .endif
> 
>@@ -1366,10 +1369,4 @@ post-install:
> 	${CAT} ${WRKSRC}/conf/nginx.conf \
> 		>>${STAGEDIR}${ETCDIR}/nginx.conf-dist
> 
>-.include <bsd.port.pre.mk>
>-
>-.if defined(NGINX_OPENSSL) && ${SSL_DEFAULT:Mopenssl-devel}
>-BROKEN=		Does not build with openssl-devel
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: www/nginx-devel/Makefile
>===================================================================
>--- www/nginx-devel/Makefile	(revision 432209)
>+++ www/nginx-devel/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nginx
> PORTVERSION=	1.11.8
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/
> MASTER_SITES+=	LOCAL/osa
>@@ -450,6 +451,9 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_ct
> .endif
> NGINX_OPENSSL=	yes
> USE_HTTP_SSL=	yes
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
>+IGNORE=		CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
>+.endif
> .endif
> 
> .if ${PORT_OPTIONS:MECHO}
>@@ -1173,10 +1177,7 @@ USERS?=	${WWWOWN}
> GROUPS?=${WWWGRP}
> 
> .if defined(NGINX_OPENSSL)
>-USE_OPENSSL=	yes
>-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
>-WITH_OPENSSL_PORT=yes
>-.endif
>+USES+=		ssl
> .endif
> 
> pre-everything::
>Index: www/node/Makefile
>===================================================================
>--- www/node/Makefile	(revision 432209)
>+++ www/node/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> PORTNAME=	node
> PORTVERSION=	7.4.0
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> 
>@@ -13,7 +14,7 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
>-OPTIONS_DEFAULT=	DTRACE
>+OPTIONS_DEFAULT=BUNDLED_SSL DTRACE
> OPTIONS_SUB=	yes
> 
> .if !exists(/usr/sbin/dtrace)
>@@ -57,21 +58,18 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
> 
> .if empty(PORT_OPTIONS:MBUNDLED_SSL)
> 
>-.if ${OSVERSION} < 1100085
>-# node.js requires openssl 1.0.2, use the port since base isn't new enough
>-WITH_OPENSSL_PORT=	yes
>-.endif
>-
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
>+IGNORE=		node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
> .if !empty(SSL_DEFAULT:Mlibressl*)
> IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
> .endif
>+
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
> .if ${ARCH} == "armv6"
> CONFIGURE_ARGS+=--openssl-no-asm
> .endif
>Index: www/node4/Makefile
>===================================================================
>--- www/node4/Makefile	(revision 432209)
>+++ www/node4/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	node
> PORTVERSION=	4.7.2
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> PKGNAMESUFFIX=	4
>@@ -15,6 +16,7 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
>+OPTIONS_DEFAULT=BUNDLED_SSL
> OPTIONS_SUB=	yes
> 
> BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation #'
>@@ -45,19 +47,14 @@ LIB_DEPENDS+=	libuv.so:devel/libuv
> 
> .if empty(PORT_OPTIONS:MBUNDLED_SSL)
> 
>-.if ${OSVERSION} < 1100085
>-# node.js requires openssl 1.0.2, use the port since base isn't new enough
>-WITH_OPENSSL_PORT=yes
>-.endif
>-
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
>+IGNORE=		node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
> .if !empty(SSL_DEFAULT:Mlibressl*)
> IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
> .endif
>+
> .endif
> 
> post-patch:
>@@ -89,4 +86,4 @@ post-configure:
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: www/node6/Makefile
>===================================================================
>--- www/node6/Makefile	(revision 432209)
>+++ www/node6/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> PORTNAME=	node
> PORTVERSION=	6.9.4
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> PKGNAMESUFFIX=	6
>@@ -14,7 +15,7 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
>-OPTIONS_DEFAULT=	DTRACE
>+OPTIONS_DEFAULT=BUNDLED_SSL DTRACE
> OPTIONS_SUB=	yes
> 
> .if !exists(/usr/sbin/dtrace)
>@@ -58,21 +59,18 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
> 
> .if empty(PORT_OPTIONS:MBUNDLED_SSL)
> 
>-.if ${OSVERSION} < 1100085
>-# node.js requires openssl 1.0.2, use the port since base isn't new enough
>-WITH_OPENSSL_PORT=	yes
>-.endif
>-
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
>+IGNORE=		node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_SSL)
> .if !empty(SSL_DEFAULT:Mlibressl*)
> IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
> .endif
>+
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
> .if ${ARCH} == "armv6"
> CONFIGURE_ARGS+=--openssl-no-asm
> .endif

Actions: View | Diff

Attachments on bug 215996: 178791 | 178866 | 179252 | 179498