Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 May 2015 01:40:00 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385437 - head/audio/murmur
Message-ID:  <201505050140.t451e0sN033338@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Tue May  5 01:39:59 2015
New Revision: 385437
URL: https://svnweb.freebsd.org/changeset/ports/385437

Log:
  Disable pch to fix building with gcc
  Add LICENSE
  Unmute some of the installation steps

Modified:
  head/audio/murmur/Makefile

Modified: head/audio/murmur/Makefile
==============================================================================
--- head/audio/murmur/Makefile	Tue May  5 00:15:09 2015	(r385436)
+++ head/audio/murmur/Makefile	Tue May  5 01:39:59 2015	(r385437)
@@ -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 <bsd.port.pre.mk>
+# 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 <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505050140.t451e0sN033338>