From owner-svn-ports-all@freebsd.org Tue Oct 4 20:08:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D594AF57C8; Tue, 4 Oct 2016 20:08:37 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAA741E8; Tue, 4 Oct 2016 20:08:36 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u94K8akO033490; Tue, 4 Oct 2016 20:08:36 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u94K8aP0033489; Tue, 4 Oct 2016 20:08:36 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201610042008.u94K8aP0033489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 4 Oct 2016 20:08:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423302 - head/www/dillo2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2016 20:08:37 -0000 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 +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 -.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 +.include