Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -110,7 +110,7 @@ . endif . endif # Make sure we have a default in the end -SSL_DEFAULT?= base +SSL_DEFAULT?= openssl .endif # Possible values: 8.4, 8.5, 8.6 TCLTK_DEFAULT?= 8.6 Index: audio/icecast-kh/Makefile =================================================================== --- audio/icecast-kh/Makefile +++ audio/icecast-kh/Makefile @@ -34,12 +34,11 @@ ICVERSION= 2.3.3 KH= 10 -OPTIONS_DEFINE= CURL DOCS KATE SPEEX SSL_PORT +OPTIONS_DEFINE= CURL DOCS KATE SPEEX OPTIONS_DEFAULT= CURL KATE SPEEX CURL_DESC= Support Directory server interaction (YP) via curl KATE_DESC= Support Kate/Skeleton codec within Ogg streams SPEEX_DESC= Support Speex codec within Ogg streams -SSL_PORT_DESC= Use OpenSSL from ports instead of one in the base CONFLICTS_INSTALL= icecast-[0-9]* icecast2-[0-9]* @@ -65,10 +64,4 @@ CONFIGURE_ARGS+= --without-speex .endif -.if ${PORT_OPTIONS:MSSL_PORT} -WITH_OPENSSL_PORT= yes -.else -WITH_OPENSSL_BASE= yes -.endif - .include Index: benchmarks/wrk/Makefile =================================================================== --- benchmarks/wrk/Makefile +++ benchmarks/wrk/Makefile @@ -17,7 +17,6 @@ USES= gmake USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH MAKE_ENV+= WITH_OPENSSL=${LOCALBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION} @@ -30,6 +29,10 @@ CFLAGS+= -march=i586 .endif +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Index: databases/mariadb100-server/Makefile =================================================================== --- databases/mariadb100-server/Makefile +++ databases/mariadb100-server/Makefile @@ -93,8 +93,6 @@ FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 USE_OPENSSL= yes -# See PR209419, MariaDB 10.0 fails to build with base SSL libs -WITH_OPENSSL_PORT= yes .if defined(CLIENT_ONLY) # MySQL-Client part @@ -137,6 +135,11 @@ .include +# See PR209419, MariaDB 10.0 fails to build with base SSL libs +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else Index: databases/mysql-connector-c/Makefile =================================================================== --- databases/mysql-connector-c/Makefile +++ databases/mysql-connector-c/Makefile @@ -13,7 +13,6 @@ LICENSE= GPLv2 USE_OPENSSL= yes -WITH_OPENSSL_PORT=yes USES= cmake:outsource compiler:features mysql CMAKE_ARGS+= -DWITH_SSL=system \ -DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include/openssl @@ -23,6 +22,10 @@ .include +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + .if ${ARCH} == "i386" && ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -march=i586 .endif Index: databases/mysql57-server/Makefile =================================================================== --- databases/mysql57-server/Makefile +++ databases/mysql57-server/Makefile @@ -129,19 +129,19 @@ PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif -.include +.include ### Just for the sake of FreeBSD 9.X ### .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 .if !defined(CLIENT_ONLY) EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc .endif -WITH_OPENSSL_PORT= yes +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif -.include - ### FreeBSD Version > 9.X ### .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 .if ${SSL_DEFAULT} == base Index: databases/pgbouncer/Makefile =================================================================== --- databases/pgbouncer/Makefile +++ databases/pgbouncer/Makefile @@ -41,10 +41,10 @@ PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" SUB_LIST+= PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" -.include +.include -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. .endif post-patch: @@ -65,4 +65,4 @@ @${MKDIR} ${STAGEDIR}${PGBOUNCER_RUNDIR} \ ${STAGEDIR}${PGBOUNCER_LOGDIR} -.include +.include Index: deskutils/owncloudclient/Makefile =================================================================== --- deskutils/owncloudclient/Makefile +++ deskutils/owncloudclient/Makefile @@ -38,10 +38,12 @@ PLIST_SUB= VERSION=${PORTVERSION} -.include +.include .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif # 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 @@ -56,4 +58,4 @@ pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) -.include +.include Index: devel/cargo/Makefile =================================================================== --- devel/cargo/Makefile +++ devel/cargo/Makefile @@ -79,8 +79,12 @@ BOOTSTRAP_DISTFILES= ${CARGO_BOOT}:bootstrap BOOTSTRAP_EXTRACT_ONLY= ${DISTFILES:N*\:bootstrap:C/:.*//} BOOTSTRAP_MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib" -.if !exists(/usr/lib/libssl.so.8) # OPENSSL_SHLIBVER -BOOTSTRAP_VARS+= WITH_OPENSSL_PORT=yes + +.include + +# OPENSSL_SHLIBVER ------------v +.if !exists(/usr/lib/libssl.so.8) && ${PORT_OPTION:MBOOTSTRAP} && ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. .endif post-extract: @@ -141,4 +145,4 @@ .cargo ${MAKE} -C${.CURDIR} makesum -.include +.include Index: devel/efl/Makefile =================================================================== --- devel/efl/Makefile +++ devel/efl/Makefile @@ -109,7 +109,6 @@ .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes .else CONFIGURE_ARGS+= --with-crypto=none .endif @@ -139,6 +138,12 @@ PLIST_SUB+= ELUA="" .endif +.include + +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + pre-patch: @${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ @@ -150,4 +155,4 @@ if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \ done -.include +.include Index: dns/knot1/Makefile =================================================================== --- dns/knot1/Makefile +++ dns/knot1/Makefile @@ -25,7 +25,6 @@ --with-openssl=${OPENSSLBASE} USE_LDCONFIG= yes USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes .if defined(BATCH) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --disable-silent-rules @@ -70,4 +69,10 @@ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.include +.include + +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + +.include Index: dns/unbound/Makefile =================================================================== --- dns/unbound/Makefile +++ dns/unbound/Makefile @@ -55,9 +55,6 @@ .endif .if ${PORT_OPTIONS:MGOST} -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 -WITH_OPENSSL_PORT= yes -. endif DEPENDS_ARGS+= WITH_GOST=yes .else CONFIGURE_ARGS+=--disable-gost @@ -131,4 +128,10 @@ regression-test: build (cd ${WRKSRC} && ${MAKE} test) -.include +.include + +.if ${PORT_OPTIONS:MGOST} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 && ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + +.include Index: dns/validns/Makefile =================================================================== --- dns/validns/Makefile +++ dns/validns/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libJudy.so:devel/judy USE_OPENSSL= yes -WITH_OPENSSL_PORT=yes ALL_TARGET= @@ -29,12 +28,16 @@ OPTIONS_DEFINE= DOCS -.include - 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 +.include + +.if ${SSL_DEFAULT} == base +IGNORE= Requires OpenSSL from ports, define DEFAULT_VERSIONS+=ssl=openssl in your make.conf and rebuild everything. +.endif + +.include