- Remove inclusion of bsd.default-versions.mk from ftp/curl/Makefile so

  bsd.default-versions.mk can rely on ARCH being defined.
- In bsd.port.mk move inclusion of bsd.default-versions.mk from the
  pre-makefile section to the options section so the variables can be used
  earlier.  Also put the bit of code sitting between the options section and
  the pre-makefile section into the options section.
- Remove last few cases where ports set WITH_OPENSSL_PORT.  This variable is
  handled in bsd.default-versions.mk and some ports were setting it after
  including bsd.port.options.mk.  After FreeBSD 9 EoL all but a few ports,
  and then only when setting non-default options, work without setting that
  variable.

PR:		215996
Exp-run by:	antoine
Approved by:	portmgr (antoine)

1 files changed, 6 insertions, 8 deletions

diff --git a/dns/validns/Makefile b/dns/validns/Makefile
index 8873cb930d4e..1b5160ccf508 100644
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	validns
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	dns security
 MASTER_SITES=	http://www.validns.net/download/
 
@@ -14,7 +15,6 @@ LICENSE=	BSD2CLAUSE
 LIB_DEPENDS=	libJudy.so:devel/judy
 
 USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=yes
 
 ALL_TARGET=
 
@@ -31,16 +31,14 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>