Date: Tue, 13 Sep 2016 05:01:26 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421977 - head/net/hostapd Message-ID: <201609130501.u8D51QmN087066@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Sep 13 05:01:26 2016 New Revision: 421977 URL: https://svnweb.freebsd.org/changeset/ports/421977 Log: net/hostapd: Remove PORTS_SSL option and use SSL_DEFAULT The port is now configured depending on the SSL base specified by the SSL_DEFAULT variable. Before it would break by default if SSL_DEFAULT was set to non-base. This changes puts hostapd in line with the rest of the ports tree. Approved by: SSL blanket Modified: head/net/hostapd/Makefile Modified: head/net/hostapd/Makefile ============================================================================== --- head/net/hostapd/Makefile Tue Sep 13 04:50:04 2016 (r421976) +++ head/net/hostapd/Makefile Tue Sep 13 05:01:26 2016 (r421977) @@ -3,7 +3,7 @@ PORTNAME= hostapd PORTVERSION= 2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://w1.fi/releases/ @@ -12,31 +12,14 @@ COMMENT= IEEE 802.11 AP, IEEE 802.1X/WPA LICENSE= BSD3CLAUSE -USES= cpe gmake +USES= cpe gmake ssl CPE_VENDOR= w1.f1 -USE_OPENSSL= yes BUILD_WRKSRC= ${WRKSRC}/hostapd +CONFIGURE_ARGS= --with-ssl-dir=${OPENSSLBASE} PLIST_FILES= sbin/hostapd sbin/hostapd_cli man/man1/hostapd_cli.1.gz \ man/man8/hostapd.8.gz -OPTIONS_DEFINE= PORTS_SSL - -PORTS_SSL_DESC= Build with OpenSSL from ports (instead of base system) - -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MPORTS_SSL} -.if ${SSL_DEFAULT} == base -IGNORE= the PORTS_SSL option not allowed when using SSL from base -.endif -CONFIGURE_ARGS+= --with-ssl-dir=${PREFIX} -.else -.if ${SSL_DEFAULT} != base -IGNORE= the PORTS_SSL option is required when using SSL from ports -.endif -.endif - post-patch: @${REINPLACE_CMD} -e 's|@$$(E) " CC " $$<|@$$(E) " $$(CC) " $$<|' \ ${BUILD_WRKSRC}/Makefile @@ -52,4 +35,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \ ${STAGEDIR}${MANPREFIX}/man/man8 -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609130501.u8D51QmN087066>