Date: Thu, 16 Jun 2016 13:23:13 +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: r416966 - in head: archivers/py-borgbackup databases/mariadb101-server databases/mysql57-server devel/libgit2 devel/libopkele devel/thrift-cpp dns/bind9-devel dns/bind910 dns/bind99 emu... Message-ID: <201606161323.u5GDNDIu077213@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Jun 16 13:23:13 2016 New Revision: 416966 URL: https://svnweb.freebsd.org/changeset/ports/416966 Log: Fix usage of WITH_OPENSSL_BASE, WITH_OPENSSL_PORT and OPENSSL_PORT. WITH_OPENSSL_* can't be set after bsd.port.pre.mk. Fold all other usage into using SSL_DEFAULT == foo PR: 210149 Submitted by: mat Exp-run by: antoine Sponsored by: The FreeBSD Foundation, Absolight Differential Revision: https://reviews.freebsd.org/D6577 Modified: head/archivers/py-borgbackup/Makefile (contents, props changed) head/databases/mariadb101-server/Makefile (contents, props changed) head/databases/mysql57-server/Makefile (contents, props changed) head/devel/libgit2/Makefile (contents, props changed) head/devel/libopkele/Makefile (contents, props changed) head/devel/thrift-cpp/Makefile (contents, props changed) head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind910/Makefile (contents, props changed) head/dns/bind99/Makefile (contents, props changed) head/emulators/virtualbox-ose/Makefile (contents, props changed) head/ftp/curl/Makefile (contents, props changed) head/mail/deforaos-mailer/Makefile (contents, props changed) head/mail/dk-milter/Makefile (contents, props changed) head/mail/sendmail/Makefile (contents, props changed) head/net-im/telepathy-gabble/Makefile (contents, props changed) head/net-im/telepathy-idle/Makefile (contents, props changed) head/net-mgmt/net-snmp/Makefile (contents, props changed) head/net-mgmt/zabbix3-server/Makefile (contents, props changed) head/net/hostapd/Makefile (contents, props changed) head/net/openldap24-server/Makefile (contents, props changed) head/net/socat/Makefile (contents, props changed) head/net/tigervnc/Makefile (contents, props changed) head/security/R-cran-openssl/Makefile (contents, props changed) head/security/bro/Makefile (contents, props changed) head/security/hpenc/Makefile (contents, props changed) head/security/libssh2/Makefile (contents, props changed) head/security/p5-openxpki/Makefile (contents, props changed) head/security/pam_ocra/Makefile (contents, props changed) head/security/py-m2crypto/Makefile (contents, props changed) head/security/s2n/Makefile (contents, props changed) head/security/softhsm2/Makefile (contents, props changed) head/security/stunnel/Makefile (contents, props changed) head/www/libmicrohttpd/Makefile (contents, props changed) head/www/spdylay/Makefile (contents, props changed) head/x11-servers/xorg-server/Makefile (contents, props changed) Modified: head/archivers/py-borgbackup/Makefile ============================================================================== --- head/archivers/py-borgbackup/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/archivers/py-borgbackup/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -27,17 +27,19 @@ USES= python:3.4+ USE_PYTHON= autoplist distutils USE_OPENSSL= yes -.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 +.include <bsd.port.options.mk> # borg requires openssl>=1.0.0 .if ${OSVERSION} < 1000015 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 + post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/*.so Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/databases/mariadb101-server/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -144,12 +144,12 @@ post-install: ${STAGEDIR}/${PREFIX}/share/pkgconfig .endif # defined(CLIENT_ONLY) -.if defined(WITH_OPENSSL_PORT) -GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - .include <bsd.port.pre.mk> +.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} +IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.endif + .if ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/databases/mysql57-server/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -129,7 +129,7 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> ### Just for the sake of FreeBSD 9.X ### .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 @@ -137,10 +137,14 @@ PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--s EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc .endif WITH_OPENSSL_PORT= yes +CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} +.endif + +.include <bsd.port.pre.mk> ### FreeBSD Version > 9.X ### -.else -.if defined(WITH_OPENSSL_BASE) +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 +.if ${SSL_DEFAULT} == base CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} Modified: head/devel/libgit2/Makefile ============================================================================== --- head/devel/libgit2/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/devel/libgit2/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -40,7 +40,7 @@ BROKEN_sparc64= does not install: thread post-patch: @${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \ /LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \ ${WRKSRC}/CMakeLists.txt .endif Modified: head/devel/libopkele/Makefile ============================================================================== --- head/devel/libopkele/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/devel/libopkele/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -41,7 +41,7 @@ USE_OPENSSL= yes post-patch: @ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \ ${WRKSRC}/Makefile.in -.if !defined(WITH_OPENSSL_PORT) +.if ${SSL_DEFAULT} == base @ ${REINPLACE_CMD} -e "s|Requires: openssl|Requires:|" ${WRKSRC}/libopkele.pc.in .endif Modified: head/devel/thrift-cpp/Makefile ============================================================================== --- head/devel/thrift-cpp/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/devel/thrift-cpp/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= \ .include <bsd.port.pre.mk> -.if !defined(WITH_OPENSSL_PORT) && \ +.if ${SSL_DEFAULT} == base && \ ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 # src/thrift/transport/TSSLSocket.cpp:147: error: 'TLSv1_1_method' was not declared in this scope # src/thrift/transport/TSSLSocket.cpp:149: error: 'TLSv1_2_method' was not declared in this scope Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/dns/bind9-devel/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -207,9 +207,9 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE) +.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ - WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \ + DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/dns/bind910/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -232,9 +232,9 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE) +.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ - WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \ + DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/dns/bind99/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -191,9 +191,9 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.if ( ${PORT_OPTIONS:MGOST} ) && defined(WITH_OPENSSL_BASE) +.if ( ${PORT_OPTIONS:MGOST} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ - WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \ + DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/emulators/virtualbox-ose/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -209,7 +209,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-C ${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk .endif -.if !defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} != base CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" .endif Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/ftp/curl/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -32,7 +32,10 @@ THREADED_RESOLVER_DESC= Threaded DNS res TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support LOCALBASE?= /usr/local -.if defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) + +.include <${PORTSDIR}/Mk/bsd.default-versions.mk> + +.if ${SSL_DEFAULT} != base OPTIONS_DEFAULT+= GSSAPI_NONE .else OPTIONS_DEFAULT+= GSSAPI_BASE @@ -148,11 +151,11 @@ IGNORE= only supports TLS-SRP with eith IGNORE= only supports LDAPS with SSL .endif -.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so))) +.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} != base IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif -.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl" +.if ${SSL_DEFAULT} == libressl .if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options .endif Modified: head/mail/deforaos-mailer/Makefile ============================================================================== --- head/mail/deforaos-mailer/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/mail/deforaos-mailer/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -36,7 +36,7 @@ DOCS_BUILD_DEPENDS= xsltproc:textproc/li .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base # openssl from base doesn't install a .pc file and pkg-config didn't like it CONFIGURE_ENV+= libssl_CFLAGS="-I${OPENSSLINC}" libssl_LIBS="-L${OPENSSLLIB} -lssl" .endif Modified: head/mail/dk-milter/Makefile ============================================================================== --- head/mail/dk-milter/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/mail/dk-milter/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -85,7 +85,7 @@ SITE_SUB+= -e '\|bld_USE_ARLIB|s/^dnl // SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g' .endif -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base SITE_SUB+= -e 's|%%OPENSSL%%|dnl |g' .else SITE_SUB+= -e 's|%%OPENSSL%%||g' \ Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/mail/sendmail/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -310,7 +310,7 @@ help: .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MTLS} -.if !defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} != base SITE+= ${FILESDIR}/site.config.m4.ssl .endif SITE+= ${FILESDIR}/site.config.m4.tls Modified: head/net-im/telepathy-gabble/Makefile ============================================================================== --- head/net-im/telepathy-gabble/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net-im/telepathy-gabble/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -33,7 +33,9 @@ INSTALL_TARGET= install-strip PLIST_SUB= PVERSION=${PORTVERSION} -.if defined(WITH_OPENSSL_BASE) +.include <bsd.port.pre.mk> + +.if ${SSL_DEFAULT} == base CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" .endif @@ -41,4 +43,4 @@ post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ ${WRKSRC}/lib/ext/wocky/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net-im/telepathy-idle/Makefile ============================================================================== --- head/net-im/telepathy-idle/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net-im/telepathy-idle/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -23,7 +23,7 @@ INSTALL_TARGET= install-strip .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" OPENSSL_CFLAGS="-I/usr/include" .endif Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net-mgmt/net-snmp/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -215,7 +215,7 @@ CONFLICTS= ucd-snmp-4.* net-snmp-5.3.* .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_PORT) || defined(OPENSSL_PORT) +.if ${SSL_DEFAULT} != base LCRYPTO= -lcrypto .else LCRYPTO= Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net-mgmt/zabbix3-server/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -150,10 +150,10 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:sec POLARSSL_CONFIGURE_WITH=mbedtls POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) -IGNORE= OpenSSL from the base system is too old, add WITH_OPENSSL_PORT to your /etc/make.conf and rebuild everything that needs SSL. +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base +IGNORE= OpenSSL from the base system is too old, add DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything that needs SSL. .endif post-patch: @@ -192,6 +192,8 @@ post-install: ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) .endif +.else # frontend +.include <bsd.port.pre.mk> .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net/hostapd/Makefile ============================================================================== --- head/net/hostapd/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net/hostapd/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -24,16 +24,16 @@ OPTIONS_DEFINE= PORTS_SSL PORTS_SSL_DESC= Build with OpenSSL from ports (instead of base system) -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MPORTS_SSL} -.if !defined(WITH_OPENSSL_PORT) -IGNORE= the PORTS_SSL option not allowed when WITH_OPENSSL_PORT is not set +.if ${SSL_DEFAULT} == base +IGNORE= the PORTS_SSL option not allowed when using SSL from base .endif CONFIGURE_ARGS+= --with-ssl-dir=${PREFIX} .else -.if defined(WITH_OPENSSL_PORT) -IGNORE= the PORTS_SSL option is required when WITH_OPENSSL_PORT is set +.if ${SSL_DEFAULT} != base +IGNORE= the PORTS_SSL option is required when using SSL from ports .endif .endif @@ -52,4 +52,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \ ${STAGEDIR}${MANPREFIX}/man/man8 -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net/openldap24-server/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -189,14 +189,6 @@ CONFIGURE_ARGS= --with-threads=posix \ # XXX FreeBSD does not implement O_DSYNC and fdatasync at this time. CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync -.if !${PORT_OPTIONS:MFETCH} -CONFIGURE_ARGS+= --without-fetch -.else -. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || defined(WITH_OPENSSL_PORT) -BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported -. endif -.endif - .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl @@ -512,6 +504,16 @@ PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLI PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR} PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR} +.include <bsd.port.pre.mk> + +.if !${PORT_OPTIONS:MFETCH} +CONFIGURE_ARGS+= --without-fetch +.else +. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base +BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported +. endif +.endif + post-patch: @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf @@ -588,4 +590,4 @@ post-install: .endif .endif # defined(CLIENT_ONLY) -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net/socat/Makefile ============================================================================== --- head/net/socat/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net/socat/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_PORT) +.if ${SSL_DEFAULT} != base CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/net/tigervnc/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -110,7 +110,7 @@ CONFIGURE_ARGS+= \ TIGERVNC_XORG_PATCH_VER= 117 # import from x11-server/xorg-server/Makefile -.ifdef WITH_OPENSSL_BASE +.if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't # install a .pc file and configure will fail trying to find it. # Setting both of those variables to a *non-empty* value by-passes Modified: head/security/R-cran-openssl/Makefile ============================================================================== --- head/security/R-cran-openssl/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/R-cran-openssl/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -13,7 +13,7 @@ LICENSE= MIT USES= cran:auto-plist -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes @@ -21,4 +21,4 @@ R_POSTCMD_INSTALL_OPTIONS+= --configure- .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/bro/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -137,8 +137,8 @@ CMAKE_ARGS+= -D CMAKE_EXE_LINKER_FLAGS=" BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl .else -.if defined(WITH_OPENSSL_PORT) -IGNORE= the SSL option is requred when WITH_OPENSSL_PORT is enabled +.if ${SSL_DEFAULT} != base +IGNORE= the SSL option is requred when using SSL from ports .endif .endif Modified: head/security/hpenc/Makefile ============================================================================== --- head/security/hpenc/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/hpenc/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -28,21 +28,14 @@ CXXFLAGS+= -std=c++11 \ -I${OPENSSLINC} LDFLAGS+= -pthread -lcrypto -L${OPENSSLLIB} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 WITH_OPENSSL_PORT= yes - -# XXX: brain damage warning -# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only -# works when it is defined before bsd.port{.pre}.mk is .included. -# This makes it currently impossible to combine this macro with OSVERSION to -# conditionally select WITH_OPENSSL_PORT for OSVERSIONS before 1000015 -.include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif post-install: ${INSTALL_MAN} ${WRKSRC}/doc/hpenc.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hpenc -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/libssh2/Makefile ============================================================================== --- head/security/libssh2/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/libssh2/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -43,7 +43,7 @@ USE_OPENSSL= yes post-patch: @${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \ ${WRKSRC}/libssh2.pc.in -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base @${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \ ${WRKSRC}/configure .endif Modified: head/security/p5-openxpki/Makefile ============================================================================== --- head/security/p5-openxpki/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/p5-openxpki/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -114,7 +114,7 @@ post-stage: .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_PORT) && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl +.if ${SSL_DEFAULT} == libressl IGNORE= this version of OpenXPKI is not fully functional with LibreSSL library, use OpenSSL instead .endif Modified: head/security/pam_ocra/Makefile ============================================================================== --- head/security/pam_ocra/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/pam_ocra/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -11,6 +11,7 @@ COMMENT= RFC6287 (OCRA) PAM module LICENSE= BSD2CLAUSE USES= uidfix +USE_OPENSSL= yes USE_GITHUB= yes @@ -22,7 +23,7 @@ PLIST_FILES= lib/pam_ocra.so \ man/man8/pam_ocra.8.gz \ man/man8/ocra_tool.8.gz -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes @@ -30,10 +31,4 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif -# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only -# works when it is defined before bsd.port{.pre}.mk is .included. -# This makes it currently impossible to combine this macro with OSVERSION to -# conditionally select WITH_OPENSSL_PORT for OSVERSIONS before 1000015. -.include "${PORTSDIR}/Mk/bsd.openssl.mk" - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/py-m2crypto/Makefile ============================================================================== --- head/security/py-m2crypto/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/py-m2crypto/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -27,7 +27,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/M2Cry .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) +.if ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base IGNORE= py-m2crypto requires OpenSSL 1.0.1e+ .endif Modified: head/security/s2n/Makefile ============================================================================== --- head/security/s2n/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/s2n/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -17,17 +17,17 @@ GH_TAGNAME= c6da8bb OPTIONS_DEFINE= DOCS EXAMPLES USES= gmake +USE_OPENSSL=yes USE_LDCONFIG= yes NO_CONFIGURE= yes SUB_FILES= pkg-message Makefile ALL_TARGET= bin -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} < 1000015 WITH_OPENSSL_PORT= yes -.include "${PORTSDIR}/Mk/bsd.openssl.mk" CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib .endif @@ -50,4 +50,4 @@ do-install: tests: build ${GMAKE} PLATFORM=FreeBSD CRYPTO_LDFLAGS=-L${LOCALBASE}/lib -C ${WRKSRC}/tests -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/softhsm2/Makefile ============================================================================== --- head/security/softhsm2/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/softhsm2/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -38,8 +38,10 @@ CRYP_OPEN_USE= openssl=yes CRYP_OPEN_VARS= WITH_OPENSSL_PORT=yes CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl -.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl +.include <bsd.port.pre.mk> + +.if ${SSL_DEFAULT} == libressl CONFIGURE_ARGS+= --disable-gost .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/security/stunnel/Makefile ============================================================================== --- head/security/stunnel/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/security/stunnel/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -74,11 +74,13 @@ CONFIGURE_ARGS+=--with-threads=pthread LDFLAGS+= -lpthread .endif -.if ${PORT_OPTIONS:MFIPS} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT} == libressl IGNORE= LibreSSL does not support FIPS standard .endif -.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl +.if ${SSL_DEFAULT} == libressl NO_PACKAGE= The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries .endif @@ -115,4 +117,4 @@ cert: @${ECHO} "" @(cd ${WRKSRC}/tools/; make install-data-local) -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/www/libmicrohttpd/Makefile ============================================================================== --- head/www/libmicrohttpd/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/www/libmicrohttpd/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -41,7 +41,7 @@ PLIST_FILES= include/microhttpd.h \ .include <bsd.port.pre.mk> -.if !(defined(WITH_OPENSSL_BASE) && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015) +.if !(${SSL_DEFAULT} == base && ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015) PLIST_FILES+= include/microspdy.h \ lib/libmicrospdy.a \ lib/libmicrospdy.so \ Modified: head/www/spdylay/Makefile ============================================================================== --- head/www/spdylay/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/www/spdylay/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -37,7 +37,7 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) +.if ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base IGNORE= spdylay requires OpenSSL 1.0.1+ .endif Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Thu Jun 16 13:22:58 2016 (r416965) +++ head/x11-servers/xorg-server/Makefile Thu Jun 16 13:23:13 2016 (r416966) @@ -64,7 +64,7 @@ PLIST= ${.CURDIR}/pkg-plist .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_BASE) +.if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606161323.u5GDNDIu077213>