diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2010-01-12 18:26:26 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2010-01-12 18:26:26 +0000 |
commit | 04aadba0db366a3cba11645da5a67c48c3dbf2c4 (patch) | |
tree | df27f2ba54a2ced0becd793199fa38e487388a8d | |
parent | a44f4c111219c50c6d1c33030927fd1e99405249 (diff) | |
download | ports-04aadba0db366a3cba11645da5a67c48c3dbf2c4.tar.gz ports-04aadba0db366a3cba11645da5a67c48c3dbf2c4.zip |
- Update to 1.2.0
PR: 141885
Submitted by: Ayumi Mitsui <ayu@commun.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=247723
-rw-r--r-- | audio/murmur/Makefile | 27 | ||||
-rw-r--r-- | audio/murmur/distinfo | 6 | ||||
-rw-r--r-- | audio/murmur/files/freebsd6-patch-compiler.pri | 24 | ||||
-rw-r--r-- | audio/murmur/files/murmur.in | 2 | ||||
-rw-r--r-- | audio/murmur/files/patch-compiler.pri | 24 | ||||
-rw-r--r-- | audio/murmur/files/patch-src__CryptState.cpp | 11 | ||||
-rw-r--r-- | audio/murmur/files/patch-src__murmur__murmur_pch.h | 10 | ||||
-rw-r--r-- | audio/murmur/pkg-plist | 2 |
8 files changed, 61 insertions, 45 deletions
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index ece82e1f427a..2c2bf822eba2 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -6,8 +6,7 @@ # PORTNAME= murmur -PORTVERSION= 1.1.8 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= audio net MASTER_SITES= SF/mumble/Mumble/${PORTVERSION} DISTNAME= mumble-${PORTVERSION} @@ -17,10 +16,10 @@ COMMENT= Murmur is the server component of Mumble BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin +LIB_DEPENDS= protobuf.4:${PORTSDIR}/devel/protobuf USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib network xml sql -HAS_CONFIGURE= yes CONFIG= no-client @@ -28,7 +27,8 @@ MAN1= murmurd.1 USE_RC_SUBR= murmur OPTIONS= ICE "Ice Support" on \ - DBUS "D-Bus Support" off + DBUS "D-Bus Support" off \ + BONJOUR "Bonjour Support" on .include <bsd.port.pre.mk> @@ -44,9 +44,23 @@ QT_COMPONENTS+= dbus CONFIG+= no-dbus .endif +.if defined(WITH_BONJOUR) +LIB_DEPENDS+= dns_sd.1:${PORTSDIR}/net/mDNSResponder +.else +CONFIG+= no-bonjour +.endif + +post-patch: +.if ${OSVERSION} < 700000 + @cd ${WRKSRC} && ${PATCH} -sp < ${PATCHDIR}/freebsd6-patch-compiler.pri +.endif +.if ${OSVERSION} >= 800000 + @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro +.endif + do-configure: @cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \ - ${QMAKE} -unix PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" + ${QMAKE} -unix PREFIX=${PREFIX} ${QMAKEFLAGS} main.pro "CONFIG+=${CONFIG}" pre-su-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -55,9 +69,10 @@ 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 ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${PREFIX}/sbin @${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) diff --git a/audio/murmur/distinfo b/audio/murmur/distinfo index ec1b8c8c3638..bf20cfaa3876 100644 --- a/audio/murmur/distinfo +++ b/audio/murmur/distinfo @@ -1,3 +1,3 @@ -MD5 (mumble-1.1.8.tar.gz) = a7da012922d39b87c45d9f481d4b5efb -SHA256 (mumble-1.1.8.tar.gz) = 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856 -SIZE (mumble-1.1.8.tar.gz) = 1241365 +MD5 (mumble-1.2.0.tar.gz) = 25872328c8bbc8282ad7ebdeacc0e8b6 +SHA256 (mumble-1.2.0.tar.gz) = 5dcb2cea481b19cefb57c6e4f6379c0678ecdba16fb0e49b243868b8e382dd87 +SIZE (mumble-1.2.0.tar.gz) = 2838243 diff --git a/audio/murmur/files/freebsd6-patch-compiler.pri b/audio/murmur/files/freebsd6-patch-compiler.pri new file mode 100644 index 000000000000..a453045200da --- /dev/null +++ b/audio/murmur/files/freebsd6-patch-compiler.pri @@ -0,0 +1,24 @@ +--- compiler.pri.orig 2009-12-10 21:05:44.000000000 +0300 ++++ compiler.pri 2009-12-23 03:50:17.000000000 +0300 +@@ -68,8 +68,8 @@ + + unix { + DEFINES *= RESTRICT=__restrict__ +- QMAKE_CFLAGS *= -Wfatal-errors -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden +- QMAKE_CXXFLAGS *= -Wfatal-errors -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden ++ QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare ++ QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare + + CONFIG(opt-gcc) { + QMAKE_CC = /opt/gcc/bin/gcc +@@ -91,8 +91,8 @@ + + unix:!macx { + CONFIG(debug, debug|release) { +- QMAKE_CFLAGS *= -fstack-protector -fPIE -pie +- QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie ++ QMAKE_CFLAGS *= -fPIE -pie ++ QMAKE_CXXFLAGS *= -fPIE -pie + QMAKE_LFLAGS = -Wl + } + diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in index 31b8e39f8e30..e5a9c2565c17 100644 --- a/audio/murmur/files/murmur.in +++ b/audio/murmur/files/murmur.in @@ -21,7 +21,7 @@ murmur_user=${murmur_user:-"murmur"} name=murmur rcvar=${name}_enable -command="%%PREFIX%%/bin/murmurd" +command="%%PREFIX%%/sbin/murmurd" command_args="-ini %%PREFIX%%/etc/murmur.ini" pidfile="/var/run/murmur/murmur.pid" diff --git a/audio/murmur/files/patch-compiler.pri b/audio/murmur/files/patch-compiler.pri index 7689d548a70c..d76d9c4dbc0b 100644 --- a/audio/murmur/files/patch-compiler.pri +++ b/audio/murmur/files/patch-compiler.pri @@ -1,13 +1,11 @@ ---- compiler.pri.orig 2009-10-11 19:53:12.543346333 -0400 -+++ compiler.pri 2009-10-11 19:53:37.105373152 -0400 -@@ -46,8 +46,8 @@ - QMAKE_LINK = /opt/gcc/bin/g++
- }
-
-- QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden
-- QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden
-+ QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare
-+ QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare
- !macx {
- QMAKE_LFLAGS *= -Wl,--as-needed
- }
+--- compiler.pri.orig 2009-12-11 03:05:44.000000000 +0900 ++++ compiler.pri 2009-12-22 02:29:38.000000000 +0900 +@@ -93,7 +93,7 @@ + CONFIG(debug, debug|release) { + QMAKE_CFLAGS *= -fstack-protector -fPIE -pie + QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie +- QMAKE_LFLAGS = -Wl,--no-add-needed ++ QMAKE_LFLAGS = -Wl + } + + DEFINES *= _FORTIFY_SOURCE=2 diff --git a/audio/murmur/files/patch-src__CryptState.cpp b/audio/murmur/files/patch-src__CryptState.cpp deleted file mode 100644 index dea58d81df24..000000000000 --- a/audio/murmur/files/patch-src__CryptState.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CryptState.cpp.orig 2009-10-11 19:53:49.525380171 -0400 -+++ src/CryptState.cpp 2009-10-11 19:54:36.401622290 -0400 -@@ -187,7 +187,7 @@ - #define SHIFTBITS 63 - typedef quint64 subblock; - --#if __BYTE_ORDER == __BIG_ENDIAN -+#if Q_BYTE_ORDER == Q_BIG_ENDIAN - #define SWAPPED(x) (x) - #else - #ifdef __x86_64__ diff --git a/audio/murmur/files/patch-src__murmur__murmur_pch.h b/audio/murmur/files/patch-src__murmur__murmur_pch.h deleted file mode 100644 index 828b207d9a3b..000000000000 --- a/audio/murmur/files/patch-src__murmur__murmur_pch.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/murmur/murmur_pch.h.orig 2009-08-04 21:37:28.000000000 +0900 -+++ src/murmur/murmur_pch.h 2009-08-04 21:38:17.000000000 +0900 -@@ -74,7 +74,6 @@ - #define ALLOCA(x) _alloca(x) - #define snprintf ::_snprintf - #else --#include <alloca.h> - #define ALLOCA(x) alloca(x) - #endif - #if defined (Q_CC_GNU) || (defined (Q_CC_INTEL) && !defined (Q_OS_WIN)) diff --git a/audio/murmur/pkg-plist b/audio/murmur/pkg-plist index d6ab51fe66df..92857375971e 100644 --- a/audio/murmur/pkg-plist +++ b/audio/murmur/pkg-plist @@ -3,6 +3,6 @@ %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.Linux -bin/murmurd +sbin/murmurd etc/murmur.ini %%PORTDOCS%%@dirrm %%DOCSDIR%% |