svn commit: r362257 - in head/www/squidstats: . files
Olli Hauer
ohauer at FreeBSD.org
Sat Jul 19 12:05:18 UTC 2014
Author: ohauer
Date: Sat Jul 19 12:05:17 2014
New Revision: 362257
URL: http://svnweb.freebsd.org/changeset/ports/362257
QAT: https://qat.redports.org/buildarchive/r362257/
Log:
- add stage support
Added:
head/www/squidstats/files/patch-graph__src__Makefile (contents, props changed)
Deleted:
head/www/squidstats/files/pkg-install.in
Modified:
head/www/squidstats/Makefile
head/www/squidstats/pkg-plist
Modified: head/www/squidstats/Makefile
==============================================================================
--- head/www/squidstats/Makefile Sat Jul 19 12:02:54 2014 (r362256)
+++ head/www/squidstats/Makefile Sat Jul 19 12:05:17 2014 (r362257)
@@ -9,31 +9,18 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= squidstats-r${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
-COMMENT= A collection of simple statistical analysis bits for Squid
+COMMENT= Collection of simple statistical analysis bits for Squid
RUN_DEPENDS= p5-Config-IniFiles>=2.39:${PORTSDIR}/devel/p5-Config-IniFiles \
p5-RRD-Simple>=1.44:${PORTSDIR}/databases/p5-RRD-Simple \
p5-SNMP_Session>=1.11:${PORTSDIR}/net-mgmt/p5-SNMP_Session
-USES= perl5
+USES= perl5 shebangfix
+SHEBANG_FILES= graph/src/stats.pl.in
-SQUID_UID?= squid
-SQUID_GID?= squid
+USERS= squid
+GROUPS= squid
-SUB_FILES= pkg-message pkg-install
-SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
-
-NO_STAGE= yes
-pre-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
- ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
- ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${ECHO_CMD} "===> post-installation information for ${PKGNAME}:"
- @${ECHO_CMD} ""
- @${CAT} ${PKGMESSAGE}
- @${ECHO_CMD} ""
+SUB_FILES= pkg-message
.include <bsd.port.mk>
Added: head/www/squidstats/files/patch-graph__src__Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/squidstats/files/patch-graph__src__Makefile Sat Jul 19 12:05:17 2014 (r362257)
@@ -0,0 +1,38 @@
+--- ./graph/src/Makefile.orig 2014-07-19 13:30:29.000000000 +0200
++++ ./graph/src/Makefile 2014-07-19 13:32:27.000000000 +0200
+@@ -33,21 +33,21 @@
+ $(RM) stats.pl config.ini graph-summary.cgi
+
+ install_templates:
+- $(INSTALL_DIR) -m 0755 $(TEMPLATEDIR)
++ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(TEMPLATEDIR)
+ @for dep in $(TEMPLATES); do \
+- echo $(INSTALL) -m 0644 templates/$$dep $(TEMPLATEDIR)/$$dep; \
+- $(INSTALL) -m 0644 templates/$$dep $(TEMPLATEDIR)/$$dep; \
++ echo $(INSTALL) -m 0644 templates/$$dep $(DESTDIR)$(TEMPLATEDIR)/$$dep; \
++ $(INSTALL) -m 0644 templates/$$dep $(DESTDIR)$(TEMPLATEDIR)/$$dep; \
+ done
+
+ install: all install_templates
+- $(INSTALL_DIR) -m 0755 -o $(WEB_USER) $(GRAPH_DATADIR)
+- $(INSTALL_DIR) -m 0755 -o $(STATS_USER) $(RRD_DATADIR)
+- $(INSTALL_DIR) -m 0755 $(WEB_DATADIR)
+- $(INSTALL_DIR) -m 0755 $(CGIDIR)
+- $(INSTALL_DIR) -m 0755 $(ETCDIR)
+- $(INSTALL) -m 0755 stats.pl $(BINDIR)/squidstats.pl
+- $(INSTALL) -m 0755 graph-summary.cgi $(CGIDIR)/graph-summary.cgi
+- $(INSTALL) -m 0644 config.ini $(ETCDIR)/config.ini
+- $(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)$(WEB_DATADIR)
++ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(CGIDIR)
++ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(ETCDIR)
++ $(INSTALL) -m 0755 stats.pl $(DESTDIR)$(BINDIR)/squidstats.pl
++ $(INSTALL) -m 0755 graph-summary.cgi $(DESTDIR)$(CGIDIR)/graph-summary.cgi
++ $(INSTALL) -m 0644 config.ini $(DESTDIR)$(ETCDIR)/config.ini
++ $(INSTALL) -m 0644 templates.conf $(DESTDIR)$(ETCDIR)/templates.conf
++ $(INSTALL) -m 0644 snmp_monitor.cfg $(DESTDIR)$(ETCDIR)/snmp_monitor.cfg
++ $(INSTALL) -m 0644 graph.css $(DESTDIR)$(WEB_DATADIR)/graph.css
Modified: head/www/squidstats/pkg-plist
==============================================================================
--- head/www/squidstats/pkg-plist Sat Jul 19 12:02:54 2014 (r362256)
+++ head/www/squidstats/pkg-plist Sat Jul 19 12:05:17 2014 (r362257)
@@ -1,26 +1,29 @@
-etc/squidstats/config.ini
-etc/squidstats/snmp_monitor.cfg
-etc/squidstats/templates.conf
-share/squidstats/templates/clients
-share/squidstats/templates/dnsreq
-share/squidstats/templates/fds
-share/squidstats/templates/hitratio
-share/squidstats/templates/icp
-share/squidstats/templates/ipcachereq
-share/squidstats/templates/outgoing
-share/squidstats/templates/cache
-share/squidstats/templates/cpu
-share/squidstats/templates/dnssvc
-share/squidstats/templates/fqdncachereq
-share/squidstats/templates/httpsvc
-share/squidstats/templates/incoming
-share/squidstats/templates/objects
-share/squidstats/templates/requests
-share/squidstats/htdocs/graph.css
bin/squidstats.pl
+%%ETCDIR%%/config.ini
+%%ETCDIR%%/snmp_monitor.cfg
+%%ETCDIR%%/templates.conf
+%%DATADIR%%/htdocs/graph.css
+%%DATADIR%%/templates/cache
+%%DATADIR%%/templates/clients
+%%DATADIR%%/templates/cpu
+%%DATADIR%%/templates/dnsreq
+%%DATADIR%%/templates/dnssvc
+%%DATADIR%%/templates/fds
+%%DATADIR%%/templates/fqdncachereq
+%%DATADIR%%/templates/hitratio
+%%DATADIR%%/templates/httpsvc
+%%DATADIR%%/templates/icp
+%%DATADIR%%/templates/incoming
+%%DATADIR%%/templates/ipcachereq
+%%DATADIR%%/templates/objects
+%%DATADIR%%/templates/outgoing
+%%DATADIR%%/templates/requests
www/cgi-bin/graph-summary.cgi
+ at dirrm %%ETCDIR%%
+ at dirrm %%DATADIR%%/htdocs
+ at dirrm %%DATADIR%%/templates
+ at dirrm %%DATADIR%%
@dirrmtry www/cgi-bin
- at dirrm etc/squidstats
- at dirrm share/squidstats/htdocs
- at dirrm share/squidstats/templates
- at dirrm share/squidstats
+ at unexec rmdir "/var/db/squidstats/graphs" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/db/squidstats/rrd" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/db/squidstats" >/dev/null 2>&1 || :
More information about the svn-ports-head
mailing list