svn commit: r371930 - head/games/tinymux

[Dmitry Marakasov]

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 at 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 <bsd.port.mk>

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
- at 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
- at exec if [ ! -f %D/etc/tinymux/alias.conf ] ; then cp -p %D/%F %B/alias.conf; fi
- at 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
- at exec if [ ! -f %D/etc/tinymux/compat.conf ] ; then cp -p %D/%F %B/compat.conf; fi
- at 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
- at 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
- at 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
- at exec if [ ! -f %D/etc/tinymux/netmux.conf ] ; then cp -p %D/%F %B/netmux.conf; fi
+ at sample etc/tinymux/alias.conf.sample
+ at sample etc/tinymux/compat.conf.sample
+ at sample etc/tinymux/mux.config.sample
+%%SSL%%@sample etc/tinymux/muxssl.conf.sample
+ at 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
- at dirrm %%DATADIR%%/text
- at dirrmtry %%DATADIR%%/data
- at dirrmtry %%DATADIR%%
- at dirrmtry etc/tinymux