Date: Thu, 11 Dec 2014 07:59:04 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374514 - head/sysutils/munin-node Message-ID: <201412110759.sBB7x4da044343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Dec 11 07:59:03 2014 New Revision: 374514 URL: https://svnweb.freebsd.org/changeset/ports/374514 QAT: https://qat.redports.org/buildarchive/r374514/ Log: Cleanup pkg-{,de}install, don't restart munin-node from here, pkg can do it itself. Sponsored by: Absolight Modified: head/sysutils/munin-node/Makefile head/sysutils/munin-node/pkg-deinstall head/sysutils/munin-node/pkg-install Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Thu Dec 11 07:28:39 2014 (r374513) +++ head/sysutils/munin-node/Makefile Thu Dec 11 07:59:03 2014 (r374514) @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node Modified: head/sysutils/munin-node/pkg-deinstall ============================================================================== --- head/sysutils/munin-node/pkg-deinstall Thu Dec 11 07:28:39 2014 (r374513) +++ head/sysutils/munin-node/pkg-deinstall Thu Dec 11 07:59:03 2014 (r374514) @@ -1,13 +1,5 @@ #! /bin/sh -stop_process() { - STARTSTOP=${PKG_PREFIX}/etc/rc.d/munin-node - - if [ -x $STARTSTOP ]; then - $STARTSTOP stop - fi -} - delnewsyslog() { tmp="/etc/#munin-node$$" sed -e '/^\/var\/log\/munin\/munin-node.log[ ]/d' /etc/newsyslog.conf >${tmp} @@ -32,7 +24,6 @@ newsyslog() { case $2 in DEINSTALL) if [ -z "${PACKAGE_BUILDING}" ]; then - stop_process newsyslog fi ;; Modified: head/sysutils/munin-node/pkg-install ============================================================================== --- head/sysutils/munin-node/pkg-install Thu Dec 11 07:28:39 2014 (r374513) +++ head/sysutils/munin-node/pkg-install Thu Dec 11 07:59:03 2014 (r374514) @@ -1,34 +1,5 @@ #! /bin/sh -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - init_plugins() { if [ -f /tmp/.munin-node.version ]; then prevver=$(cat /tmp/.munin-node.version) @@ -41,26 +12,6 @@ init_plugins() { echo "done." } -create_crontab_entries() { - local sched prog - sched=$1 - prog=$2 - - if grep -q "^[^#]*$prog" /etc/crontab; then - echo "It looks like your crontab is already set up, so I'll use that." - else - echo "It looks like your perl suffers from unsafe signals." - if yesno "Would you like me to set up your root crontab to restart munin-node" y; then - cat <<EOT >>/etc/crontab -$sched root $prog -EOT - else - echo "You may suffer from munin-node crashing after log rotation." - echo "If you still want to restart munin-node, use $prog." - fi - fi -} - newsyslog() { if grep -q /var/log/munin/munin-node.log /etc/newsyslog.conf; then : @@ -80,7 +31,6 @@ case $2 in POST-INSTALL) if [ -z "${PACKAGE_BUILDING}" ]; then init_plugins - ${PKG_PREFIX}/etc/rc.d/munin-node start newsyslog fi ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412110759.sBB7x4da044343>