svn commit: r339771 - head/games/bugsquish

[Rusmir Dusko]

Author: nemysis
Date: Wed Jan 15 10:24:58 2014
New Revision: 339771
URL: http://svnweb.freebsd.org/changeset/ports/339771
QAT: https://qat.redports.org/buildarchive/r339771/

Log:
  - Bump PORTREVISION
  - Change master sites, add ogg music
  - Add dependency for audio/libogg
  - USES gmake instead of USE_GMAKE
  - Change Desktop entry file
  - Add DOCS Option
  - Support STAGEDIR
  - Remove unneeded .mod and .xvpics
  - Add REINPLACE_CMD, use ogg music instead of not working mod
  - Break lines around 80 characters
  - Change pkg-plist, remove .mod and .xvpics, add .ogg

Modified:
  head/games/bugsquish/Makefile
  head/games/bugsquish/distinfo   (contents, props changed)
  head/games/bugsquish/pkg-plist

Modified: head/games/bugsquish/Makefile
==============================================================================
--- head/games/bugsquish/Makefile	Wed Jan 15 09:34:27 2014	(r339770)
+++ head/games/bugsquish/Makefile	Wed Jan 15 10:24:58 2014	(r339771)
@@ -3,45 +3,57 @@
 
 PORTNAME=	bugsquish
 PORTVERSION=	0.0.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/bugsquish/src/ \
-		ftp://ftp.billsgames.com/unix/x/bugsquish/src/
+		ftp://ftp.billsgames.com/unix/x/bugsquish/src/ \
+		SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:music
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_music${EXTRACT_SUFX}:music
 
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Action game not unlike light gun arcade games
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+
+USES=		gmake
 USE_SDL=	image mixer sdl
-USE_GMAKE=	yes
 
 PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt
 
-DESKTOP_ENTRIES="Bug Squish" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;ArcadeGame;" false
+OPTIONS_DEFINE=	DOCS
+
+DESKTOP_ENTRIES="Bug Squish" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ""
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+post-extract:
+	${TAR} xfjp ${_DISTDIR}/${PORTNAME}_music${EXTRACT_SUFX} -C \
+		${WRKSRC}/data/music/
+	@cd ${WRKSRC}/data/music ; ${RM} -f *.mod
+	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -fr
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/bugsquish/|${DATADIR}/|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|CFLAGS=-Wall -O2|CFLAGS+=|' \
-	-e 's|SDL_CFLAGS :=|SDL_CFLAGS+=|' \
-	-e 's|SDL_LDFLAGS :=|SDL_LDFLAGS+=|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/share/bugsquish/|${DATADIR}/| ; \
+		s|CFLAGS=-Wall -O2|CFLAGS+=| ; \
+		s|SDL_CFLAGS :=|SDL_CFLAGS+=| ; \
+		s|SDL_LDFLAGS :=|SDL_LDFLAGS+=|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|corpses.mod|corpses.ogg| ; \
+		s|adventures.mod|adventures.ogg|' \
+		${WRKSRC}/bugsquish.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .  for d in embedded images music sounds
-	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} ${d} ${DATADIR})
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .  endfor
 
-	${LN} -sf ${PREFIX}/share/bugsquish/embedded/images/icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${LN} -sf ${PREFIX}/share/bugsquish/images/icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/bugsquish/distinfo
==============================================================================
--- head/games/bugsquish/distinfo	Wed Jan 15 09:34:27 2014	(r339770)
+++ head/games/bugsquish/distinfo	Wed Jan 15 10:24:58 2014	(r339771)
@@ -1,2 +1,4 @@
 SHA256 (bugsquish-0.0.6.tar.gz) = 1ad1e216a8e354ddb5d46469bdadb57271461b039f16642df368fa04bcc80f2b
 SIZE (bugsquish-0.0.6.tar.gz) = 765518
+SHA256 (bugsquish_music.tar.gz) = 35369847acc15e31a6d009323355be079480625eb66f12afc7f29431e33029f6
+SIZE (bugsquish_music.tar.gz) = 6578678

Modified: head/games/bugsquish/pkg-plist
==============================================================================
--- head/games/bugsquish/pkg-plist	Wed Jan 15 09:34:27 2014	(r339770)
+++ head/games/bugsquish/pkg-plist	Wed Jan 15 10:24:58 2014	(r339771)
@@ -1,6 +1,4 @@
 bin/bugsquish
-%%DATADIR%%/embedded/images/.xvpics/start-cont.png
-%%DATADIR%%/embedded/images/.xvpics/title.png
 %%DATADIR%%/embedded/images/arm1.png
 %%DATADIR%%/embedded/images/arm2.png
 %%DATADIR%%/embedded/images/arm3.png
@@ -100,8 +98,8 @@ bin/bugsquish
 %%DATADIR%%/images/times2.png
 %%DATADIR%%/images/title.png
 %%DATADIR%%/images/wavebox.png
-%%DATADIR%%/music/adventures.mod
-%%DATADIR%%/music/corpses.mod
+%%DATADIR%%/music/adventures.ogg
+%%DATADIR%%/music/corpses.ogg
 %%DATADIR%%/sounds/ah.wav
 %%DATADIR%%/sounds/bonus.wav
 %%DATADIR%%/sounds/glug.wav
@@ -114,7 +112,6 @@ share/pixmaps/bugsquish.png
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/music
 @dirrm %%DATADIR%%/images
- at dirrm %%DATADIR%%/embedded/images/.xvpics
 @dirrm %%DATADIR%%/embedded/images
 @dirrm %%DATADIR%%/embedded
 @dirrm %%DATADIR%%