svn commit: r422561 - head/dns/ldns

[John Marino]

On 9/21/2016 09:14, Mathieu Arnold wrote:
> Author: mat
> Date: Wed Sep 21 14:14:18 2016
> New Revision: 422561
> URL: https://svnweb.freebsd.org/changeset/ports/422561
>
> Log:
>   Fix build on 9.
>
>   Sponsored by:	Absolight
>
> Modified:
>   head/dns/ldns/Makefile   (contents, props changed)
>
> Modified: head/dns/ldns/Makefile
> ==============================================================================
> --- head/dns/ldns/Makefile	Wed Sep 21 13:50:33 2016	(r422560)
> +++ head/dns/ldns/Makefile	Wed Sep 21 14:14:18 2016	(r422561)
> @@ -87,6 +87,8 @@ INSTALL_TARGET=	install-lib install-h in
>
>  .endif # BUILD_PYLDNS || BUILD_P5PERL
>
> +.include <bsd.port.pre.mk>
> +
>  .if ${PORT_OPTIONS:MGOST}
>  .  if !defined(SSL_DEFAULT) || ${SSL_DEFAULT} == "base"
>  IGNORE_FreeBSD_9=	Requires openssl version >= 1.0.0
> @@ -135,4 +137,4 @@ post-install:
>
>  .endif # BUILD_PYLDNS || BUILD_P5PERL
>
> -.include <bsd.port.mk>
> +.include <bsd.port.post.mk>
>

my fix was slightly different.  It got rid of having both includes (see 
attached).





---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
-------------- next part --------------
Index: dns/ldns/Makefile
===================================================================
--- dns/ldns/Makefile	(revision 422560)
+++ dns/ldns/Makefile	(working copy)
@@ -51,7 +51,7 @@
 RRTYPEURI_CONFIGURE_ENABLE=	rrtype-uri
 RRTYPETA_CONFIGURE_ENABLE=	rrtype-ta
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if defined(BUILD_PYLDNS)
 USES+=		python
@@ -88,7 +88,7 @@
 .endif # BUILD_PYLDNS || BUILD_P5PERL
 
 .if ${PORT_OPTIONS:MGOST}
-.  if !defined(SSL_DEFAULT) || ${SSL_DEFAULT} == "base"
+.  if ${SSL_DEFAULT} == "base"
 IGNORE_FreeBSD_9=	Requires openssl version >= 1.0.0
 . endif
 .else
@@ -135,4 +135,4 @@
 
 .endif # BUILD_PYLDNS || BUILD_P5PERL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>