--- /usr/ports/audio/murmur/Makefile 2011-02-23 11:27:13.000000000 +0900 +++ /usr/ports/audio/murmur/Makefile 2011-02-23 11:27:29.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= murmur -PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTVERSION= 1.2.3 CATEGORIES= audio net MASTER_SITES= SF/mumble/Mumble/${PORTVERSION} DISTNAME= mumble-${PORTVERSION} --- /usr/ports/audio/murmur/distinfo 2011-02-23 11:27:13.000000000 +0900 +++ /usr/ports/audio/murmur/distinfo 2011-02-23 11:28:01.000000000 +0900 @@ -1,3 +1,2 @@ -MD5 (mumble-1.2.2.tar.gz) = de30ee85170e183b66568b53b04c5727 -SHA256 (mumble-1.2.2.tar.gz) = 2c564e3d5b7481129482f2365375a2dc77e134c0c00012073cfdfbeadaa49be8 -SIZE (mumble-1.2.2.tar.gz) = 2920587 +SHA256 (mumble-1.2.3.tar.gz) = 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c +SIZE (mumble-1.2.3.tar.gz) = 3448053 --- /usr/ports/audio/murmur/files/murmur.in 2011-02-23 11:27:13.000000000 +0900 +++ /usr/ports/audio/murmur/files/murmur.in 2011-02-24 16:13:47.000000000 +0900 @@ -11,12 +11,16 @@ # # murmur_enable (bool): Set to NO by default. # Set it to YES to enable murmur. +# murmur_flags (str): Set to "" by default. +# Extra flags passed to start command. # . /etc/rc.subr # Set some defaults -murmur_user=${murmur_user:-"murmur"} +: ${murmur_enable="NO"} +: ${murmur_user="murmur"} +: ${murmur_flags=""} name=murmur rcvar=${name}_enable @@ -27,6 +31,4 @@ load_rc_config $name -: ${murmur_enable="NO"} - run_rc_command "$1" --- /usr/ports/audio/murmur/pkg-deinstall 1970-01-01 09:00:00.000000000 +0900 +++ /usr/ports/audio/murmur/pkg-deinstall 2011-02-24 17:45:02.000000000 +0900 @@ -0,0 +1,21 @@ +#!/bin/sh +# $FreeBSD$ + +PATH=/bin:/usr/sbin +USER=murmur +GROUP=murmur +RUNDIR=/var/run/murmur + +case $2 in + POST-DEINSTALL) + if pw group show ${GROUP} 2>&1 > /dev/null; then + echo "You should manually remove the \"${GROUP}\" group." + fi + + if pw user show ${USER} 2>&1 > /dev/null; then + echo "You should manually remove the \"${USER}\" user." + fi + + rm -Rf ${RUNDIR} + ;; +esac --- /usr/ports/audio/murmur/pkg-install 2011-02-23 11:27:13.000000000 +0900 +++ /usr/ports/audio/murmur/pkg-install 2011-02-24 17:07:51.000000000 +0900 @@ -37,26 +37,4 @@ chown -R ${USER}:${GROUP} ${LOGDIR} ${DBDIR} ${RUNDIR} ;; - - POST-DEINSTALL) - if pw group show ${GROUP} 2> /dev/null; then - if pw group del ${GROUP}; then - echo "Removed group \"${GROUP}\"." - else - echo "Removing group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show ${USER} 2> /dev/null; then - if pw userdel ${USER}; then - echo "Removed user \"${USER}\"." - else - echo "Removing user \"${USER}\" failed..." - exit 1 - fi - fi - - rm -Rf ${PIDDIR} - ;; esac --- /usr/ports/audio/murmur/pkg-plist 2011-02-23 11:27:13.000000000 +0900 +++ /usr/ports/audio/murmur/pkg-plist 2011-02-24 15:43:42.000000000 +0900 @@ -1,3 +1,4 @@ +@stopdaemon murmur @unexec if cmp -s %D/etc/murmur.ini.sample %D/etc/murmur.ini; then rm -f %D/etc/murmur.ini; fi etc/murmur.ini.sample @exec if [ ! -f %D/etc/murmur.ini ] ; then cp -p %D/%F %B/murmur.ini; fi