Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Nov 2019 20:44:50 +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: r518110 - in head/games/rockdodger: . files
Message-ID:  <201911212044.xALKioGg083921@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Nov 21 20:44:50 2019
New Revision: 518110
URL: https://svnweb.freebsd.org/changeset/ports/518110

Log:
  - Update to 1.1.3
  - Take maintainership
  - Fix LICENSE
  - Simplify
  - Support global highscore

Added:
  head/games/rockdodger/files/patch-data_Makefile   (contents, props changed)
Modified:
  head/games/rockdodger/Makefile
  head/games/rockdodger/distinfo
  head/games/rockdodger/files/patch-Makefile
  head/games/rockdodger/pkg-plist

Modified: head/games/rockdodger/Makefile
==============================================================================
--- head/games/rockdodger/Makefile	Thu Nov 21 19:54:40 2019	(r518109)
+++ head/games/rockdodger/Makefile	Thu Nov 21 20:44:50 2019	(r518110)
@@ -2,19 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	rockdodger
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.3
 CATEGORIES=	games
-MASTER_SITES=	https://bitbucket.org/rpkrawczyk/rockdodger/downloads/ \
-		SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:addons
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}_music${EXTRACT_SUFX}:addons \
-		${PORTNAME}.png:addons
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	https://bitbucket.org/rpkrawczyk/rockdodger/downloads/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Addictive rock-dodging greeblie-killing platform game
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:audio/libogg
@@ -22,31 +17,12 @@ LIB_DEPENDS=	libogg.so:audio/libogg
 USES=		gmake sdl
 USE_SDL=	mixer image sdl
 
-DESKTOP_ENTRIES="Rock Dodger" "" "${PORTNAME}" \
-		"${PORTNAME}" "Game;ArcadeGame;" ""
+PORTDATA=	*
 
-post-extract:
-	${TAR} xfjp ${_DISTDIR}/${PORTNAME}_music${EXTRACT_SUFX} -C \
-		${WRKSRC}/data/
-	@cd ${WRKSRC}/data ; ${RM} *.mod
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@gamesdir@|${DATADIR}|; \
-		s|@datadir@|${PREFIX}/share|' \
-		${WRKSRC}/config.h.in
-	@${REINPLACE_CMD} -e 's|magic.mod|magic.ogg|; \
-		s|getzznew.mod|getzznew.ogg|; \
-		s|4est_fulla3s.mod|4est_fulla3s.ogg|; \
-		s|ramcharg.mod|ramcharg.ogg|; \
-		s|front_1.mod|front_1.ogg|' \
-		${WRKSRC}/sound.c
-	@${REINPLACE_CMD} -e 's|*.mod|*.ogg|' \
-		${WRKSRC}/data/Makefile
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/rockdodger.icon.64x64.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.xpm
+	${INSTALL_DATA} ${WRKSRC}/rockdodger.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${MV} ${STAGEDIR}/var/games/rockdodger.scores ${STAGEDIR}/var/games/rockdodger.scores.sample
 
 .include <bsd.port.mk>

Modified: head/games/rockdodger/distinfo
==============================================================================
--- head/games/rockdodger/distinfo	Thu Nov 21 19:54:40 2019	(r518109)
+++ head/games/rockdodger/distinfo	Thu Nov 21 20:44:50 2019	(r518110)
@@ -1,6 +1,3 @@
-SHA256 (rockdodger-1.0.2.tar.gz) = a6627e9218be12425d492f3b9e0591a689ddfca07451cdcb19d5a4556cd484b9
-SIZE (rockdodger-1.0.2.tar.gz) = 1007405
-SHA256 (rockdodger_music.tar.gz) = c88c92063a99061afea6eefc6b1a7e20723a8c7fc54fa3126aa4130b9722ff03
-SIZE (rockdodger_music.tar.gz) = 7607030
-SHA256 (rockdodger.png) = 3ed4cdd14a583e0b2ec99693459808b241a70b4c5901bfe67e76855d4f7de8a9
-SIZE (rockdodger.png) = 2192
+TIMESTAMP = 1574336512
+SHA256 (rockdodger-1.1.3.tar.gz) = ff2865913bca76790e2f6f180d196258c1957658d3a86ce4eb8f492a5b1603a1
+SIZE (rockdodger-1.1.3.tar.gz) = 1015801

Modified: head/games/rockdodger/files/patch-Makefile
==============================================================================
--- head/games/rockdodger/files/patch-Makefile	Thu Nov 21 19:54:40 2019	(r518109)
+++ head/games/rockdodger/files/patch-Makefile	Thu Nov 21 20:44:50 2019	(r518110)
@@ -1,33 +1,71 @@
---- ./Makefile.orig	2013-12-28 17:42:18.000000000 +0100
-+++ ./Makefile	2014-03-30 19:00:15.799562742 +0200
-@@ -34,9 +34,9 @@
+--- Makefile.orig	2018-07-28 08:20:48 UTC
++++ Makefile
+@@ -25,7 +25,7 @@ VRELEASE=3
+ VERSION=$(VMAJOR).$(VMINOR).$(VRELEASE)
+ PACKAGENAME=rockdodger
+ 
+-prefix = $(DESTDIR)/usr/local
++prefix = ${PREFIX}
+ INSTALL=/usr/bin/install
+ TMP=/tmp
+ 
+@@ -34,14 +34,14 @@ datarootdir = $(prefix)/share
  datadir = $(datarootdir)
  bindir = $(exec_prefix)/bin
  docdir = $(datarootdir)/doc/$(PACKAGENAME)
 -mandir = $(datarootdir)/man
 -localstatedir = $(prefix)/var
--gamesdir = $(localstatedir)/games
-+mandir =$(prefix)/man
-+#localstatedir = $(prefix)/var
-+gamesdir = $(datarootdir)/$(PACKAGENAME)
++mandir = $(prefix)/man
++localstatedir = /var
+ gamesdir = $(localstatedir)/games
  
  NEWD=$(PACKAGENAME)-$(VERSION)
- COMPILEDATE=$(shell date '+%Y-%m-%d')
-@@ -100,12 +100,12 @@
+ COMPILEDATE=$(shell date --date=@$${SOURCE_DATE_EPOCH:-$$(date +%s)} '+%Y-%m-%d')
+ TARPKGNAME=$(NEWD).pkg.tgz
+-OPTIONS=-DVERSION=\"$(VERSION)\" -DCOMPILEDATE=\"$(COMPILEDATE)\" -Wall `$(SDL_CONFIG) --cflags`
++OPTIONS=-DVERSION=\"$(VERSION)\" -DCOMPILEDATE=\"earth\" -Wall `$(SDL_CONFIG) --cflags`
+ EXENAME=rockdodger
+ 
+ SOUNDLIBRARIES=-lSDL_mixer
+@@ -60,14 +60,9 @@ ifeq ($(profile),1)
+ 	OPTIONS+=-pg
+ endif
+ ifeq ($(debug),0)
+-	OPTIONS+=-O2 -DNDEBUG
+-	ifneq ($(profile),1)
+-		OPTIONS+=-fomit-frame-pointer
+-	endif
+ else
+-	OPTIONS+=-O1 -DDEBUG
+ endif
+-CFLAGS=-MMD -g $(OPTIONS) $(MOREOPTS)
++CFLAGS+=-MMD $(OPTIONS) $(CPPFLAGS)
+ 
+ all:	$(EXENAME) config.h
+ 
+@@ -98,16 +93,16 @@ pkg:	$(EXENAME)
+ 	tar -C $$DTEMP -cvzf $(TARPKGNAME) . && rm -r $$DTEMP)
+ 
  install:	all
- 	$(INSTALL) -d $(bindir) $(gamesdir)
- 	$(INSTALL) $(EXENAME) $(bindir)
+-	$(INSTALL) -d $(bindir) $(gamesdir)
+-	$(INSTALL) $(EXENAME) $(bindir)
 -	-chgrp games $(bindir)/$(EXENAME)
 -	chmod g+s $(bindir)/$(EXENAME)
++	$(INSTALL) -d ${DESTDIR}$(bindir) ${DESTDIR}$(gamesdir)
++	$(INSTALL) $(EXENAME) ${DESTDIR}$(bindir)
 +#	-chgrp games $(bindir)/$(EXENAME)
 +#	chmod g+s $(bindir)/$(EXENAME)
  	$(MAKE) -C data install
 -	touch $(gamesdir)/rockdodger.scores
 -	-chgrp games $(gamesdir)/rockdodger.scores
 -	chmod g+rw $(gamesdir)/rockdodger.scores
-+#	touch $(gamesdir)/rockdodger.scores
+-	mkdir -p $(mandir)/man6
+-	gzip -9n < $(MANPAGE) > $(mandir)/man6/$(MANPAGE).gz
++	touch ${DESTDIR}$(gamesdir)/rockdodger.scores
 +#	-chgrp games $(gamesdir)/rockdodger.scores
 +#	chmod g+rw $(gamesdir)/rockdodger.scores
- 	mkdir -p $(mandir)/man6
- 	gzip  < $(MANPAGE) > $(mandir)/man6/$(MANPAGE).gz
++	mkdir -p ${DESTDIR}$(mandir)/man6
++	gzip -9n < $(MANPAGE) > ${DESTDIR}$(mandir)/man6/$(MANPAGE).gz
  
+ uninstall:
+ 	rm -f $(gamesdir)/rockdodger.scores

Added: head/games/rockdodger/files/patch-data_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/rockdodger/files/patch-data_Makefile	Thu Nov 21 20:44:50 2019	(r518110)
@@ -0,0 +1,23 @@
+--- data/Makefile.orig	2018-07-28 08:20:48 UTC
++++ data/Makefile
+@@ -1,6 +1,6 @@
+ PACKAGENAME=rockdodger
+ 
+-prefix = $(DESTDIR)/usr/local
++prefix = ${PREFIX}
+ datarootdir = $(prefix)/share
+ datadir = $(datarootdir)
+ bindir = $(exec_prefix)/bin
+@@ -19,9 +19,9 @@ all:
+ 	@echo PACKAGENAME = $(PACKAGENAME)
+ 
+ install:
+-	$(INSTALL) -d $(datadir)/$(PACKAGENAME)/images
+-	cp $(DATAFILES) $(datadir)/$(PACKAGENAME)
+-	cp $(IMAGES) $(datadir)/$(PACKAGENAME)/images
++	$(INSTALL) -d ${DESTDIR}$(datadir)/$(PACKAGENAME)/images
++	cp $(DATAFILES) ${DESTDIR}$(datadir)/$(PACKAGENAME)
++	cp $(IMAGES) ${DESTDIR}$(datadir)/$(PACKAGENAME)/images
+ 
+ uninstall:
+ 	rm -rf $(datadir)/$(PACKAGENAME)/

Modified: head/games/rockdodger/pkg-plist
==============================================================================
--- head/games/rockdodger/pkg-plist	Thu Nov 21 19:54:40 2019	(r518109)
+++ head/games/rockdodger/pkg-plist	Thu Nov 21 20:44:50 2019	(r518110)
@@ -1,172 +1,5 @@
-bin/rockdodger
+@(,games,2555) bin/rockdodger
 man/man6/rockdodger.6.gz
-share/pixmaps/rockdodger.png
-%%DATADIR%%/20P_Betadance.png
-%%DATADIR%%/24P_Arial_NeonYellow.png
-%%DATADIR%%/4est_fulla3s.ogg
-%%DATADIR%%/SmallNeon.png
-%%DATADIR%%/boom.wav
-%%DATADIR%%/booom.wav
-%%DATADIR%%/bzboom.wav
-%%DATADIR%%/cboom.wav
-%%DATADIR%%/drip.wav
-%%DATADIR%%/fart.1.aiff
-%%DATADIR%%/fart.2.aiff
-%%DATADIR%%/fart.3.aiff
-%%DATADIR%%/fart.4.aiff
-%%DATADIR%%/front_1.ogg
-%%DATADIR%%/getzznew.ogg
-%%DATADIR%%/iff.configdata.rock
-%%DATADIR%%/images/bb-dropping.00.xpm
-%%DATADIR%%/images/bb-dropping.01.xpm
-%%DATADIR%%/images/bb-dropping.02.xpm
-%%DATADIR%%/images/bb-dropping.03.xpm
-%%DATADIR%%/images/bb-dropping.04.xpm
-%%DATADIR%%/images/bb-dropping.05.xpm
-%%DATADIR%%/images/blubat.00.xpm
-%%DATADIR%%/images/blubat.01.xpm
-%%DATADIR%%/images/blubat.02.xpm
-%%DATADIR%%/images/blubat.03.xpm
-%%DATADIR%%/images/blubat.04.xpm
-%%DATADIR%%/images/deadicerock.00.png
-%%DATADIR%%/images/deadicerock.01.png
-%%DATADIR%%/images/deadicerock.02.png
-%%DATADIR%%/images/deadicerock.03.png
-%%DATADIR%%/images/deadlithiumrock.00.ilbm
-%%DATADIR%%/images/deadlithiumrock.01.ilbm
-%%DATADIR%%/images/deadlithiumrock.02.ilbm
-%%DATADIR%%/images/deadrock0.bmp
-%%DATADIR%%/images/deadrock1.bmp
-%%DATADIR%%/images/deadrock2.bmp
-%%DATADIR%%/images/deadrock3.bmp
-%%DATADIR%%/images/deadrock4.bmp
-%%DATADIR%%/images/deadrock5.bmp
-%%DATADIR%%/images/deadrock6.bmp
-%%DATADIR%%/images/deadrock7.bmp
-%%DATADIR%%/images/dodgers.png
-%%DATADIR%%/images/exploding_rock.png
-%%DATADIR%%/images/game.png
-%%DATADIR%%/images/greeblie0.bmp
-%%DATADIR%%/images/greeblie1.bmp
-%%DATADIR%%/images/greeblie2.bmp
-%%DATADIR%%/images/greeblie3.bmp
-%%DATADIR%%/images/greeblie4.bmp
-%%DATADIR%%/images/greeblie5.bmp
-%%DATADIR%%/images/icerock.00.png
-%%DATADIR%%/images/icerock.01.png
-%%DATADIR%%/images/icerock.02.png
-%%DATADIR%%/images/icerock.03.png
-%%DATADIR%%/images/icon.mood_item.png
-%%DATADIR%%/images/laserpowerup.00.png
-%%DATADIR%%/images/laserpowerup.01.png
-%%DATADIR%%/images/laserpowerup.02.png
-%%DATADIR%%/images/laserpowerup.03.png
-%%DATADIR%%/images/laserpowerup.04.png
-%%DATADIR%%/images/laserpowerup.05.png
-%%DATADIR%%/images/laserpowerup.06.png
-%%DATADIR%%/images/laserpowerup.07.png
-%%DATADIR%%/images/laserpowerup.08.png
-%%DATADIR%%/images/laserpowerup.09.png
-%%DATADIR%%/images/laserpowerup.0A.png
-%%DATADIR%%/images/laserpowerup.0B.png
-%%DATADIR%%/images/laserpowerup.0C.png
-%%DATADIR%%/images/laserpowerup.0D.png
-%%DATADIR%%/images/laserpowerup.0E.png
-%%DATADIR%%/images/laserpowerup.0F.png
-%%DATADIR%%/images/laserpowerup.10.png
-%%DATADIR%%/images/laserpowerup.11.png
-%%DATADIR%%/images/laserpowerup.12.png
-%%DATADIR%%/images/laserpowerup.13.png
-%%DATADIR%%/images/laserpowerup.14.png
-%%DATADIR%%/images/laserpowerup.15.png
-%%DATADIR%%/images/laserpowerup.16.png
-%%DATADIR%%/images/laserpowerup.17.png
-%%DATADIR%%/images/laserpowerup.18.png
-%%DATADIR%%/images/laserpowerup.19.png
-%%DATADIR%%/images/laserpowerup.1A.png
-%%DATADIR%%/images/laserpowerup.1B.png
-%%DATADIR%%/images/laserpowerup.1C.png
-%%DATADIR%%/images/laserpowerup.1D.png
-%%DATADIR%%/images/laserpowerup.1E.png
-%%DATADIR%%/images/laserpowerup.1F.png
-%%DATADIR%%/images/laserpowerup.png
-%%DATADIR%%/images/lifepowerup.00.ilbm
-%%DATADIR%%/images/lifepowerup.01.ilbm
-%%DATADIR%%/images/lifepowerup.02.ilbm
-%%DATADIR%%/images/lifepowerup.03.ilbm
-%%DATADIR%%/images/lifepowerup.04.ilbm
-%%DATADIR%%/images/lifepowerup.05.ilbm
-%%DATADIR%%/images/lifepowerup.06.ilbm
-%%DATADIR%%/images/lifepowerup.07.ilbm
-%%DATADIR%%/images/lifepowerup.08.ilbm
-%%DATADIR%%/images/lifepowerup.09.ilbm
-%%DATADIR%%/images/lifepowerup.0A.ilbm
-%%DATADIR%%/images/lifepowerup.0B.ilbm
-%%DATADIR%%/images/lithiumrock.00.ilbm
-%%DATADIR%%/images/lithiumrock.01.ilbm
-%%DATADIR%%/images/lithiumrock.02.ilbm
-%%DATADIR%%/images/mood_item.00.png
-%%DATADIR%%/images/mood_item.01.png
-%%DATADIR%%/images/mood_item.02.png
-%%DATADIR%%/images/mood_item.03.png
-%%DATADIR%%/images/mood_item.04.png
-%%DATADIR%%/images/over.png
-%%DATADIR%%/images/rock.png
-%%DATADIR%%/images/rock0.bmp
-%%DATADIR%%/images/rock1.bmp
-%%DATADIR%%/images/rock2.bmp
-%%DATADIR%%/images/rock3.bmp
-%%DATADIR%%/images/rock4.bmp
-%%DATADIR%%/images/rock5.bmp
-%%DATADIR%%/images/rock6.bmp
-%%DATADIR%%/images/rock7.bmp
-%%DATADIR%%/images/shieldpowerup.00.png
-%%DATADIR%%/images/shieldpowerup.01.png
-%%DATADIR%%/images/shieldpowerup.02.png
-%%DATADIR%%/images/shieldpowerup.03.png
-%%DATADIR%%/images/shieldpowerup.04.png
-%%DATADIR%%/images/shieldpowerup.05.png
-%%DATADIR%%/images/shieldpowerup.06.png
-%%DATADIR%%/images/shieldpowerup.07.png
-%%DATADIR%%/images/shieldpowerup.png
-%%DATADIR%%/images/ship.00.png
-%%DATADIR%%/images/ship.01.png
-%%DATADIR%%/images/ship.02.png
-%%DATADIR%%/images/ship.03.png
-%%DATADIR%%/images/ship.04.png
-%%DATADIR%%/images/ship.05.png
-%%DATADIR%%/images/ship.06.png
-%%DATADIR%%/images/ship.07.png
-%%DATADIR%%/images/ship.08.png
-%%DATADIR%%/images/ship.09.png
-%%DATADIR%%/images/ship.0a.png
-%%DATADIR%%/images/ship.0b.png
-%%DATADIR%%/images/ship_small.png
-%%DATADIR%%/images/yellifish.00.png
-%%DATADIR%%/images/yellifish.01.png
-%%DATADIR%%/images/yellifish.02.png
-%%DATADIR%%/images/yellifish.03.png
-%%DATADIR%%/images/yellifish.04.png
-%%DATADIR%%/images/yellifish.05.png
-%%DATADIR%%/images/yellifish.06.png
-%%DATADIR%%/images/yellifish.07.png
-%%DATADIR%%/images/yellifish.08.png
-%%DATADIR%%/images/yellifish.09.png
-%%DATADIR%%/images/yellifish.0A.png
-%%DATADIR%%/images/yellifish.0B.png
-%%DATADIR%%/images/yellifish.explosion_map.png
-%%DATADIR%%/images/yellifishtentacle.00.png
-%%DATADIR%%/images/yellifishtentacle.01.png
-%%DATADIR%%/images/yellifishtentacle.02.png
-%%DATADIR%%/images/yellifishtentacle.03.png
-%%DATADIR%%/images/yellifishtentacle.04.png
-%%DATADIR%%/laser0.png
-%%DATADIR%%/laser1.png
-%%DATADIR%%/magic.ogg
-%%DATADIR%%/paused.png
-%%DATADIR%%/ramcharg.ogg
-%%DATADIR%%/shield0.png
-%%DATADIR%%/shield1.png
-%%DATADIR%%/shockwave-water.aiff
-%%DATADIR%%/speedup.wav
-%%DATADIR%%/xbad.aiff
+share/applications/rockdodger.desktop
+share/pixmaps/rockdodger.xpm
+@sample(,games,664) /var/games/rockdodger.scores.sample



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