From owner-svn-ports-head@FreeBSD.ORG Mon Nov 11 16:47:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3C8EDD0A; Mon, 11 Nov 2013 16:47:26 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 29C7A2569; Mon, 11 Nov 2013 16:47:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rABGlQAK031093; Mon, 11 Nov 2013 16:47:26 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rABGlPb2031090; Mon, 11 Nov 2013 16:47:25 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201311111647.rABGlPb2031090@svn.freebsd.org> From: Mark Felder Date: Mon, 11 Nov 2013 16:47:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333522 - in head/audio/murmur: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 11 Nov 2013 16:47:26 -0000 Author: feld Date: Mon Nov 11 16:47:25 2013 New Revision: 333522 URL: http://svnweb.freebsd.org/changeset/ports/333522 Log: - 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) Deleted: head/audio/murmur/pkg-deinstall head/audio/murmur/pkg-install Modified: head/audio/murmur/Makefile head/audio/murmur/files/murmur.in head/audio/murmur/pkg-plist Modified: head/audio/murmur/Makefile ============================================================================== --- head/audio/murmur/Makefile Mon Nov 11 16:46:41 2013 (r333521) +++ head/audio/murmur/Makefile Mon Nov 11 16:47:25 2013 (r333522) @@ -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 .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 Modified: head/audio/murmur/files/murmur.in ============================================================================== --- head/audio/murmur/files/murmur.in Mon Nov 11 16:46:41 2013 (r333521) +++ head/audio/murmur/files/murmur.in Mon Nov 11 16:47:25 2013 (r333522) @@ -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" Modified: head/audio/murmur/pkg-plist ============================================================================== --- head/audio/murmur/pkg-plist Mon Nov 11 16:46:41 2013 (r333521) +++ head/audio/murmur/pkg-plist Mon Nov 11 16:47:25 2013 (r333522) @@ -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