From owner-svn-ports-all@FreeBSD.ORG Fri Oct 31 20:02:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2B669CA; Fri, 31 Oct 2014 20:02:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8EC4FA25; Fri, 31 Oct 2014 20:02:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VK29GD031349; Fri, 31 Oct 2014 20:02:09 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VK290K031347; Fri, 31 Oct 2014 20:02:09 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410312002.s9VK290K031347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 31 Oct 2014 20:02:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371930 - head/games/tinymux X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2014 20:02:09 -0000 Author: amdmi3 Date: Fri Oct 31 20:02:08 2014 New Revision: 371930 URL: https://svnweb.freebsd.org/changeset/ports/371930 QAT: https://qat.redports.org/buildarchive/r371930/ Log: - Fix LICENSE - Simplify docs installation - Use @sample - Drop @dirrm* from plist Modified: head/games/tinymux/Makefile head/games/tinymux/pkg-plist Modified: head/games/tinymux/Makefile ============================================================================== --- head/games/tinymux/Makefile Fri Oct 31 20:02:06 2014 (r371929) +++ head/games/tinymux/Makefile Fri Oct 31 20:02:08 2014 (r371930) @@ -10,7 +10,8 @@ DISTNAME= mux-${PORTVERSION}.unix MAINTAINER= ports@FreeBSD.org COMMENT= Multi-Player FreeForm adventure Program -LICENSE= GPLv3 +LICENSE= ART10 +LICENSE_FILE= ${WRKSRC}/copyright.h WRKSRC= ${WRKDIR}/mux2.10/src @@ -25,16 +26,7 @@ PATCHLEVEL= 12 PORTDOCS= * -DOCSRCDIR1= ${WRKSRC}/.. -DOC_FILES1= ATTACK CHANGES MODULES NOTES README REALITY REALITY.SETUP SGP \ - SQL SSL - -DOCSRCDIR2= ${WRKSRC}/../docs -DOCSDIR2= ${DOCSDIR}/docs -DOC_FILES2= * - OPTIONS_DEFINE= DOCS FIRANMUX MEMORY_BASED REALITY_LVLS SELFCHECK SSL WOD_REALMS - OPTIONS_DEFAULT= ASYNCHRONOUS_SQL SSL REALITY_LVLS WOD_REALMS OPTIONS_SUB= yes @@ -110,8 +102,8 @@ do-install: ${STAGEDIR}${DATADIR} .endfor - @${MKDIR} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} + cd ${WRKSRC}/.. && ${COPYTREE_SHARE} \ + "ATTACK CHANGES MODULES NOTES README REALITY REALITY.SETUP SGP SQL SSL docs" \ + ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/tinymux/pkg-plist ============================================================================== --- head/games/tinymux/pkg-plist Fri Oct 31 20:02:06 2014 (r371929) +++ head/games/tinymux/pkg-plist Fri Oct 31 20:02:08 2014 (r371930) @@ -1,20 +1,10 @@ bin/dbconvert bin/tinymux -@unexec if cmp -s %D/etc/tinymux/alias.conf %D/etc/tinymux/alias.conf.sample; then rm -f %D/etc/tinymux/alias.conf; fi -etc/tinymux/alias.conf.sample -@exec if [ ! -f %D/etc/tinymux/alias.conf ] ; then cp -p %D/%F %B/alias.conf; fi -@unexec if cmp -s %D/etc/tinymux/compat.conf %D/etc/tinymux/compat.conf.sample; then rm -f %D/etc/tinymux/compat.conf; fi -etc/tinymux/compat.conf.sample -@exec if [ ! -f %D/etc/tinymux/compat.conf ] ; then cp -p %D/%F %B/compat.conf; fi -@unexec if cmp -s %D/etc/tinymux/mux.config %D/etc/tinymux/mux.config.sample; then rm -f %D/etc/tinymux/mux.config; fi -etc/tinymux/mux.config.sample -@exec if [ ! -f %D/etc/tinymux/mux.config ] ; then cp -p %D/%F %B/mux.config; fi -%%SSL%%@unexec if cmp -s %D/etc/tinymux/muxssl.conf %D/etc/tinymux/muxssl.conf.sample; then rm -f %D/etc/tinymux/muxssl.conf; fi -%%SSL%%etc/tinymux/muxssl.conf.sample -%%SSL%%@exec if [ ! -f %D/etc/tinymux/muxssl.conf ] ; then cp -p %D/%F %B/muxssl.conf; fi -@unexec if cmp -s %D/etc/tinymux/netmux.conf %D/etc/tinymux/netmux.conf.sample; then rm -f %D/etc/tinymux/netmux.conf; fi -etc/tinymux/netmux.conf.sample -@exec if [ ! -f %D/etc/tinymux/netmux.conf ] ; then cp -p %D/%F %B/netmux.conf; fi +@sample etc/tinymux/alias.conf.sample +@sample etc/tinymux/compat.conf.sample +@sample etc/tinymux/mux.config.sample +%%SSL%%@sample etc/tinymux/muxssl.conf.sample +@sample etc/tinymux/netmux.conf.sample lib/libmux.so sbin/netmux sbin/slave @@ -42,7 +32,3 @@ sbin/slave %%DATADIR%%/text/wizhelp.txt %%DATADIR%%/text/wizmotd.txt %%DATADIR%%/text/wiznews.txt -@dirrm %%DATADIR%%/text -@dirrmtry %%DATADIR%%/data -@dirrmtry %%DATADIR%% -@dirrmtry etc/tinymux