Attachment #102161 for bug #141885




#

PORTNAME=	murmur
PORTVERSION=	1.2.0
PORTREVISION=	1
CATEGORIES=	audio net
MASTER_SITES=	SF/mumble/Mumble/${PORTVERSION}
DISTNAME=	mumble-${PORTVERSION}


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

USE_RC_SUBR=	murmur

OPTIONS=	ICE "Ice Support" on \
		DBUS "D-Bus Support" off \
		BONJOUR "Bonjour Support" on

.include <bsd.port.pre.mk>


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}"

	@${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}/sbin
	@${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${PREFIX}/etc
	${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1
.if !defined(NOPORTDOCS)

Lines 1-3 Link Here

(-)/usr/ports/audio/murmur/distinfo (-3 / +3 lines)
1	MD5 (mumble-1.1.8.tar.gz) = a7da012922d39b87c45d9f481d4b5efb	1	MD5 (mumble-1.2.0.tar.gz) = 25872328c8bbc8282ad7ebdeacc0e8b6
2	SHA256 (mumble-1.1.8.tar.gz) = 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856	2	SHA256 (mumble-1.2.0.tar.gz) = 5dcb2cea481b19cefb57c6e4f6379c0678ecdba16fb0e49b243868b8e382dd87
3	SIZE (mumble-1.1.8.tar.gz) = 1241365	3	SIZE (mumble-1.2.0.tar.gz) = 2838243




--- 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
 	}
 

Lines 21-27 Link Here

(-)/usr/ports/audio/murmur/files/murmur.in (-1 / +1 lines)
21	name=murmur	21	name=murmur
22	rcvar=${name}_enable	22	rcvar=${name}_enable
23		23
24	command="%%PREFIX%%/bin/murmurd"	24	command="%%PREFIX%%/sbin/murmurd"
25	command_args="-ini %%PREFIX%%/etc/murmur.ini"	25	command_args="-ini %%PREFIX%%/etc/murmur.ini"
26	pidfile="/var/run/murmur/murmur.pid"	26	pidfile="/var/run/murmur/murmur.pid"
27		27




--- 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
 		QMAKE_LFLAGS *= -Wl,--as-needed
 	}

Lines 1-11 Link Here

(-)/usr/ports/audio/murmur/files/patch-src__CryptState.cpp (-11 lines)
1	--- src/CryptState.cpp.orig 2009-10-11 19:53:49.525380171 -0400
2	+++ src/CryptState.cpp 2009-10-11 19:54:36.401622290 -0400
3	@@ -187,7 +187,7 @@
4	#define SHIFTBITS 63
5	typedef quint64 subblock;
6
7	-#if __BYTE_ORDER == __BIG_ENDIAN
8	+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
9	#define SWAPPED(x) (x)
10	#else
11	#ifdef __x86_64__

Lines 1-10 Link Here

(-)/usr/ports/audio/murmur/files/patch-src__murmur__murmur_pch.h (-10 lines)
1	--- src/murmur/murmur_pch.h.orig 2009-08-04 21:37:28.000000000 +0900
2	+++ src/murmur/murmur_pch.h 2009-08-04 21:38:17.000000000 +0900
3	@@ -74,7 +74,6 @@
4	#define ALLOCA(x) _alloca(x)
5	#define snprintf ::_snprintf
6	#else
7	-#include <alloca.h>
8	#define ALLOCA(x) alloca(x)
9	#endif
10	#if defined (Q_CC_GNU) \|\| (defined (Q_CC_INTEL) && !defined (Q_OS_WIN))

Lines 3-8 Link Here

(-)/usr/ports/audio/murmur/pkg-plist (-1 / +1 lines)
3	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	3	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
4	%%PORTDOCS%%%%DOCSDIR%%/README	4	%%PORTDOCS%%%%DOCSDIR%%/README
5	%%PORTDOCS%%%%DOCSDIR%%/README.Linux	5	%%PORTDOCS%%%%DOCSDIR%%/README.Linux
6	bin/murmurd	6	sbin/murmurd
7	etc/murmur.ini	7	etc/murmur.ini
8	%%PORTDOCS%%@dirrm %%DOCSDIR%%	8	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 141885

Lines 6-13 Link Here

(-)/usr/ports/audio/murmur/Makefile (-4 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= murmur	8	PORTNAME= murmur
9	PORTVERSION= 1.1.8	9	PORTVERSION= 1.2.0
10	PORTREVISION= 1
11	CATEGORIES= audio net	10	CATEGORIES= audio net
12	MASTER_SITES= SF/mumble/Mumble/${PORTVERSION}	11	MASTER_SITES= SF/mumble/Mumble/${PORTVERSION}
13	DISTNAME= mumble-${PORTVERSION}	12	DISTNAME= mumble-${PORTVERSION}
Lines 17-22 Link Here
17		16
18	BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs	17	BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
19	RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin	18	RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
		19	LIB_DEPENDS= protobuf.4:${PORTSDIR}/devel/protobuf
20		20
21	USE_QT_VER= 4	21	USE_QT_VER= 4
22	QT_COMPONENTS= qmake_build moc_build corelib network xml sql	22	QT_COMPONENTS= qmake_build moc_build corelib network xml sql
Lines 28-34 Link Here
28	USE_RC_SUBR= murmur	28	USE_RC_SUBR= murmur
29		29
30	OPTIONS= ICE "Ice Support" on \	30	OPTIONS= ICE "Ice Support" on \
31	DBUS "D-Bus Support" off	31	DBUS "D-Bus Support" off \
		32	BONJOUR "Bonjour Support" on
32		33
33	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
34		35
Lines 44-49 Link Here
44	CONFIG+= no-dbus	45	CONFIG+= no-dbus
45	.endif	46	.endif
46		47
		48	.if defined(WITH_BONJOUR)
		49	LIB_DEPENDS+= dns_sd.1:${PORTSDIR}/net/mDNSResponder
		50	.else
		51	CONFIG+= no-bonjour
		52	.endif
		53
		54	post-patch:
		55	.if ${OSVERSION} < 700000
		56	@cd ${WRKSRC} && ${PATCH} -p < ${PATCHDIR}/freebsd6-patch-compiler.pri
		57	.endif
		58
47	do-configure:	59	do-configure:
48	@cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \	60	@cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \
49	${QMAKE} -unix PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"	61	${QMAKE} -unix PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
Lines 55-63 Link Here
55	@${SED} -i '' -e 's\|database=.*\|database=/var/db/murmur/murmur.sqlite\|' ${WRKSRC}/scripts/murmur.ini	67	@${SED} -i '' -e 's\|database=.*\|database=/var/db/murmur/murmur.sqlite\|' ${WRKSRC}/scripts/murmur.ini
56	@${SED} -i '' -e 's\|#pidfile=.*\|pidfile=/var/run/murmur/murmur.pid\|' ${WRKSRC}/scripts/murmur.ini	68	@${SED} -i '' -e 's\|#pidfile=.*\|pidfile=/var/run/murmur/murmur.pid\|' ${WRKSRC}/scripts/murmur.ini
57	@${SED} -i '' -e 's\|#logfile=.*\|logfile=/var/log/murmur/murmur.log\|' ${WRKSRC}/scripts/murmur.ini	69	@${SED} -i '' -e 's\|#logfile=.*\|logfile=/var/log/murmur/murmur.log\|' ${WRKSRC}/scripts/murmur.ini
		70	@${SED} -i '' -e 's\|#host=.*\|host=0.0.0.0\|' ${WRKSRC}/scripts/murmur.ini
58		71
59	do-install:	72	do-install:
60	@${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${PREFIX}/bin	73	@${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${PREFIX}/sbin
61	@${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${PREFIX}/etc	74	@${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${PREFIX}/etc
62	${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1	75	${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1
63	.if !defined(NOPORTDOCS)	76	.if !defined(NOPORTDOCS)

Line 0 Link Here

(-)/usr/ports/audio/murmur/files/freebsd6-patch-compiler.pri (+24 lines)
	1	--- compiler.pri.orig 2009-12-22 02:30:07.000000000 +0900
	2	+++ compiler.pri 2009-12-22 02:30:54.000000000 +0900
	3	@@ -68,8 +68,8 @@
	4
	5	unix {
	6	DEFINES *= RESTRICT=__restrict__
	7	- QMAKE_CFLAGS *= -Wfatal-errors -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden
	8	- QMAKE_CXXFLAGS *= -Wfatal-errors -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden
	9	+ QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare
	10	+ QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare
	11
	12	CONFIG(opt-gcc) {
	13	QMAKE_CC = /opt/gcc/bin/gcc
	14	@@ -91,8 +91,8 @@
	15
	16	unix:!macx {
	17	CONFIG(debug, debug\|release) {
	18	- QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
	19	- QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie
	20	+ QMAKE_CFLAGS *= -fPIE -pie
	21	+ QMAKE_CXXFLAGS *= -fPIE -pie
	22	QMAKE_LFLAGS = -Wl
	23	}
	24

Lines 1-13 Link Here

(-)/usr/ports/audio/murmur/files/patch-compiler.pri (-13 / +11 lines)
1	--- compiler.pri.orig 2009-10-11 19:53:12.543346333 -0400	1	--- compiler.pri.orig 2009-12-11 03:05:44.000000000 +0900
2	+++ compiler.pri 2009-10-11 19:53:37.105373152 -0400	2	+++ compiler.pri 2009-12-22 02:29:38.000000000 +0900
3	@@ -46,8 +46,8 @@	3	@@ -93,7 +93,7 @@
4	QMAKE_LINK = /opt/gcc/bin/g++	4	CONFIG(debug, debug\|release) {
5	}	5	QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
6		6	QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie
7	- QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden	7	- QMAKE_LFLAGS = -Wl,--no-add-needed
8	- QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden	8	+ QMAKE_LFLAGS = -Wl
9	+ QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare	9	}
10	+ QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare	10
11	!macx {	11	DEFINES *= _FORTIFY_SOURCE=2
12	QMAKE_LFLAGS *= -Wl,--as-needed
13	}