Date: Tue, 22 Dec 2009 19:26:44 +0900 (JST) From: Ayumi Mitsui <ayu@commun.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/141885: [MAINTAINER] audio/murmur: update to 1.2.0 Message-ID: <20091222102644.71C323BCDF@dahlia.commun.jp> Resent-Message-ID: <200912221030.nBMAU6tK026389@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141885 >Category: ports >Synopsis: [MAINTAINER] audio/murmur: update to 1.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 22 10:30:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Ayumi Mitsui >Release: FreeBSD 7.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD dahlia.commun.jp 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May 1 07:18:07 UTC >Description: - Update to 1.2.0 Added file(s): - files/freebsd6-patch-compiler.pri Removed file(s): - files/patch-src__CryptState.cpp - files/patch-src__murmur__murmur_pch.h Tested with Tinderbox http://tb-amd64.commun.jp/index.php?action=describe_port&id=1 http://tb-i386.commun.jp/index.php?action=describe_port&id=3 Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- murmur-1.2.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/Makefile /usr/ports/audio/murmur/Makefile --- /usr/ports/audio/murmur-1.1.8_1/Makefile 2009-12-13 11:51:02.000000000 +0900 +++ /usr/ports/audio/murmur/Makefile 2009-12-22 02:46:53.000000000 +0900 @@ -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,6 +16,7 @@ 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 @@ -28,7 +28,8 @@ 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,6 +45,17 @@ 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} -p < ${PATCHDIR}/freebsd6-patch-compiler.pri +.endif + do-configure: @cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \ ${QMAKE} -unix PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" @@ -55,9 +67,10 @@ @${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 -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/distinfo /usr/ports/audio/murmur/distinfo --- /usr/ports/audio/murmur-1.1.8_1/distinfo 2009-12-13 11:51:02.000000000 +0900 +++ /usr/ports/audio/murmur/distinfo 2009-12-13 11:55:58.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/files/freebsd6-patch-compiler.pri /usr/ports/audio/murmur/files/freebsd6-patch-compiler.pri --- /usr/ports/audio/murmur-1.1.8_1/files/freebsd6-patch-compiler.pri 1970-01-01 09:00:00.000000000 +0900 +++ /usr/ports/audio/murmur/files/freebsd6-patch-compiler.pri 2009-12-22 02:31:10.000000000 +0900 @@ -0,0 +1,24 @@ +--- compiler.pri.orig 2009-12-22 02:30:07.000000000 +0900 ++++ compiler.pri 2009-12-22 02:30:54.000000000 +0900 +@@ -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 -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/files/patch-compiler.pri /usr/ports/audio/murmur/files/patch-compiler.pri --- /usr/ports/audio/murmur-1.1.8_1/files/patch-compiler.pri 2009-12-13 11:51:02.000000000 +0900 +++ /usr/ports/audio/murmur/files/patch-compiler.pri 2009-12-22 02:29:43.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/files/patch-src__CryptState.cpp /usr/ports/audio/murmur/files/patch-src__CryptState.cpp --- /usr/ports/audio/murmur-1.1.8_1/files/patch-src__CryptState.cpp 2009-12-13 11:51:02.000000000 +0900 +++ /usr/ports/audio/murmur/files/patch-src__CryptState.cpp 1970-01-01 09:00:00.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/files/patch-src__murmur__murmur_pch.h /usr/ports/audio/murmur/files/patch-src__murmur__murmur_pch.h --- /usr/ports/audio/murmur-1.1.8_1/files/patch-src__murmur__murmur_pch.h 2009-12-13 11:51:02.000000000 +0900 +++ /usr/ports/audio/murmur/files/patch-src__murmur__murmur_pch.h 1970-01-01 09:00:00.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/audio/murmur-1.1.8_1/pkg-plist /usr/ports/audio/murmur/pkg-plist --- /usr/ports/audio/murmur-1.1.8_1/pkg-plist 2009-12-13 11:51:02.000000000 +0900 +++ /usr/ports/audio/murmur/pkg-plist 2009-12-21 20:36:56.000000000 +0900 @@ -3,6 +3,6 @@ %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.Linux -bin/murmurd +sbin/murmurd etc/murmur.ini %%PORTDOCS%%@dirrm %%DOCSDIR%% --- murmur-1.2.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091222102644.71C323BCDF>