From owner-svn-ports-head@freebsd.org Wed Sep 2 00:08:47 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DFA99C7B7D; Wed, 2 Sep 2015 00:08:47 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7C918D7; Wed, 2 Sep 2015 00:08:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8208k5m082152; Wed, 2 Sep 2015 00:08:46 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8208kwW082150; Wed, 2 Sep 2015 00:08:46 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509020008.t8208kwW082150@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 2 Sep 2015 00:08:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395809 - head/net-mgmt/nagiosgraph X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2015 00:08:47 -0000 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%%