Update to version 0.7p

Submitted by:	self (maintainer)

4 files changed, 18 insertions, 23 deletions

diff --git a/www/zerowait-httpd/Makefile b/www/zerowait-httpd/Makefile
index dba1c0f3103b..cec39471bb62 100644
--- a/www/zerowait-httpd/Makefile
+++ b/www/zerowait-httpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zerowait-httpd
-PORTVERSION=	0.7n
+PORTVERSION=	0.7p
 CATEGORIES=	www
 MASTER_SITES=	http://www.0w.ru/httpd/
 DISTNAME=	0W-httpd-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
@@ -17,6 +17,7 @@ COMMENT=	Lightweight and fast http server
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	0W-httpd
+ALL_TARGET=	# none
 
 MAKE_ARGS=	CFLAGS="${CFLAGS}" CPPFLAGS=-I..
 HAS_CONFIGURE=	yes
diff --git a/www/zerowait-httpd/distinfo b/www/zerowait-httpd/distinfo
index e090f9bb0504..1f5c6424ed19 100644
--- a/www/zerowait-httpd/distinfo
+++ b/www/zerowait-httpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (0W-httpd-0.7n.tar.gz) = 4d506e21f57a4f1a3ca1b87a6a50299f
-SHA256 (0W-httpd-0.7n.tar.gz) = dd033778ee0a6f5ed570c774a816c1ffa638f7487ae0c35f39aaa81a10029a85
-SIZE (0W-httpd-0.7n.tar.gz) = 84854
+MD5 (0W-httpd-0.7p.tar.gz) = 4d4a3fe0581b5b1e4fad50c34a1c0d7f
+SHA256 (0W-httpd-0.7p.tar.gz) = db4e9c3eca019b61a86abbb0866827d8b344bd316ef8f8ef0738ee54001be4f8
+SIZE (0W-httpd-0.7p.tar.gz) = 99506
diff --git a/www/zerowait-httpd/files/patch-Makefile b/www/zerowait-httpd/files/patch-Makefile
index 2c8229702454..e9eca3379414 100644
--- a/www/zerowait-httpd/files/patch-Makefile
+++ b/www/zerowait-httpd/files/patch-Makefile
@@ -1,14 +1,14 @@
---- Makefile.orig	Sun Apr 17 05:07:11 2005
-+++ Makefile	Wed Jun 22 14:16:31 2005
-@@ -10,13 +10,15 @@
+--- Makefile.orig	Tue Dec  5 15:06:00 2006
++++ Makefile	Tue Dec  5 15:07:24 2006
+@@ -13,13 +13,14 @@
  	rm -f *~ src/*~
  
  install: compile
 -	install -d $(ROOT)/bin $(ROOT)/conf $(ROOT)/docs
 -	install -d -o $(OWNER) -g $(GROUP) $(ROOT)/logs $(ROOT)/data/pids $(ROOT)/data/httpd
--	test -f $(ROOT)/conf/httpd.conf || install -m 644 conf/httpd.conf $(ROOT)/conf
--	install -b -m 644 conf/countries* $(ROOT)/conf
--	install -b -m 644 docs/* $(ROOT)/docs
+-	test -f $(ROOT)/conf/httpd.conf || install -m 644 conf/httpd.conf* $(ROOT)/conf
+-	install -b -m 644 conf/countries* conf/regions* $(ROOT)/conf
+-	install -b -m 644 docs/crontab docs/httpd.ru.txt $(ROOT)/docs
 -	install -b bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin
 -	install -b -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/bin
 +	test -d $(ROOT)/0W-httpd || (mkdir $(ROOT)/0W-httpd)
@@ -16,16 +16,9 @@
 +	install -m 0755 bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin
 +	install -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/sbin
 +	test -d $(ROOT)/etc/0W-httpd || (mkdir $(ROOT)/etc/0W-httpd && cd conf/ && \
-+			cp countries* $(ROOT)/etc/0W-httpd/ && \
-+			cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample )
++		cp countries* $(ROOT)/etc/0W-httpd/ && \
++		cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample )
 +	chown -R $(OWNER):$(GROUP) $(ROOT)/sbin/0W-httpd $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/data $(ROOT)/0W-httpd/pids
-+
  	@echo
  	@echo "Installed, run as root: $(ROOT)/bin/0W-httpd [-h]"
  
-@@ -33,3 +35,5 @@
- 	@read answer
- 	killall 0W-httpd || true
- 	rm -rf $(ROOT)
-+
-+all: compile
diff --git a/www/zerowait-httpd/files/patch-src_httpd_Makefile b/www/zerowait-httpd/files/patch-src_httpd_Makefile
index 16641c9e3f14..134147c948cb 100644
--- a/www/zerowait-httpd/files/patch-src_httpd_Makefile
+++ b/www/zerowait-httpd/files/patch-src_httpd_Makefile
@@ -1,15 +1,16 @@
---- src/httpd/Makefile.orig	Wed Jun 22 13:16:28 2005
-+++ src/httpd/Makefile	Wed Jun 22 13:16:44 2005
-@@ -14,10 +14,10 @@
+--- src/httpd/Makefile.orig	Sat Sep 16 08:17:17 2006
++++ src/httpd/Makefile	Tue Dec  5 15:10:18 2006
+@@ -18,11 +18,11 @@
  	$(CC) $(LDFLAGS) $(OBJS) $(COMMON) built.o -o $@
  
  convert-ranges: $(COMMON) Makefile ../Rules.make convert-ranges.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $(COMMON) -o $@
 +	$(CC) $(CFLAGS) -I.. $(LDFLAGS) $@.c $(COMMON) -o $@
+ 	chmod +s $@
  
  convert-geoip: $(COMMON) Makefile ../Rules.make convert-geoip.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $(COMMON) -o $@
 +	$(CC) $(CFLAGS) -I.. $(LDFLAGS) $@.c $(COMMON) -o $@
+ 	chmod +s $@
  
  $(COMMON):
- 	cd ../common &&$(MAKE)