svn commit: r423302 - head/www/dillo2
John Marino
marino at FreeBSD.org
Tue Oct 4 20:08:37 UTC 2016
Author: marino
Date: Tue Oct 4 20:08:35 2016
New Revision: 423302
URL: https://svnweb.freebsd.org/changeset/ports/423302
Log:
www/dillo2: modernize, use base SSL (except for IGNORED FreeBSD 9)
Modified:
head/www/dillo2/Makefile
Modified: head/www/dillo2/Makefile
==============================================================================
--- head/www/dillo2/Makefile Tue Oct 4 20:07:15 2016 (r423301)
+++ head/www/dillo2/Makefile Tue Oct 4 20:08:35 2016 (r423302)
@@ -23,6 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${PREFIX}/libexec
CONFLICTS= dillo-i18n-[0-9]* \
dillo-0*
+PORTDOCS= *
OPTIONS_DEFINE= COOKIES HYPHENATION IPV6 SSL THREADS DOCS
OPTIONS_DEFAULT= COOKIES HYPHENATION SSL THREADS
@@ -31,16 +32,16 @@ COOKIES_DESC= Cookie support
HYPHENATION_DESC= Hyphenation file(s) for HYPHENATION_LANGS
SSL_DESC= Experimental HTTPS support
-.include <bsd.port.options.mk>
+SSL_USES= ssl
+COOKIES_CONFIGURE_ENABLE= cookies
+IPV6_CONFIGURE_ENABLE= ipv6
+SSL_CONFIGURE_ENABLE= ssl
+THREADS_CONFIGURE_ENABLE= threaded-dns
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-WITH_OPENSSL_PORT= yes
-.endif
+.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MCOOKIES}
-CONFIGURE_ARGS+= --enable-cookies
-.else
-CONFIGURE_ARGS+= --disable-cookies
+.if ${SSL_DEFAULT} == base
+IGNORE_FreeBSD_9= Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
.endif
.ifdef(WITH_DEBUG)
@@ -49,10 +50,6 @@ CONFIGURE_ARGS+= --enable-gprof --enable
CONFIGURE_ARGS+= --disable-gprof --disable-rtfl
.endif
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS= *
-.endif
-
.if ${PORT_OPTIONS:MHYPHENATION}
ALL_HYPHENATION_LANGS= af as bg bn ca cop cs cy da de-1901 de-1996 \
de-ch-1901 el-monoton el-polyton en-gb en-us eo es et eu fi fr fur ga \
@@ -75,25 +72,6 @@ PLIST_FILES+= libexec/dillo/hyphenation/
.endfor
.endif
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+= --enable-ssl
-USE_OPENSSL= yes
-.else
-CONFIGURE_ARGS+= --disable-ssl
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+= --enable-threaded-dns
-.else
-CONFIGURE_ARGS+= --disable-threaded-dns
-.endif
-
post-patch:
@${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
@${MV} ${WRKSRC}/dpid/dpidrc.in ${WRKSRC}/dpid/dpidrc.sample.in
@@ -125,4 +103,4 @@ post-install:
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list