www/95842: update www/zerowait-httpd to 0.7n

[infofarmer at gmail. com]

>Number:         95842
>Category:       www
>Synopsis:       update www/zerowait-httpd to 0.7n
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-www
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 15 22:00:27 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #14: Sun Mar 5 15:57:19 MSK 2006 sat at sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386


	
>Description:
Update to 0.7n
Clean up

This server is quite badly written. It might be reasonable to
mark it deprecated in a few months.
	
>How-To-Repeat:
	
>Fix:

	

--- zerowait-httpd.diff begins here ---
diff -urN /usr/ports/www/zerowait-httpd/Makefile zerowait-httpd/Makefile
--- /usr/ports/www/zerowait-httpd/Makefile	Fri Apr 14 22:14:59 2006
+++ zerowait-httpd/Makefile	Sat Apr 15 23:13:57 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zerowait-httpd
-PORTVERSION=	0.7m
+PORTVERSION=	0.7n
 CATEGORIES=	www
 MASTER_SITES=	http://www.0w.ru/httpd/
 DISTNAME=	0W-httpd-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
@@ -16,18 +16,11 @@
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	0W-httpd
 
 MAKE_ARGS=	CFLAGS="${CFLAGS}" CPPFLAGS=-I..
-WWW_USER?=	${WWWOWN}
-WWW_GROUP?=	${WWWGRP}
-
-pre-build:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},' \
-			${FILESDIR}/0W-httpd.sh > ${WRKDIR}/0W-httpd.sh
-	@${SH} -c 'cd ${WRKSRC} && ./configure --prefix=${PREFIX} --owner=${WWW_USER} --group=${WWW_GROUP}'
-
-post-install:
-	@${INSTALL_SCRIPT} -m 755 ${WRKDIR}/0W-httpd.sh ${PREFIX}/etc/rc.d/0W-httpd.sh
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --owner=${WWWOWN} --group=${WWWGRP}
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/www/zerowait-httpd/distinfo zerowait-httpd/distinfo
--- /usr/ports/www/zerowait-httpd/distinfo	Tue Jan 24 06:14:18 2006
+++ zerowait-httpd/distinfo	Sat Apr 15 13:33:25 2006
@@ -1,3 +1,3 @@
-MD5 (0W-httpd-0.7m.tar.gz) = b599bf9c6e7c784eda29f420aab45e31
-SHA256 (0W-httpd-0.7m.tar.gz) = 18881788f32dcb16434431d2245e5c48b92344028dbe9b85f1b8d6e341ca17e3
-SIZE (0W-httpd-0.7m.tar.gz) = 83930
+MD5 (0W-httpd-0.7n.tar.gz) = 4d506e21f57a4f1a3ca1b87a6a50299f
+SHA256 (0W-httpd-0.7n.tar.gz) = dd033778ee0a6f5ed570c774a816c1ffa638f7487ae0c35f39aaa81a10029a85
+SIZE (0W-httpd-0.7n.tar.gz) = 84854
diff -urN /usr/ports/www/zerowait-httpd/files/0W-httpd.in zerowait-httpd/files/0W-httpd.in
--- /usr/ports/www/zerowait-httpd/files/0W-httpd.in	Thu Jan  1 03:00:00 1970
+++ zerowait-httpd/files/0W-httpd.in	Sat Apr 15 01:27:23 2006
@@ -0,0 +1,29 @@
+#!/bin/sh
+# $FreeBSD: ports/www/zerowait-httpd/files/0W-httpd.sh,v 1.2 2005/06/22 14:51:27 pav Exp $
+
+# PROVIDE: zerowait
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Define these zerowait_enable variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+. %%RC_SUBR%%
+
+name="zerowait"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/0W-httpd"
+args="-c %%PREFIX%%/etc/0W-httpd/httpd.conf"
+required_files="%%PREFIX%%/etc/0W-httpd/httpd.conf"
+pidfile="%%PREFIX%%/0W-httpd/pids/httpd"
+
+load_rc_config $name
+: ${zerowait_enable="NO"}
+
+start_cmd="echo \"Starting ${name}.\"; /usr/bin/limits -U www ${command}"
+
+run_rc_command "$1"
diff -urN /usr/ports/www/zerowait-httpd/files/0W-httpd.sh zerowait-httpd/files/0W-httpd.sh
--- /usr/ports/www/zerowait-httpd/files/0W-httpd.sh	Wed Jun 22 18:51:27 2005
+++ zerowait-httpd/files/0W-httpd.sh	Thu Jan  1 03:00:00 1970
@@ -1,29 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/www/zerowait-httpd/files/0W-httpd.sh,v 1.2 2005/06/22 14:51:27 pav Exp $
-
-# PROVIDE: zerowait
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these zerowait_enable variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-. %%RC_SUBR%%
-
-name="zerowait"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/0W-httpd"
-args="-c %%PREFIX%%/etc/0W-httpd/httpd.conf"
-required_files="%%PREFIX%%/etc/0W-httpd/httpd.conf"
-pidfile="%%PREFIX%%/0W-httpd/pids/httpd"
-
-load_rc_config $name
-: ${zerowait_enable="NO"}
-
-start_cmd="echo \"Starting ${name}.\"; /usr/bin/limits -U www ${command}"
-
-run_rc_command "$1"
diff -urN /usr/ports/www/zerowait-httpd/pkg-plist zerowait-httpd/pkg-plist
--- /usr/ports/www/zerowait-httpd/pkg-plist	Wed Jun 22 18:51:26 2005
+++ zerowait-httpd/pkg-plist	Sat Apr 15 23:13:30 2006
@@ -1,5 +1,4 @@
- at comment $FreeBSD: ports/www/zerowait-httpd/pkg-plist,v 1.2 2005/06/22 14:51:26 pav Exp $
- at unexec %D/etc/rc.d/0W-httpd.sh stop
+ at unexec %D/etc/rc.d/0W-httpd stop
 bin/update-countries.sh
 bin/convert-ranges
 bin/convert-geoip
@@ -8,9 +7,11 @@
 etc/0W-httpd/countries.ips
 etc/0W-httpd/countries.rus
 etc/0W-httpd/httpd.conf.sample
-etc/rc.d/0W-httpd.sh
+ at exec install -d -o %%WWWOWN%% -g %%WWWGRP%% %D/0W-httpd/pids
+ at exec install -d -o %%WWWOWN%% -g %%WWWGRP%% %D/0W-httpd/data
+ at exec install -d -o %%WWWOWN%% -g %%WWWGRP%% %D/0W-httpd/logs
 @dirrm etc/0W-httpd/
 @dirrm 0W-httpd/pids
 @dirrm 0W-httpd/data
- at unexec rm -fr %D/0W-httpd/logs/ > /dev/null 2>&1 || true
- at dirrm 0W-httpd/
+ at unexec rm -fr %D/0W-httpd/logs > /dev/null 2>&1 || true
+ at dirrm 0W-httpd
--- zerowait-httpd.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: