From owner-svn-ports-all@freebsd.org Mon Dec 26 17:30:02 2016 Return-Path: Delivered-To: svn-ports-all@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 163DEC92DB2; Mon, 26 Dec 2016 17:30:02 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E4FC819F7; Mon, 26 Dec 2016 17:30:01 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQHU1c7018210; Mon, 26 Dec 2016 17:30:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQHU08J018202; Mon, 26 Dec 2016 17:30:00 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201612261730.uBQHU08J018202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 26 Dec 2016 17:30:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429557 - in head/sysutils: munin-master munin-node munin-node/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2016 17:30:02 -0000 Author: mat Date: Mon Dec 26 17:30:00 2016 New Revision: 429557 URL: https://svnweb.freebsd.org/changeset/ports/429557 Log: Drop newsyslog's configuration into etc/newsyslog.conf.d. Sponsored by: Absolight Added: head/sysutils/munin-node/files/newsyslog (contents, props changed) Deleted: head/sysutils/munin-node/pkg-deinstall Modified: head/sysutils/munin-master/Makefile (contents, props changed) head/sysutils/munin-master/pkg-deinstall (contents, props changed) head/sysutils/munin-master/pkg-install (contents, props changed) head/sysutils/munin-master/pkg-plist (contents, props changed) head/sysutils/munin-node/Makefile (contents, props changed) head/sysutils/munin-node/pkg-install (contents, props changed) head/sysutils/munin-node/pkg-plist (contents, props changed) Modified: head/sysutils/munin-master/Makefile ============================================================================== --- head/sysutils/munin-master/Makefile Mon Dec 26 17:27:57 2016 (r429556) +++ head/sysutils/munin-master/Makefile Mon Dec 26 17:30:00 2016 (r429557) @@ -3,6 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -master @@ -61,6 +62,7 @@ post-install: ) (cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done) ${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample + ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-master.newsyslog .include Modified: head/sysutils/munin-master/pkg-deinstall ============================================================================== --- head/sysutils/munin-master/pkg-deinstall Mon Dec 26 17:27:57 2016 (r429556) +++ head/sysutils/munin-master/pkg-deinstall Mon Dec 26 17:30:00 2016 (r429557) @@ -53,39 +53,11 @@ delete_crontab_entries() { rm $TMPFILE } -delnewsyslog() { - tmp=`mktemp -t munin` || exit 1 - sed -e '/^\/var\/log\/munin\/\*\.log[ ]/d' /etc/newsyslog.conf >${tmp} - cat ${tmp} > /etc/newsyslog.conf - rm ${tmp} -} - -newsyslog() { - ENTRY=`fgrep '/var/log/munin/*' /etc/newsyslog.conf` - DEFAULT='/var/log/munin/*.log munin:munin 644 7 * @T00 GNWZ' - if [ -z "$ENTRY" ] - then - exit 0 - elif [ "$ENTRY" = "$DEFAULT" ] - then - delnewsyslog - elif yesno "You have changed the default munin-master entry in \"/etc/newsyslog.conf\". -Do you want me to delete it?" y - then - delnewsyslog - echo "Done." - fi -} - - case $2 in DEINSTALL) if [ -z "${PACKAGE_BUILDING}" ] then delete_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' - newsyslog fi ;; - POST-DEINSTALL) - ;; esac Modified: head/sysutils/munin-master/pkg-install ============================================================================== --- head/sysutils/munin-master/pkg-install Mon Dec 26 17:27:57 2016 (r429556) +++ head/sysutils/munin-master/pkg-install Mon Dec 26 17:30:00 2016 (r429557) @@ -52,15 +52,6 @@ create_crontab_entries() { fi } -newsyslog() { - if ! fgrep -q '/var/log/munin/*' /etc/newsyslog.conf - then - cat >> /etc/newsyslog.conf < Added: head/sysutils/munin-node/files/newsyslog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/munin-node/files/newsyslog Mon Dec 26 17:30:00 2016 (r429557) @@ -0,0 +1 @@ +/var/log/munin/munin-node.log 644 7 * @T00 Z /var/run/munin/munin-node.pid Modified: head/sysutils/munin-node/pkg-install ============================================================================== --- head/sysutils/munin-node/pkg-install Mon Dec 26 17:27:57 2016 (r429556) +++ head/sysutils/munin-node/pkg-install Mon Dec 26 17:30:00 2016 (r429557) @@ -12,26 +12,13 @@ init_plugins() { echo "done." } -newsyslog() { - if grep -q /var/log/munin/munin-node.log /etc/newsyslog.conf; then - : - else - cat >> /etc/newsyslog.conf <