- take maintainership

- STAGE support
- remove pkg-install and pkg-deinstall scripts
- remove @stopdaemon
- ICE option is no longer default; devel/ice doesn't work on FreeBSD 10
since June
- add a start_precmd to handle empty directory creation

Approved by:	crees (mentor)

5 files changed, 25 insertions, 51 deletions

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 737171624cdd..4f96839c3b98 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -7,31 +7,30 @@ CATEGORIES=	audio net
 MASTER_SITES=	SF/mumble/Mumble/${PORTVERSION}
 DISTNAME=	mumble-${PORTVERSION}
 
-MAINTAINER=	ayu@commun.jp
+MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Murmur is the server component of Mumble
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 
-USERS=		${PORTNAME}
-NO_STAGE=	yes
-GROUPS=		${USERS}
+USERS=		murmur
+GROUPS=		murmur
 USE_QT4=	qmake_build moc_build corelib network xml sql sql-sqlite3_run
 
 CONFIG=		no-client
 
-MAN1=		murmurd.1
 USE_RC_SUBR=	murmur
+SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
 OPTIONS_DEFINE=	ICE DBUS BONJOUR DOCS
-OPTIONS_DEFAULT=	ICE BONJOUR
+OPTIONS_DEFAULT=	BONJOUR
 ICE_DESC=	Ice Support
 BONJOUR_DESC=	Bonjour Support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICE}
-LIB_DEPENDS+=	Ice:${PORTSDIR}/devel/ice
+LIB_DEPENDS+=	libIce.so:${PORTSDIR}/devel/ice
 .else
 CONFIG+=	no-ice
 .endif
@@ -43,15 +42,13 @@ CONFIG+=	no-dbus
 .endif
 
 .if ${PORT_OPTIONS:MBONJOUR}
-LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 .else
 CONFIG+=	no-bonjour
 .endif
 
 post-patch:
-.if ${OSVERSION} >= 800000
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
-.endif
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \
@@ -64,20 +61,15 @@ pre-install:
 	@${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${PREFIX}/sbin
-	@${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${PREFIX}/etc/murmur.ini.sample
-	@if [ ! -f ${PREFIX}/etc/murmur.ini ]; then \
-		${CP} -p ${PREFIX}/etc/murmur.ini.sample ${PREFIX}/etc/murmur.ini; \
-	fi
-	${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
+	@${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
+	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in CHANGES INSTALL LICENSE README README.Linux
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.mk>
diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in
index 51f83df08d2e..b3eced81adbb 100644
--- a/audio/murmur/files/murmur.in
+++ b/audio/murmur/files/murmur.in
@@ -23,10 +23,19 @@ load_rc_config $name
 
 # Set some defaults
 : ${murmur_enable:=NO}
-: ${murmur_user=murmur}
+: ${murmur_user=%%USERS%%}
 
 command="%%PREFIX%%/sbin/murmurd"
 command_args="-ini %%PREFIX%%/etc/murmur.ini"
 pidfile=/var/run/murmur/murmur.pid
+start_precmd=murmur_prestart
+
+murmur_prestart() {
+	for i in /var/log/murmur /var/run/murmur /var/db/murmur; do
+		if [ ! -d ${i} ]; then
+			install -d -o %%USERS%% -g %%GROUPS%% ${i}
+		fi
+	done
+}
 
 run_rc_command "$1"
diff --git a/audio/murmur/pkg-deinstall b/audio/murmur/pkg-deinstall
deleted file mode 100644
index e6da8c4bb052..000000000000
--- a/audio/murmur/pkg-deinstall
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-PATH=/bin:/usr/sbin
-RUNDIR=/var/run/murmur
-
-case $2 in
-	POST-DEINSTALL)
-		rm -Rf ${RUNDIR}
-		;;
-esac
diff --git a/audio/murmur/pkg-install b/audio/murmur/pkg-install
deleted file mode 100644
index f724f5de1b69..000000000000
--- a/audio/murmur/pkg-install
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-PATH=/bin:/usr/sbin
-LOGDIR=/var/log/murmur
-RUNDIR=/var/run/murmur
-DBDIR=/var/db/murmur
-
-case $2 in
-	POST-INSTALL)
-
-		mkdir -m 750 ${LOGDIR} ${DBDIR} ${RUNDIR} 2> /dev/null
-		chown -R murmur:murmur ${LOGDIR} ${DBDIR} ${RUNDIR}
-
-		;;
-esac
diff --git a/audio/murmur/pkg-plist b/audio/murmur/pkg-plist
index f963cdb8e169..aedc25d5ad05 100644
--- a/audio/murmur/pkg-plist
+++ b/audio/murmur/pkg-plist
@@ -1,7 +1,7 @@
-@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
+man/man1/murmurd.1.gz
 sbin/murmurd
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL