svn commit: r404728 - head/net-mgmt/torrus

Tue Dec 29 10:19:57 UTC 2015

Author: amdmi3
Date: Tue Dec 29 10:19:55 2015
New Revision: 404728
URL: https://svnweb.freebsd.org/changeset/ports/404728

Log:
  - Clarify LICENSE, add LICENSE_FILE
  - Add NO_ARCH
  - Handle empty dirs and permissions in plist properly
  
  PR:		205573
  Submitted by:	amdmi3
  Approved by:	corsmith at gmail.com (maintainer)

Modified:
  head/net-mgmt/torrus/Makefile
  head/net-mgmt/torrus/pkg-plist

Modified: head/net-mgmt/torrus/Makefile
==============================================================================

--- head/net-mgmt/torrus/Makefile	Tue Dec 29 10:04:38 2015	(r404727)
+++ head/net-mgmt/torrus/Makefile	Tue Dec 29 10:19:55 2015	(r404728)
@@ -10,7 +10,8 @@ MASTER_SITES=	SF/torrus/torrus/
 MAINTAINER=	corsmith at gmail.com
 COMMENT=	Data Series Processing Framework - think mrtg with xml configs
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
@@ -28,7 +29,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USE_GNOME=	libxml2
 USES=		perl5
 USE_PERL5=	run
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
+NO_ARCH=	yes
 
 USERS=		torrus
 GROUPS=		torrus
@@ -48,14 +50,15 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-pkgonly
 
 post-install:
-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/log/torrus
-	${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus
-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/cache
-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/collector_rrd
-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/db
-	${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus/reports
-	${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus/session_data
-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/session_data/lock
-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/session_data/store
+	@${MKDIR} ${STAGEDIR}/var/torrus/session_data/store
+	@${MKDIR} ${STAGEDIR}/var/torrus/session_data/lock
+	@${MKDIR} ${STAGEDIR}/var/torrus/session_data
+	@${MKDIR} ${STAGEDIR}/var/torrus/reports
+	@${MKDIR} ${STAGEDIR}/var/torrus/db
+	@${MKDIR} ${STAGEDIR}/var/torrus/collector_rrd
+	@${MKDIR} ${STAGEDIR}/var/torrus/cache
+	@${MKDIR} ${STAGEDIR}/var/torrus
+	@${MKDIR} ${STAGEDIR}/var/run/torrus
+	@${MKDIR} ${STAGEDIR}/var/log/torrus
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/torrus/pkg-plist
==============================================================================
--- head/net-mgmt/torrus/pkg-plist	Tue Dec 29 10:04:38 2015	(r404727)
+++ head/net-mgmt/torrus/pkg-plist	Tue Dec 29 10:19:55 2015	(r404728)
@@ -298,57 +298,21 @@ man/man7/torrus_install_plugin.7.gz
 %%SITE_PERL%%/Torrus/SQL/SrvExport.pm
 %%SITE_PERL%%/Torrus/SQL.pm
 %%SITE_PERL%%/Torrus/TimeStamp.pm
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/log/torrus 2>/dev/null || true
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/run/torrus 2>/dev/null || true
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/cache
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/collector_rrd
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/db
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/reports
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data 2>/dev/null || true
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data/store 2>/dev/null || true
- at exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data/lock 2>/dev/null || true
- at exec mkdir %D/etc/torrus/templates 2>/dev/null || true
- at exec mkdir %D/%%DATADIR%%/plugins 2>/dev/null || true
- at exec mkdir %D/%%DATADIR%%/plugins/devdiscover-config 2>/dev/null || true
- at exec mkdir %D/%%DATADIR%%/plugins/torrus-config 2>/dev/null || true
- at exec mkdir %D/%%DATADIR%%/plugins/wrapper 2>/dev/null || true
- at exec mkdir %D/%%DATADIR%%/sup/webscripts 2>/dev/null || true
- at dirrm %%DATADIR%%/xmlconfig/vendor
- at dirrm %%DATADIR%%/xmlconfig/old
- at dirrm %%DATADIR%%/xmlconfig/generic
- at dirrm %%DATADIR%%/xmlconfig/examples
- at dirrm %%DATADIR%%/xmlconfig
- at dirrm %%DATADIR%%/templates
- at dirrm %%DATADIR%%/sup/webscripts
- at dirrm %%DATADIR%%/sup/webplain
- at dirrm %%DATADIR%%/sup/styling
- at dirrm %%DATADIR%%/sup/mibs
- at dirrm %%DATADIR%%/sup/dtd
- at dirrm %%DATADIR%%/sup
- at dirrm %%DATADIR%%/plugins/wrapper
- at dirrm %%DATADIR%%/plugins/torrus-config
- at dirrm %%DATADIR%%/plugins/devdiscover-config
- at dirrm %%DATADIR%%/plugins
- at dirrm %%DATADIR%%/conf_defaults
- at dirrm %%DATADIR%%
- at dirrm %%EXAMPLESDIR%%
- at dirrm %%DOCSDIR%%/devdoc
- at dirrm %%DOCSDIR%%
- at dirrm libexec/torrus/scripts/xml
- at dirrm libexec/torrus/scripts
- at dirrm libexec/torrus
- at dirrmtry /var/torrus/session_data/store
- at dirrmtry /var/torrus/session_data/lock
- at dirrmtry /var/torrus/session_data
- at dirrmtry /var/torrus/reports
- at dirrmtry /var/torrus/db
- at dirrmtry /var/torrus/collector_rrd
- at dirrmtry /var/torrus/cache
- at dirrmtry /var/torrus/
- at dirrmtry /var/log/torrus
- at dirrmtry etc/torrus/xmlconfig
- at dirrmtry etc/torrus/templates
- at dirrmtry etc/torrus/discovery
- at dirrmtry etc/torrus/conf
- at dirrmtry etc/torrus
+ at dir %%DATADIR%%/sup/webscripts
+ at dir %%DATADIR%%/sup
+ at dir %%DATADIR%%/plugins/wrapper
+ at dir %%DATADIR%%/plugins/torrus-config
+ at dir %%DATADIR%%/plugins/devdiscover-config
+ at dir etc/torrus/templates
+ at dir etc/torrus/discovery
+ at dir etc/torrus
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/session_data/store
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/session_data/lock
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,775) /var/torrus/session_data
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,775) /var/torrus/reports
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/db
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/collector_rrd
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/cache
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,775) /var/torrus/
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/log/torrus
+ at dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/run/torrus
