From owner-svn-ports-head@freebsd.org Fri Dec 14 07:02:16 2018 Return-Path: Delivered-To: svn-ports-head@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 F2F791318C32; Fri, 14 Dec 2018 07:02:15 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9754E8EDD5; Fri, 14 Dec 2018 07:02:15 +0000 (UTC) (envelope-from romain@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 80F022BC9F; Fri, 14 Dec 2018 07:02:15 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBE72Fxh056554; Fri, 14 Dec 2018 07:02:15 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBE72FIA056553; Fri, 14 Dec 2018 07:02:15 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201812140702.wBE72FIA056553@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Fri, 14 Dec 2018 07:02:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487408 - head/databases/puppetdb-cli X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: head/databases/puppetdb-cli X-SVN-Commit-Revision: 487408 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9754E8EDD5 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-1.59 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.83)[-0.828,0]; NEURAL_HAM_SHORT(-0.76)[-0.762,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 07:02:16 -0000 Author: romain Date: Fri Dec 14 07:02:15 2018 New Revision: 487408 URL: https://svnweb.freebsd.org/changeset/ports/487408 Log: Various cleanups - Add libressl-devel to the list of BROKEN_SSL; - Include bsd.port.options.mk + bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk; - Fix detection of FreeBSD 12 with OpenSSL from base; - Fix marking FreeBSD 12 with OpenSSL from base as broken. Reported by: jbeich Modified: head/databases/puppetdb-cli/Makefile Modified: head/databases/puppetdb-cli/Makefile ============================================================================== --- head/databases/puppetdb-cli/Makefile Fri Dec 14 06:18:32 2018 (r487407) +++ head/databases/puppetdb-cli/Makefile Fri Dec 14 07:02:15 2018 (r487408) @@ -11,9 +11,10 @@ COMMENT= PuppetDB CLI Tooling LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= libressl openssl111 -BROKEN_SSL_REASON_libressl= Needs an old version of OpenSSL (older than 1.1) -BROKEN_SSL_REASON_openssl111= Needs an older version of OpenSSL (older than 1.1) +BROKEN_SSL= libressl libressl-devel openssl111 +BROKEN_SSL_REASON_libressl= Needs an old version of OpenSSL (older than 1.1) +BROKEN_SSL_REASON_libressl-devel= Needs an old version of OpenSSL (older than 1.1) +BROKEN_SSL_REASON_openssl111= Needs an older version of OpenSSL (older than 1.1) USES= cargo perl5 ssl USE_GITHUB= yes @@ -94,11 +95,10 @@ CARGO_CRATES= advapi32-sys-0.2.0 \ winapi-build-0.1.1 \ winreg-0.4.0 -.include +.include -.if ${OSVERSION} >= 1200085 -BROKEN_SSL+= base -BROKEN_SSL_REASON_base= Needs an older version of OpenSSL (older than 1.1) +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base +BROKEN= Needs an older version of OpenSSL (older than 1.1) .endif PLIST_FILES= bin/puppet-db \ @@ -119,4 +119,4 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/puppet-query cd ${WRKSRC} && ./pod2man.sh ${STAGEDIR}${MANPREFIX} -.include +.include