Index: head/audio/murmur/Makefile =================================================================== --- head/audio/murmur/Makefile (revision 402102) +++ head/audio/murmur/Makefile (revision 402103) @@ -1,87 +1,91 @@ # Created by: Ayumi M # $FreeBSD$ PORTNAME= murmur PORTVERSION= 1.2.10 +PORTREVISION= 1 CATEGORIES= audio net 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= compiler qmake pkgconfig +USES= compiler:c++11-lang qmake pkgconfig USE_QT4= moc_build corelib network xml sql sql-sqlite3_run USE_OPENSSL= YES -WITH_OPENSSL_PORT= YES USE_GITHUB= YES GH_ACCOUNT= mumble-voip GH_PROJECT= mumble CONFIG= no-client QMAKE_ARGS= "CONFIG+=${CONFIG}" USE_RC_SUBR= murmur SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" OPTIONS_DEFINE= ICE DBUS BONJOUR DOCS OPTIONS_DEFAULT= BONJOUR ICE_DESC= Ice Support BONJOUR_DESC= Bonjour Support .include .if ${PORT_OPTIONS:MICE} LIB_DEPENDS+= libIce.so:${PORTSDIR}/devel/ice .else CONFIG+= no-ice .endif .if ${PORT_OPTIONS:MDBUS} USE_QT4+= dbus .else CONFIG+= no-dbus .endif .if ${PORT_OPTIONS:MBONJOUR} LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder .else CONFIG+= no-bonjour .endif .include # PCH is broken on GCC .if ${COMPILER_TYPE} == gcc CONFIG+= no-pch +.endif + +.if ${OSVERSION} < 1000510 +EXTRA_PATCHES= ${FILESDIR}/FreeBSD9-patch-src_SSL.cpp .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 do-install: ${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} .for f in CHANGES INSTALL LICENSE README README.Linux ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp =================================================================== --- head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp (nonexistent) +++ head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp (revision 402103) @@ -0,0 +1,11 @@ +--- src/SSL.cpp.orig 2015-11-20 16:02:09 UTC ++++ src/SSL.cpp +@@ -43,7 +43,7 @@ QList MumbleSSL::ciphersFrom + + SSL_CTX *ctx = NULL; + SSL *ssl = NULL; +- const SSL_METHOD *meth = NULL; ++ SSL_METHOD *meth = NULL; + int i = 0; + + QByteArray csbuf = cipherString.toLatin1(); Property changes on: head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/murmur/files/patch-src_mumble.pri =================================================================== --- head/audio/murmur/files/patch-src_mumble.pri (revision 402102) +++ head/audio/murmur/files/patch-src_mumble.pri (revision 402103) @@ -1,15 +1,11 @@ ---- src/mumble.pri.orig 2015-11-11 21:54:35 UTC +--- src/mumble.pri.orig 2015-07-09 13:23:46 UTC +++ src/mumble.pri -@@ -53,11 +53,7 @@ unix { - CONFIG *= link_pkgconfig +@@ -54,7 +54,7 @@ unix { LIBS *= -lprotobuf -- contains(UNAME, FreeBSD) { + contains(UNAME, FreeBSD) { - LIBS *= -lcrypto -- } else { -- PKGCONFIG *= openssl -- } -+ PKGCONFIG *= openssl - } - - QMAKE_EXTRA_COMPILERS *= pb pbh ++ LIBS *= -lcrypto -lssl + } else { + PKGCONFIG *= openssl + }