From owner-svn-ports-all@freebsd.org Sat Oct 20 21:41:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3456FF6F6C; Sat, 20 Oct 2018 21:41:06 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 69B338AB97; Sat, 20 Oct 2018 21:41:06 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64A8123D52; Sat, 20 Oct 2018 21:41:06 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9KLf6VN041501; Sat, 20 Oct 2018 21:41:06 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9KLf6hG041500; Sat, 20 Oct 2018 21:41:06 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201810202141.w9KLf6hG041500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sat, 20 Oct 2018 21:41:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482627 - head/net/mpd5 X-SVN-Group: ports-head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/net/mpd5 X-SVN-Commit-Revision: 482627 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2018 21:41:06 -0000 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 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