svn commit: r362754 - in head/www/squidstats: . files

[Olli Hauer]

Author: ohauer
Date: Wed Jul 23 23:27:39 2014
New Revision: 362754
URL: http://svnweb.freebsd.org/changeset/ports/362754
QAT: https://qat.redports.org/buildarchive/r362754/

Log:
  - unbreak stage phase where the squid user is unknown
  
  Noted by John Marino by PM

Modified:
  head/www/squidstats/Makefile
  head/www/squidstats/files/patch-graph__src__Makefile
  head/www/squidstats/pkg-plist

Modified: head/www/squidstats/Makefile
==============================================================================
--- head/www/squidstats/Makefile	Wed Jul 23 23:11:05 2014	(r362753)
+++ head/www/squidstats/Makefile	Wed Jul 23 23:27:39 2014	(r362754)
@@ -3,7 +3,7 @@
 
 PORTNAME=	squidstats
 PORTVERSION=	54
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	squidstats-r${PORTVERSION}
@@ -20,6 +20,7 @@ SHEBANG_FILES=	graph/src/stats.pl.in
 
 USERS=		squid
 GROUPS=		squid
+PLIST_SUB+=	WWWOWN=${WWWOWN} SQUID_USER=${USERS}
 
 SUB_FILES=	pkg-message
 

Modified: head/www/squidstats/files/patch-graph__src__Makefile
==============================================================================
--- head/www/squidstats/files/patch-graph__src__Makefile	Wed Jul 23 23:11:05 2014	(r362753)
+++ head/www/squidstats/files/patch-graph__src__Makefile	Wed Jul 23 23:27:39 2014	(r362754)
@@ -1,5 +1,5 @@
---- ./graph/src/Makefile.orig	2014-07-19 13:30:29.000000000 +0200
-+++ ./graph/src/Makefile	2014-07-19 13:32:27.000000000 +0200
+--- ./graph/src/Makefile.orig	2009-01-07 19:20:02.000000000 +0100
++++ ./graph/src/Makefile	2014-07-24 01:02:02.000000000 +0200
 @@ -33,21 +33,21 @@
  	$(RM) stats.pl config.ini graph-summary.cgi 
  
@@ -25,8 +25,8 @@
 -	$(INSTALL) -m 0644 templates.conf $(ETCDIR)/templates.conf
 -	$(INSTALL) -m 0644 snmp_monitor.cfg $(ETCDIR)/snmp_monitor.cfg
 -	$(INSTALL) -m 0644 graph.css $(WEB_DATADIR)/graph.css
-+	$(INSTALL_DIR) -m 0755 -o $(WEB_USER) $(DESTDIR)$(GRAPH_DATADIR)
-+	$(INSTALL_DIR) -m 0755 -o $(STATS_USER) $(DESTDIR)$(RRD_DATADIR)
++	$(INSTALL_DIR) -m 0755 $(DESTDIR)$(GRAPH_DATADIR)
++	$(INSTALL_DIR) -m 0755 $(DESTDIR)$(RRD_DATADIR)
 +	$(INSTALL_DIR) -m 0755 $(DESTDIR)$(WEB_DATADIR)
 +	$(INSTALL_DIR) -m 0755 $(DESTDIR)$(CGIDIR)
 +	$(INSTALL_DIR) -m 0755 $(DESTDIR)$(ETCDIR)

Modified: head/www/squidstats/pkg-plist
==============================================================================
--- head/www/squidstats/pkg-plist	Wed Jul 23 23:11:05 2014	(r362753)
+++ head/www/squidstats/pkg-plist	Wed Jul 23 23:27:39 2014	(r362754)
@@ -24,6 +24,10 @@ www/cgi-bin/graph-summary.cgi
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
 @dirrmtry www/cgi-bin
+ at cwd /
+ at comment set directory owner
+ at exec chown -R %%WWWOWN%% "/var/db/squidstats/graphs"
+ at exec chown -R %%SQUID_USER%% "/var/db/squidstats/rrd"
 @unexec rmdir "/var/db/squidstats/graphs" >/dev/null 2>&1 || :
 @unexec rmdir "/var/db/squidstats/rrd" >/dev/null 2>&1 || :
 @unexec rmdir "/var/db/squidstats" >/dev/null 2>&1 || :