Date: Sat, 20 Oct 2018 21:41:06 +0000 (UTC) From: Eugene Grosbein <eugen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482627 - head/net/mpd5 Message-ID: <201810202141.w9KLf6hG041500@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eugen Date: Sat Oct 20 21:41:05 2018 New Revision: 482627 URL: https://svnweb.freebsd.org/changeset/ports/482627 Log: net/mpd5: make it possible to build with ssl=openssl111 Now as FreeBSD 12 got openssl-1.1.1 in base system and /usr/include/openssl/ssl.h and /usr/local/include/openssl/ssl.h are indentical, it is safe to allow building net/mpd5 with DEFAULT_VERSIONS having ssl=openssl111 and no reasons to break the build. However, resulting binary still links with base system /usr/lib/libssl.so because of libfetch(3) needs it and mpd5 links with libfetch too. Modified: head/net/mpd5/Makefile Modified: head/net/mpd5/Makefile ============================================================================== --- head/net/mpd5/Makefile Sat Oct 20 21:39:35 2018 (r482626) +++ head/net/mpd5/Makefile Sat Oct 20 21:41:05 2018 (r482627) @@ -14,9 +14,8 @@ COMMENT= Multi-link PPP daemon based on netgraph(4) LICENSE= BSD3CLAUSE -BROKEN_SSL= openssl-devel openssl111 +BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openss-devel= needs libfetch(3) linked with system libssl -BROKEN_SSL_REASON_openssl111= needs libfetch(3) linked with system libssl OPTIONS_DEFINE= DOCS NG_IPACCT NG_IPACCT_DESC= Use ng_ipacct kernel module from port @@ -29,6 +28,11 @@ USES= ssl .include <bsd.port.options.mk> MAKE_ARGS+= OSVERSION=${OSVERSION} + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1200085 +BROKEN_SSL+= openssl111 +BROKEN_SSL_REASON_openssl111= needs libfetch(3) linked with system libssl +.endif .if ${PORT_OPTIONS:MNG_IPACCT} BUILD_DEPENDS+= ${LOCALBASE}/include/netgraph/ng_ipacct.h:net-mgmt/ng_ipacct
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810202141.w9KLf6hG041500>