Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Oct 2014 14:00:09 +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: r370172 - head/games/magicmaze
Message-ID:  <201410061400.s96E098f098344@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Oct  6 14:00:09 2014
New Revision: 370172
URL: https://svnweb.freebsd.org/changeset/ports/370172
QAT: https://qat.redports.org/buildarchive/r370172/

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Simplify docs installation

Modified:
  head/games/magicmaze/Makefile
  head/games/magicmaze/pkg-plist

Modified: head/games/magicmaze/Makefile
==============================================================================
--- head/games/magicmaze/Makefile	Mon Oct  6 13:45:10 2014	(r370171)
+++ head/games/magicmaze/Makefile	Mon Oct  6 14:00:09 2014	(r370172)
@@ -11,7 +11,9 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:S/./
 MAINTAINER=	games@FreeBSD.org
 COMMENT=	Simple and low-tech monster-bashing maze game
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 RUBY
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING_GPL.txt
 
 RUN_DEPENDS=	ruby${RUBY_SUFFIX}-sdl>=0:${PORTSDIR}/devel/ruby-sdl
 
@@ -25,13 +27,6 @@ NO_BUILD=	yes
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	README.TXT
-
-DOCSRCDIR2=	${WRKSRC}/doc
-DOCSDIR2=	${DOCSDIR}/doc
-DOC_FILES2=	BUGS.TXT
-
 OPTIONS_DEFINE=	DOCS
 
 SUB_FILES=	${PORTNAME}
@@ -47,9 +42,7 @@ do-install:
 
 	${LN} -sf ${DATADIR}/data/gfx/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "README.TXT doc/BUGS.TXT" \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/magicmaze/pkg-plist
==============================================================================
--- head/games/magicmaze/pkg-plist	Mon Oct  6 13:45:10 2014	(r370171)
+++ head/games/magicmaze/pkg-plist	Mon Oct  6 14:00:09 2014	(r370172)
@@ -51,9 +51,3 @@ bin/magicmaze
 %%DATADIR%%/mm.rb
 %%DATADIR%%/testmm.rb
 share/pixmaps/magicmaze.png
-@dirrm %%DATADIR%%/magicmaze
-@dirrm %%DATADIR%%/data/sound
-@dirrm %%DATADIR%%/data/maps
-@dirrm %%DATADIR%%/data/gfx
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410061400.s96E098f098344>