svn commit: r412619 - in head/dns: bind9-devel bind910 bind99

[Mathieu Arnold]

Author: mat
Date: Wed Apr  6 13:53:09 2016
New Revision: 412619
URL: https://svnweb.freebsd.org/changeset/ports/412619

Log:
  Stop bringing in OpenSSL from ports, it builds fine with the base one on
  9, and WITH_OPENSSL_PORT does not belong in a port's Makefile anyway.
  
  Not bumping PORTREVISION because:
  - if you are building with poudriere, it will detect that a dependency
    has changed and rebuild it.
  - if you are building from ports, you will have OpenSSL from ports
    installed, and it will choose to use it.
  
  Sponsored by:	Absolight

Modified:
  head/dns/bind9-devel/Makefile   (contents, props changed)
  head/dns/bind910/Makefile   (contents, props changed)
  head/dns/bind99/Makefile   (contents, props changed)

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Wed Apr  6 13:33:56 2016	(r412618)
+++ head/dns/bind9-devel/Makefile	Wed Apr  6 13:53:09 2016	(r412619)
@@ -195,15 +195,9 @@ PLIST_SUB+=	NOBASE="" BASE="@comment "
 SUB_LIST+=	NOBASE="" BASE="@comment "
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
-.if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1}
-WITH_OPENSSL_PORT=yes
-.endif
 .else
 PLIST_SUB+=	NOBASE="@comment " BASE=""
 SUB_LIST+=	NOBASE="@comment " BASE=""
-.if ${PORT_OPTIONS:MSSL}
-WITH_OPENSSL_PORT=	yes
-.endif
 .endif
 
 PKGDEINSTALL=	${PKGINSTALL}
@@ -211,6 +205,14 @@ PKGDEINSTALL=	${PKGINSTALL}
 
 PORTDOCS=	*
 
+.include <bsd.port.pre.mk>
+
+.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)
+BROKEN=	OpenSSL from the base system does not support GOST, add \
+	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
+	that needs SSL.
+.endif
+
 post-extract:
 	echo "SRCID=${HASH}" > ${WRKSRC}/srcid
 
@@ -260,4 +262,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/dns/bind910/Makefile
==============================================================================
--- head/dns/bind910/Makefile	Wed Apr  6 13:33:56 2016	(r412618)
+++ head/dns/bind910/Makefile	Wed Apr  6 13:53:09 2016	(r412619)
@@ -219,15 +219,9 @@ SUB_LIST+=	NOBASE="" BASE="@comment "
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
 .endif # !defined(BIND_TOOLS_SLAVE)
-.if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1}
-WITH_OPENSSL_PORT=yes
-.endif
 .else
 PLIST_SUB+=	NOBASE="@comment " BASE=""
 SUB_LIST+=	NOBASE="@comment " BASE=""
-.if ${PORT_OPTIONS:MSSL}
-WITH_OPENSSL_PORT=	yes
-.endif
 .endif
 
 PKGDEINSTALL=	${PKGINSTALL}
@@ -235,6 +229,14 @@ PKGDEINSTALL=	${PKGINSTALL}
 
 PORTDOCS=	*
 
+.include <bsd.port.pre.mk>
+
+.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)
+BROKEN=	OpenSSL from the base system does not support GOST, add \
+	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
+	that needs SSL.
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
 		s|readline/history.h|histedit.h|' \
@@ -293,4 +295,4 @@ post-install:
 
 .endif	# BIND_TOOLS_SLAVE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Wed Apr  6 13:33:56 2016	(r412618)
+++ head/dns/bind99/Makefile	Wed Apr  6 13:53:09 2016	(r412619)
@@ -179,21 +179,23 @@ PLIST_SUB+=	NOBASE="" BASE="@comment "
 SUB_LIST+=	NOBASE="" BASE="@comment "
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
-.if ${PORT_OPTIONS:MGOST}
-WITH_OPENSSL_PORT=yes
-.endif
 .else
 PLIST_SUB+=	NOBASE="@comment " BASE=""
 SUB_LIST+=	NOBASE="@comment " BASE=""
-.if ${PORT_OPTIONS:MSSL}
-WITH_OPENSSL_PORT=	yes
-.endif
 .endif
 
 PKGDEINSTALL=	${PKGINSTALL}
 
 PORTDOCS=	*
 
+.include <bsd.port.pre.mk>
+
+.if ( ${PORT_OPTIONS:MGOST} ) && defined(WITH_OPENSSL_BASE)
+BROKEN=	OpenSSL from the base system does not support GOST, add \
+	WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
+	that needs SSL.
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
 		s|readline/history.h|histedit.h|' \
@@ -241,4 +243,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>