diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2013-11-04 18:40:33 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2013-11-04 18:40:33 +0800 |
| commit | aec055220df1b263ebcd6629e31ac7b5855bf18f (patch) | |
| tree | ed296d39a84edb2d778d8ca127a81871097d3378 /www | |
| parent | 777b9bb00a8a9c557ac83dd3effc08478bc79a18 (diff) | |
| download | freebsd-ports-gnome-aec055220df1b263ebcd6629e31ac7b5855bf18f.tar.gz freebsd-ports-gnome-aec055220df1b263ebcd6629e31ac7b5855bf18f.tar.zst freebsd-ports-gnome-aec055220df1b263ebcd6629e31ac7b5855bf18f.zip | |
- Remove SHRPX option: always build shrpx
- Simplify Makefile
- Bump PORTREVISION for package change
Diffstat (limited to 'www')
| -rw-r--r-- | www/spdylay/Makefile | 23 | ||||
| -rw-r--r-- | www/spdylay/pkg-plist | 4 |
2 files changed, 7 insertions, 20 deletions
diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile index 9739a149271f..73856bbca0fd 100644 --- a/www/spdylay/Makefile +++ b/www/spdylay/Makefile @@ -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 implementation in C 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> diff --git a/www/spdylay/pkg-plist b/www/spdylay/pkg-plist index b8142f8abf02..60c6a4bb502c 100644 --- a/www/spdylay/pkg-plist +++ b/www/spdylay/pkg-plist @@ -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 |