From owner-svn-ports-head@freebsd.org Tue Jan 3 13:09:50 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 295A0C9B4E1; Tue, 3 Jan 2017 13:09:50 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3A551A8E; Tue, 3 Jan 2017 13:09:49 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03D9ng3092328; Tue, 3 Jan 2017 13:09:49 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03D9mJv092326; Tue, 3 Jan 2017 13:09:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701031309.v03D9mJv092326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Jan 2017 13:09:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430464 - in head/audio/murmur: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2017 13:09:50 -0000 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 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