Update of lighttpd to 1.4.0.
Responsible Changed From-To: freebsd-ports-bugs->garga Grabbed.
I propose you this new patch, that change the way to use USE_RC_SUBR var, remove USE_OPENSSL=yes because it after bsd.port.pre.mk is unused, just the .include is suficient and add $FreeBSD$ tag to pkg-plist. Do you approve the following patch? --- lighttpd.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 31 Jul 2005 14:21:10 -0000 1.23 +++ Makefile 22 Aug 2005 12:09:00 -0000 @@ -6,7 +6,7 @@ # PORTNAME= lighttpd -PORTVERSION= 1.3.16 +PORTVERSION= 1.4.0 CATEGORIES= www MASTER_SITES= http://www.lighttpd.net/download/ \ http://dl.fkb.wormulon.net/lighttpd/ \ @@ -19,14 +19,12 @@ USE_AUTOCONF_VER= 259 USE_REINPLACE= yes -USE_RC_SUBR= yes +USE_RC_SUBR= lighttpd.sh USE_LIBTOOL_VER= 15 USE_GNOME= lthack CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd -STARTUP_FILE= ${PREFIX}/etc/rc.d/lighttpd.sh -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAN1= lighttpd.1 spawn-fcgi.1 @@ -39,7 +37,6 @@ .if !defined(WITHOUT_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" -USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl .endif @@ -58,9 +55,6 @@ .endif post-install: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/lighttpd.sh.tmpl > ${STARTUP_FILE} - @${CHMOD} 755 ${STARTUP_FILE} @${INSTALL_DATA} ${FILESDIR}/lighttpd.conf.sample ${PREFIX}/etc/ @${LIBTOOL} --finish ${PREFIX}/lib Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- distinfo 31 Jul 2005 14:21:10 -0000 1.16 +++ distinfo 22 Aug 2005 12:09:00 -0000 @@ -1,2 +1,2 @@ -MD5 (lighttpd-1.3.16.tar.gz) = b73f7a7ace4901b6417b0e450aaa5df5 -SIZE (lighttpd-1.3.16.tar.gz) = 706362 +MD5 (lighttpd-1.4.0.tar.gz) = 926a3603615c9edf5859977f1b8b6033 +SIZE (lighttpd-1.4.0.tar.gz) = 749159 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/www/lighttpd/pkg-plist,v retrieving revision 1.8 diff -u -r1.8 pkg-plist --- pkg-plist 15 Jul 2005 22:26:56 -0000 1.8 +++ pkg-plist 22 Aug 2005 12:09:00 -0000 @@ -1,6 +1,6 @@ +@comment $FreeBSD$ bin/spawn-fcgi etc/lighttpd.conf.sample -etc/rc.d/lighttpd.sh lib/lighttpd/mod_access.so lib/lighttpd/mod_accesslog.so lib/lighttpd/mod_alias.so @@ -8,9 +8,11 @@ lib/lighttpd/mod_cgi.so lib/lighttpd/mod_cml.so lib/lighttpd/mod_compress.so +lib/lighttpd/mod_dirlisting.so lib/lighttpd/mod_evhost.so lib/lighttpd/mod_expire.so lib/lighttpd/mod_fastcgi.so +lib/lighttpd/mod_indexfile.so lib/lighttpd/mod_mysql_vhost.so lib/lighttpd/mod_proxy.so lib/lighttpd/mod_redirect.so @@ -21,9 +23,11 @@ lib/lighttpd/mod_setenv.so lib/lighttpd/mod_simple_vhost.so lib/lighttpd/mod_ssi.so +lib/lighttpd/mod_staticfile.so lib/lighttpd/mod_status.so lib/lighttpd/mod_trigger_b4_dl.so lib/lighttpd/mod_userdir.so lib/lighttpd/mod_usertrack.so +lib/lighttpd/mod_webdav.so sbin/lighttpd @dirrm lib/lighttpd Index: files/lighttpd.sh.in =================================================================== RCS file: files/lighttpd.sh.in diff -N files/lighttpd.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/lighttpd.sh.in 22 Aug 2005 12:09:00 -0000 @@ -0,0 +1,43 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: lighttpd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable lighttpd: +# +#lighttpd_enable="YES" +# +# See lighttpd(1) for manual +# + +. %%RC_SUBR%% + +name=lighttpd +rcvar=`set_rcvar` + +command=%%PREFIX%%/sbin/lighttpd +pidfile=/var/run/lighttpd.pid +required_files=${lighttpd_conf} + +stop_postcmd=stop_postcmd + +stop_postcmd() +{ + rm -f $pidfile +} + +# set defaults + +lighttpd_enable=${lighttpd_enable:-"NO"} +lighttpd_conf=${lighttpd_conf:-"%%PREFIX%%/etc/lighttpd.conf"} + +load_rc_config $name + +command_args="-f ${lighttpd_conf}" +run_rc_command "$1" Index: files/lighttpd.sh.tmpl =================================================================== RCS file: files/lighttpd.sh.tmpl diff -N files/lighttpd.sh.tmpl --- files/lighttpd.sh.tmpl 6 Feb 2005 16:30:35 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/www/lighttpd/files/lighttpd.sh.tmpl,v 1.3 2005/02/06 16:30:35 sem Exp $ -# - -# PROVIDE: lighttpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable lighttpd: -# -#lighttpd_enable="YES" -# -# See lighttpd(1) for manual -# - -. %%RC_SUBR%% - -name=lighttpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/lighttpd -pidfile=/var/run/lighttpd.pid -required_files=${lighttpd_conf} - -stop_postcmd=stop_postcmd - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - -lighttpd_enable=${lighttpd_enable:-"NO"} -lighttpd_conf=${lighttpd_conf:-"%%PREFIX%%/etc/lighttpd.conf"} - -load_rc_config $name - -command_args="-f ${lighttpd_conf}" -run_rc_command "$1" --- lighttpd.patch ends here --- Thanks -- Renato Botelho <garga @ FreeBSD.org> <freebsd @ galle.com.br> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc Absent, adj.: Exposed to the attacks of friends and acquaintances; defamed; slandered.
State Changed From-To: open->feedback Ask maintainer for approval.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi! Renato Botelho wrote: > I propose you this new patch, that change the way to use USE_RC_SUBR var, > remove USE_OPENSSL=yes because it after bsd.port.pre.mk is unused, > just the .include is suficient and add $FreeBSD$ tag to pkg-plist. The patch works fine for me and portlint is happy. Please update lighttpd to 1.4.1 since it has been released in the meantime. The correct md5sum is: MD5 (lighttpd-1.4.1.tar.gz) = 3abffbe574fd835721760a37c00d3714 SIZE (lighttpd-1.4.1.tar.gz) = 759063 I've uploaded the file to my mirror sites. I don't get the need for having $FreeBSD$ in pkg-plist but if it's useful keep it. Thanks, Hendrik - -- Hendrik Scholz - <hscholz@raisdorf.net> - http://www.wormulon.net/ drag me, drop me - treat me like an object -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDDF5h4Wmz+z2IPqARAqInAKC0rv1BVpLvTz0WggG5t3UuxFxNRACgn+Bv NmToIThvAMiU371DB8l616A= =d+1p -----END PGP SIGNATURE-----
Changed here to update to 1.4.1, we just need to wait for finnish of ports freeze. It's scheduled to Aug 28. About $FreeBSD$ tag on pkg-plist, it's useful to track problems on old versions, to compare pkg-plist's, this kind of things, so, I'm keeping it. Thanks -- Renato Botelho
State Changed From-To: feedback->open Just waiting finnish of ports freeze period.
State Changed From-To: open->closed Committed! Thanks.