From owner-svn-ports-head@FreeBSD.ORG Wed Jan 15 10:24:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A5F517B; Wed, 15 Jan 2014 10:24:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3AC2211EE; Wed, 15 Jan 2014 10:24:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FAOxEQ078556; Wed, 15 Jan 2014 10:24:59 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FAOwjr078553; Wed, 15 Jan 2014 10:24:58 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401151024.s0FAOwjr078553@svn.freebsd.org> From: Rusmir Dusko Date: Wed, 15 Jan 2014 10:24:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339771 - head/games/bugsquish X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2014 10:24:59 -0000 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@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 +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 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 -@dirrm %%DATADIR%%/embedded/images/.xvpics @dirrm %%DATADIR%%/embedded/images @dirrm %%DATADIR%%/embedded @dirrm %%DATADIR%%