svn commit: r377855 - head/games/lmarbles

[Dmitry Marakasov]

Author: amdmi3
Date: Sun Jan 25 02:02:53 2015
New Revision: 377855
URL: https://svnweb.freebsd.org/changeset/ports/377855
QAT: https://qat.redports.org/buildarchive/r377855/

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Move highscore to /var/games, use @sample
  - Fix installation from non-root
  - Simplify docs installation

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

Modified: head/games/lmarbles/Makefile
==============================================================================
--- head/games/lmarbles/Makefile	Sun Jan 25 01:41:04 2015	(r377854)
+++ head/games/lmarbles/Makefile	Sun Jan 25 02:02:53 2015	(r377855)
@@ -13,27 +13,21 @@ DISTFILES=	${PORTNAME}-${DISTVERSION}${E
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Atomix-like game of moving marbles in puzzles
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 USE_SDL=	sdl mixer
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${ETCDIR}
+CONFIGURE_ARGS=	--localstatedir=/var/games/${PORTNAME}
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS ChangeLog README README-SDL.txt
-
-DOCSRCDIR2=	${WRKSRC}/src/manual
-DOCSDIR2=	${DOCSDIR}/manual
-DOC_FILES2=	*.jpg *.html
-
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|; \
-	s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \
+		s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-m 666||; \
 		s|lmarbles.prfs|lmarbles.prfs.sample|' \
@@ -45,12 +39,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-	@${CHMOD} -R 464 ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample
-	@${CHOWN} root:games ${STAGEDIR}${ETCDIR}/lmarbles.prfs.sample
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog README README-SDL.txt" ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/src && ${COPYTREE_SHARE} "manual" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/lmarbles/pkg-plist
==============================================================================
--- head/games/lmarbles/pkg-plist	Sun Jan 25 01:41:04 2015	(r377854)
+++ head/games/lmarbles/pkg-plist	Sun Jan 25 02:02:53 2015	(r377855)
@@ -1,7 +1,4 @@
-bin/lmarbles
- at unexec if cmp -s %D/%%ETCDIR%%/lmarbles.prfs.sample %D/%%ETCDIR%%/lmarbles.prfs ; then rm -f %D/%%ETCDIR%%/lmarbles.prfs ; fi
-%%ETCDIR%%/lmarbles.prfs.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lmarbles.prfs ] ; then cp -p %D/%F %B/lmarbles.prfs ; fi
+@(,games,2755) bin/lmarbles
 man/man6/lmarbles.6.gz
 share/applications/lmarbles.desktop
 %%DATADIR%%/gfx/board.bmp
@@ -72,11 +69,5 @@ share/applications/lmarbles.desktop
 share/pixmaps/lmarbles32.png
 share/pixmaps/lmarbles48.gif
 share/pixmaps/lmarbles48.png
- at dirrm %%DATADIR%%/sounds
- at dirrm %%DATADIR%%/levels
- at dirrm %%DATADIR%%/gfx/wood
- at dirrm %%DATADIR%%/gfx/stone
- at dirrm %%DATADIR%%/gfx/metal
- at dirrm %%DATADIR%%/gfx
- at dirrm %%DATADIR%%
- at dirrmtry %%ETCDIR%%
+ at sample(,games,664) /var/games/lmarbles/lmarbles.prfs.sample
+ at dir /var/games/lmarbles