Index: head/audio/murmur/Makefile
===================================================================
--- head/audio/murmur/Makefile	(revision 430463)
+++ head/audio/murmur/Makefile	(revision 430464)
@@ -1,90 +1,87 @@
 # Created by: Ayumi M <ayu@commun.jp>
 # $FreeBSD$
 
 PORTNAME=	murmur
 PORTVERSION=	1.2.10
 PORTREVISION=	3
 CATEGORIES=	audio net
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Murmur is the server component of Mumble
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USERS=		murmur
 GROUPS=		murmur
 USES=		compiler:c++11-lang qmake pkgconfig
 USE_QT4=	moc_build corelib network xml sql sql-sqlite3_run
 
 USE_OPENSSL=	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 <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICE}
 LIB_DEPENDS+=	libIce.so: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:net/mDNSResponder
 .else
 CONFIG+=	no-bonjour
 .endif
 
 .include <bsd.port.pre.mk>
 # PCH is broken on GCC
 .if ${CHOSEN_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
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in CHANGES INSTALL README README.Linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
Index: head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp
===================================================================
--- head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp	(revision 430463)
+++ head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- src/SSL.cpp.orig	2015-11-20 16:02:09 UTC
-+++ src/SSL.cpp
-@@ -43,7 +43,7 @@ QList<QSslCipher> 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
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/audio/murmur/pkg-plist
===================================================================
--- head/audio/murmur/pkg-plist	(revision 430463)
+++ head/audio/murmur/pkg-plist	(revision 430464)
@@ -1,8 +1,7 @@
 @sample etc/murmur.ini.sample
 man/man1/murmurd.1.gz
 sbin/murmurd
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.Linux