From owner-svn-ports-head@FreeBSD.ORG Mon Nov 4 10:40:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 27BC96BC; Mon, 4 Nov 2013 10:40:34 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F11162A62; Mon, 4 Nov 2013 10:40:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4AeXsp024701; Mon, 4 Nov 2013 10:40:33 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4AeXkm024699; Mon, 4 Nov 2013 10:40:33 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311041040.rA4AeXkm024699@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 4 Nov 2013 10:40:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332685 - head/www/spdylay X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 10:40:34 -0000 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 -# 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 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