diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2017-01-03 21:09:48 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2017-01-03 21:09:48 +0800 |
| commit | 614681a0478d77ff95eb5fc1d8b84bb2dfbe9cb1 (patch) | |
| tree | 810cd74ff6f0b6b5d2f56da867776278e00da4bf /audio | |
| parent | 949eef8a7e45ca2fd0a35f019efbe44357816926 (diff) | |
| download | freebsd-ports-gnome-614681a0478d77ff95eb5fc1d8b84bb2dfbe9cb1.tar.gz freebsd-ports-gnome-614681a0478d77ff95eb5fc1d8b84bb2dfbe9cb1.tar.zst freebsd-ports-gnome-614681a0478d77ff95eb5fc1d8b84bb2dfbe9cb1.zip | |
- Remove always-false condition and corresponding optional patch
- Add LICENSE_FILE
- Don't install LICENSE with docs
- Switch to options helpers
Approved by: portmgr blanket
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/murmur/Makefile | 13 | ||||
| -rw-r--r-- | audio/murmur/files/FreeBSD9-patch-src_SSL.cpp | 11 | ||||
| -rw-r--r-- | audio/murmur/pkg-plist | 1 |
3 files changed, 5 insertions, 20 deletions
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index 3bc108ea7377..3e12ba29a5b8 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -10,6 +10,7 @@ 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 @@ -62,10 +63,6 @@ CONFIG+= no-bonjour 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 @@ -80,11 +77,11 @@ do-install: ${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> diff --git a/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp b/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp deleted file mode 100644 index acb5e6337c5f..000000000000 --- a/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp +++ /dev/null @@ -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(); diff --git a/audio/murmur/pkg-plist b/audio/murmur/pkg-plist index ce65640131d5..b51a61c72389 100644 --- a/audio/murmur/pkg-plist +++ b/audio/murmur/pkg-plist @@ -3,6 +3,5 @@ man/man1/murmurd.1.gz sbin/murmurd %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.Linux |