svn commit: r483548 - in head/sysutils: syslog-ng36 syslog-ng37

[Cy Schubert]

Author: cy
Date: Wed Oct 31 05:10:44 2018
New Revision: 483548
URL: https://svnweb.freebsd.org/changeset/ports/483548

Log:
  Rather than flag syslog-ng ports that do not support openssl111
  unconditionally BROKEN under FreeBSD 12 & 13, only flag BROKEN
  when security/openssl is not installed on systems after
  openssl111 was committed to 12-CURRENT.
  
  PR:		232710
  Reported by:	linimon

Modified:
  head/sysutils/syslog-ng36/Makefile   (contents, props changed)
  head/sysutils/syslog-ng37/Makefile   (contents, props changed)

Modified: head/sysutils/syslog-ng36/Makefile
==============================================================================
--- head/sysutils/syslog-ng36/Makefile	Wed Oct 31 05:10:40 2018	(r483547)
+++ head/sysutils/syslog-ng36/Makefile	Wed Oct 31 05:10:44 2018	(r483548)
@@ -55,8 +55,12 @@ CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --locals
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
-BROKEN_FreeBSD_12=	Fails to build with openssl111
-BROKEN_FreeBSD_13=	Fails to build with openssl111
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085
+.if ${SSL_DEFAULT} != "openssl"
+BROKEN_FreeBSD_12=	fails to build with openssl111, install security/openssl
+BROKEN_FreeBSD_13=	fails to build with openssl111, install security/openssl
+.endif
+.endif
 USES+=			ssl
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \

Modified: head/sysutils/syslog-ng37/Makefile
==============================================================================
--- head/sysutils/syslog-ng37/Makefile	Wed Oct 31 05:10:40 2018	(r483547)
+++ head/sysutils/syslog-ng37/Makefile	Wed Oct 31 05:10:44 2018	(r483548)
@@ -23,8 +23,6 @@ BUILD_DEPENDS=		xsltproc:textproc/libxslt
 
 DEPRECATED=		No longer officially supported by Balabit, does not support openssl111
 EXPIRATION_DATE=	2018-12-31
-BROKEN_FreeBSD_12=	fails to build with openssl111
-BROKEN_FreeBSD_13=	fails to build with openssl111
 BROKEN_powerpc64=	fails to link: Internal error: Segmentation fault (program ld)
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
@@ -123,6 +121,13 @@ PYTHON_USES=			python:2.7
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so
 
 .include <bsd.port.pre.mk>
+
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085
+.if ${SSL_DEFAULT} != "openssl"
+BROKEN_FreeBSD_12=	fails to build with openssl111, install security/openssl
+BROKEN_FreeBSD_13=	fails to build with openssl111, install security/openssl
+.endif
+.endif
 
 post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist