head	1.4;
access;
symbols
	RELEASE_8_3_0:1.4
	RELEASE_9_0_0:1.4
	RELEASE_7_4_0:1.4
	RELEASE_8_2_0:1.4
	RELEASE_6_EOL:1.4
	RELEASE_8_1_0:1.4
	RELEASE_7_3_0:1.4
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.3
	RELEASE_6_4_0:1.3
	RELEASE_5_EOL:1.3
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.3
	RELEASE_4_EOL:1.3
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2008.10.05.13.33.12;	author miwi;	state Exp;
branches;
next	1.3;

1.3
date	2006.12.05.20.14.29;	author laszlof;	state Exp;
branches;
next	1.2;

1.2
date	2005.06.22.14.51.27;	author pav;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.20.15.34.32;	author sem;	state Exp;
branches;
next	;


desc
@@


1.4
log
@- Update to 0.8d
- Pass maintainership to submitter

PR:		127781
Submitted by:	Dennis Herrmann <adox@@mcx2.org>
@
text
@--- Makefile.orig	2008-03-16 00:44:45.000000000 +0100
+++ Makefile	2008-09-26 19:44:38.000000000 +0200
@@@@ -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* conf/regions* $(ROOT)/conf
-	install -b -m 644 docs/*.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)
+	install -d $(ROOT)/0W-httpd/data $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/pids
+	install -m 755 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 )
+	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]"
@


1.3
log
@Update to version 0.7p

Submitted by:	self (maintainer)
@
text
@d1 2
a2 2
--- Makefile.orig	Tue Dec  5 15:06:00 2006
+++ Makefile	Tue Dec  5 15:07:24 2006
d11 1
a11 1
-	install -b -m 644 docs/crontab docs/httpd.ru.txt $(ROOT)/docs
d16 1
a16 1
+	install -m 0755 bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin
a23 1
 
@


1.2
log
@- Update to 0.7m

PR:		ports/82519
Submitted by:	Vsevolod Stakhov <vsevolod@@highsecure.ru> (maintainer)
@
text
@d1 3
a3 3
--- Makefile.orig	Sun Apr 17 05:07:11 2005
+++ Makefile	Wed Jun 22 14:16:31 2005
@@@@ -10,13 +10,15 @@@@
d9 3
a11 3
-	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
d19 2
a20 2
+			cp countries* $(ROOT)/etc/0W-httpd/ && \
+			cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample )
a21 1
+
a24 6
@@@@ -33,3 +35,5 @@@@
 	@@read answer
 	killall 0W-httpd || true
 	rm -rf $(ROOT)
+
+all: compile
@


1.1
log
@Zerowait httpd is a light and fast http server that uses modern mechanisms
such as kqueues and sendfile.

PR:		ports/79053
Submitted by:	Vsevolod Stakhov <vsevolod@@highsecure.ru>
@
text
@d1 4
a4 3
--- Makefile.orig	Wed Oct  6 21:21:53 2004
+++ Makefile	Sun Mar 20 17:31:49 2005
@@@@ -2,6 +2,6 @@@@
d6 19
a24 6
-ROOT=/var/0W
-PRIV=nobody:nobody
+ROOT=/var/0W
+PRIV=www:www
 
 SUBDIRS=common httpd
d26 6
a31 19
@@@@ -14,7 +14,14 @@@@
 
 install:
 	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
-	test -d $(ROOT) || (mkdir $(ROOT) && cp -R ../bin ../conf ../data ../logs $(ROOT))
-	test ../bin/0W-httpd -ef $(ROOT)/bin/0W-httpd || cp ../bin/0W-httpd $(ROOT)/bin/0W-httpd
-	chown -R $(PRIV) $(ROOT)/bin/0W-httpd $(ROOT)/logs $(ROOT)/data
-	chmod +s $(ROOT)/bin/0W-httpd
+	test -d $(ROOT)/0W-httpd || (mkdir $(ROOT)/0W-httpd)
+	cp -R ../data ../logs $(ROOT)/0W-httpd
+	test ../bin/0W-httpd -ef $(ROOT)/sbin/0W-httpd || cp ../bin/0W-httpd $(ROOT)/sbin/0W-httpd
+	test -d $(ROOT)/etc/0W-httpd || (mkdir $(ROOT)/etc/0W-httpd && cd ../conf/ && \
+									cp countries $(ROOT)/etc/0W-httpd/countries.sample &&	\
+									cp crontab $(ROOT)/etc/0W-httpd/crontab.sample 	&&	\
+									cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample &&	\
+									cp httpd.txt $(ROOT)/etc/0W-httpd/httpd.txt.sample &&	\
+									cp ip2country $(ROOT)/etc/0W-httpd/ip2country.sample )
+	chown -R $(PRIV) $(ROOT)/sbin/0W-httpd $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/data
+	chmod +s $(ROOT)/sbin/0W-httpd
@

