svn commit: r487408 - head/databases/puppetdb-cli

[Romain Tartière]

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 <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>