Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Oct 2014 14:00:16 +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: r370071 - in head/games/defendguin: . files
Message-ID:  <201410051400.s95E0Grw006195@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Oct  5 14:00:15 2014
New Revision: 370071
URL: https://svnweb.freebsd.org/changeset/ports/370071
QAT: https://qat.redports.org/buildarchive/r370071/

Log:
  - Drop @dirrm* from plist
  - Add LICENSE_FILE
  - Simplify WRKSRC handling

Modified:
  head/games/defendguin/Makefile
  head/games/defendguin/files/patch-defendguin.c
  head/games/defendguin/pkg-plist

Modified: head/games/defendguin/Makefile
==============================================================================
--- head/games/defendguin/Makefile	Sun Oct  5 13:57:50 2014	(r370070)
+++ head/games/defendguin/Makefile	Sun Oct  5 14:00:15 2014	(r370071)
@@ -16,8 +16,7 @@ MAINTAINER=	games@FreeBSD.org
 COMMENT=	Your mission is to defend little penguinoids
 
 LICENSE=	GPLv2
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
 USE_SDL=	mixer sdl
 
@@ -28,22 +27,22 @@ DESKTOP_ENTRIES="Defendguin" "" "${PORTN
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -DDATA_PREFIX=\"${DATADIR}/\" \
+	cd ${WRKSRC}/src && ${CC} ${CFLAGS} -DDATA_PREFIX=\"${DATADIR}/\" \
 		`${SDL_CONFIG} --cflags` defendguin.c -o defendguin \
 		`${SDL_CONFIG} --libs` -lSDL_mixer -lm
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .for d in images music sounds
-	@(cd ${WRKSRC}/../data && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/../docs/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/defendguin/files/patch-defendguin.c
==============================================================================
--- head/games/defendguin/files/patch-defendguin.c	Sun Oct  5 13:57:50 2014	(r370070)
+++ head/games/defendguin/files/patch-defendguin.c	Sun Oct  5 14:00:15 2014	(r370071)
@@ -1,5 +1,5 @@
---- defendguin.c.orig	2009-11-05 22:20:59.000000000 +0100
-+++ defendguin.c	2012-09-10 22:01:37.000000000 +0200
+--- src/defendguin.c.orig	2009-11-05 22:20:59.000000000 +0100
++++ src/defendguin.c	2012-09-10 22:01:37.000000000 +0200
 @@ -4322,6 +4322,7 @@
                "%s\n\n", SDL_GetError());
        exit(1);

Modified: head/games/defendguin/pkg-plist
==============================================================================
--- head/games/defendguin/pkg-plist	Sun Oct  5 13:57:50 2014	(r370070)
+++ head/games/defendguin/pkg-plist	Sun Oct  5 14:00:15 2014	(r370071)
@@ -169,27 +169,3 @@ man/man6/defendguin.6.gz
 %%DATADIR%%/sounds/title/impatience.wav
 %%DATADIR%%/sounds/title/select.wav
 share/pixmaps/defendguin.png
-@dirrm %%DATADIR%%/sounds/title
-@dirrm %%DATADIR%%/sounds/ship
-@dirrm %%DATADIR%%/sounds/peng
-@dirrm %%DATADIR%%/sounds/gameover
-@dirrm %%DATADIR%%/sounds/evilbill
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/images/ufo
-@dirrm %%DATADIR%%/images/tux
-@dirrm %%DATADIR%%/images/title
-@dirrm %%DATADIR%%/images/swarmer
-@dirrm %%DATADIR%%/images/status
-@dirrm %%DATADIR%%/images/ship
-@dirrm %%DATADIR%%/images/points
-@dirrm %%DATADIR%%/images/pod
-@dirrm %%DATADIR%%/images/mutant
-@dirrm %%DATADIR%%/images/loader
-@dirrm %%DATADIR%%/images/land
-@dirrm %%DATADIR%%/images/evilbill
-@dirrm %%DATADIR%%/images/bullet
-@dirrm %%DATADIR%%/images/bomber
-@dirrm %%DATADIR%%/images/baiter
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%



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