From nobody@FreeBSD.org  Mon May 19 15:58:48 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id CEBD7A99
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 May 2014 15:58:48 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id AF7EA2956
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 May 2014 15:58:48 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JFwm9h059418
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 May 2014 15:58:48 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4JFwmuj059415;
	Mon, 19 May 2014 15:58:48 GMT
	(envelope-from nobody)
Message-Id: <201405191558.s4JFwmuj059415@cgiserv.freebsd.org>
Date: Mon, 19 May 2014 15:58:48 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/zerowait-httpd
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         189954
>Category:       ports
>Synopsis:       [patch] Add staging support to www/zerowait-httpd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dhn
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 19 16:00:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Mon May 19 16:00:07 UTC 2014
>Originator:     Joseph Benden
>Release:        FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014     root@lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/zerowait-httpd.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/zerowait-httpd/Makefile b/www/zerowait-httpd/Makefile
index d2a1797..152757f 100644
--- a/www/zerowait-httpd/Makefile
+++ b/www/zerowait-httpd/Makefile
@@ -21,5 +21,4 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --owner=${WWWOWN} --group=${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/zerowait-httpd/files/patch-Makefile b/www/zerowait-httpd/files/patch-Makefile
index 8af6dc3..5d09e6c 100644
--- a/www/zerowait-httpd/files/patch-Makefile
+++ b/www/zerowait-httpd/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-03-16 00:44:45.000000000 +0100
-+++ Makefile	2008-09-26 19:44:38.000000000 +0200
+--- Makefile.orig	2008-03-15 16:44:45.000000000 -0700
++++ Makefile	2014-05-19 08:49:23.000000000 -0700
 @@ -13,13 +13,14 @@
  	rm -f *~ src/*~
  
@@ -11,13 +11,14 @@
 -	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
++	test -d $(DESTDIR)$(ROOT)/0W-httpd || (mkdir $(DESTDIR)$(ROOT)/0W-httpd)
++	install -d $(DESTDIR)$(ROOT)/0W-httpd/data $(DESTDIR)$(ROOT)/0W-httpd/logs $(DESTDIR)$(ROOT)/0W-httpd/pids
++	install -m 755 bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(DESTDIR)$(ROOT)/bin
++	install -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(DESTDIR)$(ROOT)/sbin
++	test -d $(DESTDIR)$(ROOT)/etc/0W-httpd || (mkdir $(DESTDIR)$(ROOT)/etc/0W-httpd && cd conf/ && \
++		cp countries* $(DESTDIR)$(ROOT)/etc/0W-httpd/ && \
++		cp httpd.conf $(DESTDIR)$(ROOT)/etc/0W-httpd/httpd.conf.sample )
++	chown -R $(OWNER):$(GROUP) $(DESTDIR)$(ROOT)/sbin/0W-httpd $(DESTDIR)$(ROOT)/0W-httpd/logs $(DESTDIR)$(ROOT)/0W-httpd/data $(DESTDIR)$(ROOT)/0W-httpd/pids
  	@echo
  	@echo "Installed, run as root: $(ROOT)/bin/0W-httpd [-h]"
+ 
diff --git a/www/zerowait-httpd/pkg-plist b/www/zerowait-httpd/pkg-plist
index d12cd8e..53d0336 100644
--- a/www/zerowait-httpd/pkg-plist
+++ b/www/zerowait-httpd/pkg-plist
@@ -16,4 +16,5 @@ sbin/0W-httpd
 @dirrmtry etc/0W-httpd
 @dirrm 0W-httpd/pids
 @dirrm 0W-httpd/data
+@dirrmtry 0W-httpd/logs
 @dirrm 0W-httpd


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dhn 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 19 16:00:07 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189954 
>Unformatted:
