From owner-svn-ports-all@FreeBSD.ORG Tue May 12 14:32:29 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45DC3A88; Tue, 12 May 2015 14:32:29 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 274A81562; Tue, 12 May 2015 14:32:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CEWTXS099144; Tue, 12 May 2015 14:32:29 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CEWTuJ099143; Tue, 12 May 2015 14:32:29 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201505121432.t4CEWTuJ099143@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 12 May 2015 14:32:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386152 - branches/2015Q2/audio/murmur X-SVN-Group: ports-branches 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.20 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: Tue, 12 May 2015 14:32:29 -0000 Author: feld Date: Tue May 12 14:32:28 2015 New Revision: 386152 URL: https://svnweb.freebsd.org/changeset/ports/386152 Log: MFH: r385437 Approved by: portmgr Disable pch to fix building with gcc Add LICENSE Unmute some of the installation steps Modified: branches/2015Q2/audio/murmur/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/audio/murmur/Makefile ============================================================================== --- branches/2015Q2/audio/murmur/Makefile Tue May 12 14:02:17 2015 (r386151) +++ branches/2015Q2/audio/murmur/Makefile Tue May 12 14:32:28 2015 (r386152) @@ -11,12 +11,14 @@ DISTNAME= mumble-${PORTVERSION} MAINTAINER= feld@FreeBSD.org COMMENT= Murmur is the server component of Mumble +LICENSE= BSD3CLAUSE + BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf USERS= murmur GROUPS= murmur -USES= qmake +USES= compiler qmake USE_QT4= moc_build corelib network xml sql sql-sqlite3_run CONFIG= no-client @@ -50,25 +52,31 @@ LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/n CONFIG+= no-bonjour .endif +.include +# PCH is broken on GCC +.if ${COMPILER_TYPE} == gcc +CONFIG+= no-pch +.endif + post-patch: @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro pre-install: - @${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini - @${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini - @${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini - @${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini + ${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini + ${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini + ${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini + ${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin - @${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample + ${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} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in CHANGES INSTALL LICENSE README README.Linux ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif -.include +.include