From owner-svn-ports-all@freebsd.org Mon Dec 26 20:45:44 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 818F8C922DC; Mon, 26 Dec 2016 20:45:44 +0000 (UTC) (envelope-from jrm@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 3AC4A1FF7; Mon, 26 Dec 2016 20:45:44 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQKjhDO099719; Mon, 26 Dec 2016 20:45:43 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQKjhew099716; Mon, 26 Dec 2016 20:45:43 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201612262045.uBQKjhew099716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Mon, 26 Dec 2016 20:45:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429570 - in head/www/lighttpd: . files 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: Mon, 26 Dec 2016 20:45:44 -0000 Author: jrm Date: Mon Dec 26 20:45:42 2016 New Revision: 429570 URL: https://svnweb.freebsd.org/changeset/ports/429570 Log: www/lighttpd: Update to version 1.4.44. - Removed mod_cgi patch, because upstream now correctly recognizes when pipe(2) isn't available. While here, modernize and simplify. - Use OPT_ when possible. - Remove variables that are not referenced or only referenced once. PR: 215536 Submitted by: pkubaj@anongoth.pl (maintainer) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D8900 Deleted: head/www/lighttpd/files/patch-src_mod__cgi.c Modified: head/www/lighttpd/Makefile head/www/lighttpd/distinfo head/www/lighttpd/pkg-plist Modified: head/www/lighttpd/Makefile ============================================================================== --- head/www/lighttpd/Makefile Mon Dec 26 20:08:41 2016 (r429569) +++ head/www/lighttpd/Makefile Mon Dec 26 20:45:42 2016 (r429570) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= lighttpd -PORTVERSION= 1.4.43 -PORTREVISION= 2 +PORTVERSION= 1.4.44 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -29,7 +28,10 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIGHTTPD_MODULE) +PORTDOCS= AUTHORS COPYING INSTALL NEWS README + USE_RC_SUBR= lighttpd +REQUIRE= DAEMON OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 KRB5 LIBEV LUA MEMCACHED \ MYSQL LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV @@ -65,6 +67,9 @@ KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= openldap=yes +LDAP_VARS= REQUIRE+=slapd LIBEV_CONFIGURE_WITH= libev=${LOCALBASE} LIBEV_LIB_DEPENDS= libev.so:devel/libev LUA_USES= lua @@ -72,6 +77,9 @@ LUA_CONFIGURE_WITH= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_CONFIGURE_WITH=memcached +MYSQL_CONFIGURE_WITH= mysql +MYSQL_USES= mysql +MYSQL_VARS= REQUIRE+=mysql OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} @@ -95,43 +103,16 @@ LIGHTTPD_CONF_D_FILES= access_log.conf \ simple_vhost.conf ssi.conf status.conf \ trigger_b4_dl.conf userdir.conf webdav.conf -LIGHTTPD_LOGROOT?= /var/log/lighttpd -LIGHTTPD_WEBROOT?= ${PREFIX}/www/data -LIGHTTPD_USER?= www -LIGHTTPD_GROUP?= www - -PLIST_SUB+= LOGROOT="${LIGHTTPD_LOGROOT}" \ - USER="${LIGHTTPD_USER}" \ - GROUP="${LIGHTTPD_GROUP}" \ - MKDIR="${MKDIR}" \ - CHOWN="${CHOWN}" +LOGROOT= /var/log/lighttpd +PLIST_SUB= LOGROOT="${LOGROOT}" .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include .if !defined(_BUILDING_LIGHTTPD_MODULE) -# Default REQUIRE to rc.d script -_REQUIRE= DAEMON - -.if ${PORT_OPTIONS:MDOCS} -DOCS= AUTHORS COPYING INSTALL NEWS README -PORTDOCS= ${DOCS} -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USES+= mysql -CONFIGURE_ARGS+= --with-mysql -_REQUIRE+= mysql -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -_REQUIRE+= slapd -.endif -SUB_LIST+= REQUIRE="${_REQUIRE}" +SUB_LIST= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -e 's|-std=gnu99||' \ @@ -170,13 +151,11 @@ post-install: .endfor ${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \ ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template - @${MKDIR} -m 0700 ${STAGEDIR}${LIGHTTPD_LOGROOT} + @${MKDIR} -m 0700 ${STAGEDIR}${LOGROOT} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for FILE in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} -. endfor + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) test: build @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} \ Modified: head/www/lighttpd/distinfo ============================================================================== --- head/www/lighttpd/distinfo Mon Dec 26 20:08:41 2016 (r429569) +++ head/www/lighttpd/distinfo Mon Dec 26 20:45:42 2016 (r429570) @@ -1,5 +1,5 @@ -TIMESTAMP = 1477993209 -SHA256 (lighttpd-1.4.43.tar.xz) = fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a -SIZE (lighttpd-1.4.43.tar.xz) = 656248 +TIMESTAMP = 1482580986 +SHA256 (lighttpd-1.4.44.tar.xz) = adb66ca985651957feb209c91c55ebbf917d23630bfc3a216a2f70043c7b5422 +SIZE (lighttpd-1.4.44.tar.xz) = 660304 SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 716cd4f8d371e12c115a2204e649aafe2ebad42d0099777b1361c0e2cc8a1612 SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242456 Modified: head/www/lighttpd/pkg-plist ============================================================================== --- head/www/lighttpd/pkg-plist Mon Dec 26 20:08:41 2016 (r429569) +++ head/www/lighttpd/pkg-plist Mon Dec 26 20:45:42 2016 (r429570) @@ -67,4 +67,4 @@ man/man8/lighttpd.8.gz %%KRB5%%man/man8/lighttpd-angel.8.gz sbin/lighttpd sbin/lighttpd-angel -@dir(%%USER%%,%%GROUP%%,700) %%LOGROOT%% +@dir(www,www,700) %%LOGROOT%%