Date: Mon, 4 Nov 2013 10:40:33 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332685 - head/www/spdylay Message-ID: <201311041040.rA4AeXkm024699@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Nov 4 10:40:33 2013 New Revision: 332685 URL: http://svnweb.freebsd.org/changeset/ports/332685 Log: - Remove SHRPX option: always build shrpx - Simplify Makefile - Bump PORTREVISION for package change Modified: head/www/spdylay/Makefile head/www/spdylay/pkg-plist Modified: head/www/spdylay/Makefile ============================================================================== --- head/www/spdylay/Makefile Mon Nov 4 10:35:08 2013 (r332684) +++ head/www/spdylay/Makefile Mon Nov 4 10:40:33 2013 (r332685) @@ -3,6 +3,7 @@ PORTNAME= spdylay PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= www net MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} @@ -11,10 +12,9 @@ COMMENT= SPDY protocol version 2 and 3 i LICENSE= MIT -OPTIONS_DEFINE= SHRPX -OPTIONS_SUB= yes -SHRPX_DESC= Build shrpx (HTTP reverse proxy), requires OpenSSL 1.0.1+ +LIB_DEPENDS= libevent_openssl.so:${PORTSDIR}/devel/libevent2 +CONFIGURE_ARGS= --enable-examples CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" \ ZLIB_CFLAGS="-I${INCLUDEDIR}" \ @@ -31,19 +31,8 @@ PORTDOCS= README.rst .include <bsd.port.pre.mk> -# Only build shrpx on FreeBSD 10 and above -.if ${PORT_OPTIONS:MSHRPX} && ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) -IGNORE= shrpx requires libevent_openssl.so (devel/libevent2) built with OpenSSL 1.0.1+ -.endif - -# spdylay requires OpenSSL 1.0.1+ -.if ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - -.if ${PORT_OPTIONS:MSHRPX} -LIB_DEPENDS+= libevent_openssl.so:${PORTSDIR}/devel/libevent2 -CONFIGURE_ARGS+=--enable-examples +.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT) +IGNORE= spdylay requires OpenSSL 1.0.1+ .endif post-build: @@ -51,8 +40,6 @@ post-build: post-install: @${INSTALL_SCRIPT} ${WRKSRC}/examples/spdycli ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MSHRPX} @${INSTALL_DATA} ${WRKSRC}/shrpx.conf.sample ${STAGEDIR}${PREFIX}/etc/ -.endif .include <bsd.port.post.mk> Modified: head/www/spdylay/pkg-plist ============================================================================== --- head/www/spdylay/pkg-plist Mon Nov 4 10:35:08 2013 (r332684) +++ head/www/spdylay/pkg-plist Mon Nov 4 10:40:33 2013 (r332685) @@ -1,8 +1,8 @@ -%%SHRPX%%bin/shrpx +bin/shrpx bin/spdycat bin/spdycli bin/spdyd -%%SHRPX%%etc/shrpx.conf.sample +etc/shrpx.conf.sample include/spdylay/spdylay.h include/spdylay/spdylayver.h lib/libspdylay.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311041040.rA4AeXkm024699>