diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2018-12-14 07:02:15 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2018-12-14 07:02:15 +0000 |
| commit | 552387772deaf4d04eaaa3ca7f1876467fcb2e09 (patch) | |
| tree | 20c09a667bfae79a52650d7d12ce485d5082a40b /databases/puppetdb-cli | |
| parent | New port: sysutils/goawk: AWK interpreter written in Go (diff) | |
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
Notes
Notes:
svn path=/head/; revision=487408
Diffstat (limited to 'databases/puppetdb-cli')
| -rw-r--r-- | databases/puppetdb-cli/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/databases/puppetdb-cli/Makefile b/databases/puppetdb-cli/Makefile index f7521b78935c..011b92e36c6d 100644 --- a/databases/puppetdb-cli/Makefile +++ b/databases/puppetdb-cli/Makefile @@ -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 <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.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 <bsd.port.post.mk> +.include <bsd.port.mk> |