Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Sep 2015 00:08:46 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395809 - head/net-mgmt/nagiosgraph
Message-ID:  <201509020008.t8208kwW082150@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Sep  2 00:08:45 2015
New Revision: 395809
URL: https://svnweb.freebsd.org/changeset/ports/395809

Log:
  - Add NO_ARCH
  - Switch to @sample
  
  Approved by:	portmgr blanket

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

Modified: head/net-mgmt/nagiosgraph/Makefile
==============================================================================
--- head/net-mgmt/nagiosgraph/Makefile	Wed Sep  2 00:08:39 2015	(r395808)
+++ head/net-mgmt/nagiosgraph/Makefile	Wed Sep  2 00:08:45 2015	(r395809)
@@ -26,6 +26,7 @@ NAGIOS4_RUN_DEPENDS=	${LOCALBASE}/bin/na
 USES=		perl5 shebangfix
 USE_PERL5=	run
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 DOCS=		AUTHORS CHANGELOG INSTALL README TODO
 NAGIOSWWWDIR?=	www/nagios

Modified: head/net-mgmt/nagiosgraph/pkg-plist
==============================================================================
--- head/net-mgmt/nagiosgraph/pkg-plist	Wed Sep  2 00:08:39 2015	(r395808)
+++ head/net-mgmt/nagiosgraph/pkg-plist	Wed Sep  2 00:08:45 2015	(r395809)
@@ -1,40 +1,16 @@
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/access.conf.sample %D/etc/nagios/%%PORTNAME%%/access.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/access.conf ; fi
-etc/nagios/%%PORTNAME%%/access.conf.sample
-@exec [ ! -f %B/access.conf ] && cp -p %D/%F %B/access.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/datasetdb.conf.sample %D/etc/nagios/%%PORTNAME%%/datasetdb.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/datasetdb.conf ; fi
-etc/nagios/%%PORTNAME%%/datasetdb.conf.sample
-@exec [ ! -f %B/datasetdb.conf ] && cp -p %D/%F %B/datasetdb.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/groupdb.conf.sample %D/etc/nagios/%%PORTNAME%%/groupdb.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/groupdb.conf ; fi
-etc/nagios/%%PORTNAME%%/groupdb.conf.sample
-@exec [ ! -f %B/groupdb.conf ] && cp -p %D/%F %B/groupdb.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/hostdb.conf.sample %D/etc/nagios/%%PORTNAME%%/hostdb.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/hostdb.conf ; fi
-etc/nagios/%%PORTNAME%%/hostdb.conf.sample
-@exec [ ! -f %B/hostdb.conf ] && cp -p %D/%F %B/hostdb.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/labels.conf.sample %D/etc/nagios/%%PORTNAME%%/labels.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/labels.conf ; fi
-etc/nagios/%%PORTNAME%%/labels.conf.sample
-@exec [ ! -f %B/labels.conf ] && cp -p %D/%F %B/labels.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/map.sample %D/etc/nagios/%%PORTNAME%%/map ; then rm -f %D/etc/nagios/%%PORTNAME%%/map ; fi
-etc/nagios/%%PORTNAME%%/map.sample
-@exec [ ! -f %B/map ] && cp -p %D/%F %B/map || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%.conf.sample %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%.conf ; fi
-etc/nagios/%%PORTNAME%%/%%PORTNAME%%.conf.sample
-@exec [ ! -f %B/%%PORTNAME%%.conf ] && cp -p %D/%F %B/%%PORTNAME%%.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_de.conf.sample %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_de.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_de.conf ; fi
-etc/nagios/%%PORTNAME%%/%%PORTNAME%%_de.conf.sample
-@exec [ ! -f %B/%%PORTNAME%%_de.conf ] && cp -p %D/%F %B/%%PORTNAME%%_de.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_es.conf.sample %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_es.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_es.conf ; fi
-etc/nagios/%%PORTNAME%%/%%PORTNAME%%_es.conf.sample
-@exec [ ! -f %B/%%PORTNAME%%_es.conf ] && cp -p %D/%F %B/%%PORTNAME%%_es.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_fr.conf.sample %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_fr.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/%%PORTNAME%%_fr.conf ; fi
-etc/nagios/%%PORTNAME%%/%%PORTNAME%%_fr.conf.sample
-@exec [ ! -f %B/%%PORTNAME%%_fr.conf ] && cp -p %D/%F %B/%%PORTNAME%%_fr.conf || true
+@sample etc/nagios/%%PORTNAME%%/access.conf.sample
+@sample etc/nagios/%%PORTNAME%%/datasetdb.conf.sample
+@sample etc/nagios/%%PORTNAME%%/groupdb.conf.sample
+@sample etc/nagios/%%PORTNAME%%/hostdb.conf.sample
+@sample etc/nagios/%%PORTNAME%%/labels.conf.sample
+@sample etc/nagios/%%PORTNAME%%/map.sample
+@sample etc/nagios/%%PORTNAME%%/%%PORTNAME%%.conf.sample
+@sample etc/nagios/%%PORTNAME%%/%%PORTNAME%%_de.conf.sample
+@sample etc/nagios/%%PORTNAME%%/%%PORTNAME%%_es.conf.sample
+@sample etc/nagios/%%PORTNAME%%/%%PORTNAME%%_fr.conf.sample
 etc/nagios/%%PORTNAME%%/ngshared.pm
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/rrdopts.conf.sample %D/etc/nagios/%%PORTNAME%%/rrdopts.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf ; fi
-etc/nagios/%%PORTNAME%%/rrdopts.conf.sample
-@exec [ ! -f %B/rrdopts.conf ] && cp -p %D/%F %B/rrdopts.conf || true
-@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/servdb.conf.sample %D/etc/nagios/%%PORTNAME%%/servdb.conf ; then rm -f %D/etc/nagios/%%PORTNAME%%/servdb.conf ; fi
-etc/nagios/%%PORTNAME%%/servdb.conf.sample
-@exec [ ! -f %B/servdb.conf ] && cp -p %D/%F %B/servdb.conf || true
+@sample etc/nagios/%%PORTNAME%%/rrdopts.conf.sample
+@sample etc/nagios/%%PORTNAME%%/servdb.conf.sample
 libexec/%%PORTNAME%%/insert.pl
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
@@ -54,8 +30,3 @@ libexec/%%PORTNAME%%/insert.pl
 %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.css
 %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.js
 %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.ssi
-@dirrmtry %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry libexec/%%PORTNAME%%
-@dirrmtry etc/nagios/%%PORTNAME%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509020008.t8208kwW082150>