Date: Tue, 3 Jan 2017 13:09:48 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430464 - in head/audio/murmur: . files Message-ID: <201701031309.v03D9mJv092326@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jan 3 13:09:48 2017 New Revision: 430464 URL: https://svnweb.freebsd.org/changeset/ports/430464 Log: - 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 Deleted: head/audio/murmur/files/FreeBSD9-patch-src_SSL.cpp Modified: head/audio/murmur/Makefile head/audio/murmur/pkg-plist Modified: head/audio/murmur/Makefile ============================================================================== --- head/audio/murmur/Makefile Tue Jan 3 12:50:18 2017 (r430463) +++ head/audio/murmur/Makefile Tue Jan 3 13:09:48 2017 (r430464) @@ -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> Modified: head/audio/murmur/pkg-plist ============================================================================== --- head/audio/murmur/pkg-plist Tue Jan 3 12:50:18 2017 (r430463) +++ head/audio/murmur/pkg-plist Tue Jan 3 13:09:48 2017 (r430464) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701031309.v03D9mJv092326>