Date: Wed, 31 Jul 2013 12:13:57 GMT From: Stas Timokhin <devel@stasyan.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180967: Update port games/opensonic to 0.1.4 Message-ID: <201307311213.r6VCDvKp003330@oldred.freebsd.org> Resent-Message-ID: <201307311220.r6VCK0cV078634@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180967
>Category: ports
>Synopsis: Update port games/opensonic to 0.1.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 31 12:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Stas Timokhin
>Release: 10-current i386
>Organization:
None
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN opensonic.orig/Makefile opensonic/Makefile
--- opensonic.orig/Makefile 2013-07-31 16:22:56.000000000 +0700
+++ opensonic/Makefile 2013-07-31 18:36:52.000000000 +0700
@@ -6,11 +6,10 @@
#
PORTNAME= opensonic
-PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTVERSION= 0.1.4
CATEGORIES= games
MASTER_SITES= SF/opensnc/Open%20Sonic/${PORTVERSION}
-DISTNAME= opensnc-src${PORTVERSION}
+DISTNAME= opensnc-src-${PORTVERSION}
MAINTAINER= devel@stasyan.com
COMMENT= Game based on the "Sonic the Hedgehog" universe
@@ -23,7 +22,7 @@
"false"
USES= cmake
-CMAKE_ENV+= OPENSNC_ALLEGRO_LIBS="`allegro-config --libs`" OPENSNC_ALLEGRO_VERSION="`allegro-config --version`"
+CMAKE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" _ALLEGRO_VERSION="`allegro-config --version`"
CFLAGS+= -I${LOCALBASE}/include
@@ -39,10 +38,13 @@
post-patch:
@${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,g' \
- ${PATCH_WRKSRC}/CMakeLists.txt ${PATCH_WRKSRC}/src/global.h
+ ${PATCH_WRKSRC}/CMakeLists.txt ${PATCH_WRKSRC}/src/core/global.h
@${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,g' \
- ${PATCH_WRKSRC}/src/global.h
- @${REINPLACE_CMD} -e 's,%%GAME_DIR%%,${DATADIR},g' \
- ${PATCH_WRKSRC}/src/misc/opensonic ${PATCH_WRKSRC}/src/misc/opensonic_launcher
+ ${PATCH_WRKSRC}/src/core/global.h
+ @${REINPLACE_CMD} -e 's,%%GAME_DIR%%,${DATADIR},g' -e 's,opensonic_bin,opensonic,g' -e 's,/bin/bash,/bin/sh,g' \
+ ${PATCH_WRKSRC}/src/misc/opensonic
+
+post-install:
+ @${INSTALL_SCRIPT} ${PATCH_WRKSRC}/src/misc/opensonic ${LOCALBASE}/bin/opensonic
.include <bsd.port.post.mk>
diff -ruN opensonic.orig/distinfo opensonic/distinfo
--- opensonic.orig/distinfo 2013-05-06 18:59:58.000000000 +0700
+++ opensonic/distinfo 2013-07-31 16:25:32.000000000 +0700
@@ -1,2 +1,2 @@
-SHA256 (opensnc-src0.1.2.tar.gz) = 9171ee123556f6600fb2b4198f75b7b252d5159e3714666e3589f17b6a76b1a5
-SIZE (opensnc-src0.1.2.tar.gz) = 4392887
+SHA256 (opensnc-src-0.1.4.tar.gz) = 3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
+SIZE (opensnc-src-0.1.4.tar.gz) = 10525059
diff -ruN opensonic.orig/files/patch-CMakeLists.txt opensonic/files/patch-CMakeLists.txt
--- opensonic.orig/files/patch-CMakeLists.txt 2013-05-06 18:59:58.000000000 +0700
+++ opensonic/files/patch-CMakeLists.txt 2013-07-31 16:26:36.000000000 +0700
@@ -1,43 +1,13 @@
---- CMakeLists.txt.orig 2009-07-22 16:54:28.000000000 +1100
-+++ CMakeLists.txt 2010-02-02 20:05:55.037102480 +1000
-@@ -6,8 +6,15 @@
- # Initializing...
- CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
- PROJECT(opensonic C)
--SET(GAME_BIN opensonic)
--SET(LAUNCHER_BIN opensonic_launcher)
-+SET(GAME_NAME opensonic)
-+if(NOT WIN32)
-+SET(GAME_BIN ${GAME_NAME}_bin)
-+SET(LAUNCHER_BIN ${GAME_NAME}_launcher_bin)
-+else(NOT WIN32)
-+SET(GAME_BIN ${GAME_NAME})
-+SET(LAUNCHER_BIN ${GAME_NAME}_launcher)
-+endif(NOT WIN32)
-+
- SET(GAME_VERSION "0.1.2")
- SET(ALLEGRO_RECOMMENDED_VERSION "4.2.2")
- SET(CMAKE_BUILD_TYPE Release)
-@@ -248,8 +255,8 @@
-
- # Installing on *nix
- IF(UNIX)
-- SET(GAME_INSTALL_DIR "/usr/share/opensonic")
-- SET(GAME_FINAL_DIR "/usr/bin")
-+ SET(GAME_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/opensonic")
-+ SET(GAME_FINAL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
-
- INSTALL(CODE "MESSAGE(\"Installing Open Sonic ${GAME_VERSION}... Make sure you have root privileges.\")")
- INSTALL(TARGETS ${GAME_BIN} ${LAUNCHER_BIN} RUNTIME DESTINATION ${GAME_INSTALL_DIR})
-@@ -257,8 +264,8 @@
- INSTALL(DIRECTORY config gui images levels licenses musics quests samples screenshots themes languages DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
-
- INSTALL(CODE "MESSAGE(\"Creating files at ${GAME_FINAL_DIR}...\")")
-- INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${GAME_INSTALL_DIR}/${GAME_BIN}\" \"${GAME_FINAL_DIR}/${GAME_BIN}\")")
-- INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${GAME_INSTALL_DIR}/${LAUNCHER_BIN}\" \"${GAME_FINAL_DIR}/${LAUNCHER_BIN}\")")
-+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${CMAKE_CURRENT_BINARY_DIR}/src/misc/${GAME_NAME}\" \"${GAME_FINAL_DIR}/${GAME_NAME}\")")
-+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${CMAKE_CURRENT_BINARY_DIR}/src/misc/${GAME_NAME}_launcher\" \"${GAME_FINAL_DIR}/${GAME_NAME}_launcher\")")
-
-- INSTALL(CODE "MESSAGE(\"Done! Run ${LAUNCHER_BIN} to start the game.\")")
-+ INSTALL(CODE "MESSAGE(\"Done! Run ${GAME_NAME}_launcher to start the game.\")")
- ENDIF(UNIX)
+--- CMakeLists.txt.orig 2010-12-15 10:31:17.000000000 +0600
++++ CMakeLists.txt 2010-12-15 10:32:02.000000000 +0600
+@@ -410,8 +410,8 @@
+
+ # Installing on *nix
+ IF(UNIX)
+- SET(GAME_INSTALL_DIR "/usr/share/${GAME_UNIXNAME}")
+- SET(GAME_FINAL_DIR "/usr/bin")
++ SET(GAME_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/${GAME_UNIXNAME}")
++ SET(GAME_FINAL_DIR "{CMAKE_INSTALL_PREFIX}/bin")
+
+ INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
+ INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_INSTALL_DIR})
diff -ruN opensonic.orig/files/patch-src__misc__opensonic_launcher opensonic/files/patch-src__misc__opensonic_launcher
--- opensonic.orig/files/patch-src__misc__opensonic_launcher 2013-05-06 18:59:58.000000000 +0700
+++ opensonic/files/patch-src__misc__opensonic_launcher 2013-07-31 16:26:48.000000000 +0700
@@ -1,14 +0,0 @@
---- src/misc/opensonic_launcher.orig 2009-06-01 02:34:38.000000000 +1100
-+++ src/misc/opensonic_launcher 2010-02-02 20:03:27.382511463 +1000
-@@ -1,9 +1,9 @@
--#!/bin/bash
-+#!/bin/sh
- # Game Launcher
-
- GAME_BIN="opensonic_launcher_bin"
- PWD_DIR=`pwd`
--GAME_DIR=`echo $0 | sed 's,^\(.*\)/\(.*\)$,\1,g'`
-+GAME_DIR=%%GAME_DIR%%
- GAME_PATH="${GAME_DIR}/${GAME_BIN}"
-
- # Set LD_LIBRARY_PATH
diff -ruN opensonic.orig/pkg-descr opensonic/pkg-descr
--- opensonic.orig/pkg-descr 1970-01-01 07:00:00.000000000 +0700
+++ opensonic/pkg-descr 2013-05-06 18:59:58.000000000 +0700
@@ -0,0 +1,8 @@
+Game based on the "Sonic the Hedgehog" universe.
+It introduces a different style of gameplay called cooperative play,
+in which it's possible to control 3 characters simultaneously.
+Unlike most similar games, Open Sonic provides a greater level of interaction
+between the player and the levels. It's more than just a jump'n'run;
+the user must come up with some strategy in order to get through the levels.
+
+WWW: http://opensnc.sourceforge.net
diff -ruN opensonic.orig/pkg-plist opensonic/pkg-plist
--- opensonic.orig/pkg-plist 2013-05-06 18:59:58.000000000 +0700
+++ opensonic/pkg-plist 2013-07-31 17:29:05.000000000 +0700
@@ -1,87 +1,95 @@
bin/opensonic
-bin/opensonic_launcher
-%%DATADIR%%/config/sprite.def
-%%DATADIR%%/gui/button1.tga
-%%DATADIR%%/gui/button_disabled.tga
-%%DATADIR%%/gui/buttonhi.tga
-%%DATADIR%%/gui/buttonpress.tga
-%%DATADIR%%/gui/checkbox.tga
-%%DATADIR%%/gui/dialog.tga
-%%DATADIR%%/gui/gui.dat
-%%DATADIR%%/gui/listbox.tga
-%%DATADIR%%/gui/logo.tga
-%%DATADIR%%/gui/radio.tga
-%%DATADIR%%/gui/scrollbar.tga
-%%DATADIR%%/gui/slider.tga
-%%DATADIR%%/gui/textbox.tga
-%%DATADIR%%/gui/vscroll.tga
+%%DATADIR%%/config/samples.def
+%%DATADIR%%/images/acts.png
%%DATADIR%%/images/animals.png
%%DATADIR%%/images/baddies.png
%%DATADIR%%/images/boss.png
+%%DATADIR%%/images/bumper.png
%%DATADIR%%/images/checkpoint_orb.png
+%%DATADIR%%/images/desert1.png
+%%DATADIR%%/images/dnadoors.png
+%%DATADIR%%/images/editorbg.png
+%%DATADIR%%/images/even_more_shields.png
%%DATADIR%%/images/font.png
%%DATADIR%%/images/gui.png
-%%DATADIR%%/images/icon.png
%%DATADIR%%/images/intro.png
%%DATADIR%%/images/island.png
%%DATADIR%%/images/island2.png
%%DATADIR%%/images/island3.png
+%%DATADIR%%/images/item_boxes.png
%%DATADIR%%/images/items.png
+%%DATADIR%%/images/lady_bugsy.png
+%%DATADIR%%/images/more_shields.png
%%DATADIR%%/images/null.png
%%DATADIR%%/images/ocean.png
%%DATADIR%%/images/ocean2.png
+%%DATADIR%%/images/oceanfg.png
%%DATADIR%%/images/player.png
%%DATADIR%%/images/prototype1.png
%%DATADIR%%/images/prototype2.png
+%%DATADIR%%/images/quest_extra.png
+%%DATADIR%%/images/quest_superbosses.png
+%%DATADIR%%/images/quest_tutorial.png
+%%DATADIR%%/images/questionmark.png
%%DATADIR%%/images/ring_shields.png
%%DATADIR%%/images/sourcecode.png
+%%DATADIR%%/images/special.png
+%%DATADIR%%/images/spikes.png
%%DATADIR%%/images/spring_pads.png
%%DATADIR%%/images/squarebg.png
+%%DATADIR%%/images/switches.png
+%%DATADIR%%/images/template.png
+%%DATADIR%%/images/template2.png
+%%DATADIR%%/images/template3.png
%%DATADIR%%/images/title.png
+%%DATADIR%%/languages/deutsch.lng
+%%DATADIR%%/languages/dutch.lng
%%DATADIR%%/languages/english.lng
-%%DATADIR%%/languages/espanol.lng
%%DATADIR%%/languages/francais.lng
+%%DATADIR%%/languages/indonesian.lng
+%%DATADIR%%/languages/italiano.lng
+%%DATADIR%%/languages/polish.lng
%%DATADIR%%/languages/ptbr.lng
%%DATADIR%%/levels/blue_ocean_1.lev
-%%DATADIR%%/levels/blue_ocean_1m.lev
%%DATADIR%%/levels/blue_ocean_2.lev
-%%DATADIR%%/levels/blue_ocean_2m.lev
%%DATADIR%%/levels/blue_ocean_3.lev
-%%DATADIR%%/levels/blue_ocean_3m.lev
+%%DATADIR%%/levels/desert1.lev
%%DATADIR%%/levels/exotic_1.lev
-%%DATADIR%%/levels/exotic_1m.lev
%%DATADIR%%/levels/exotic_2.lev
-%%DATADIR%%/levels/exotic_2m.lev
%%DATADIR%%/levels/exotic_3.lev
-%%DATADIR%%/levels/exotic_3m.lev
+%%DATADIR%%/levels/exotichell_1.lev
%%DATADIR%%/levels/prototype.lev
+%%DATADIR%%/levels/superboss_1.lev
+%%DATADIR%%/levels/superboss_2.lev
+%%DATADIR%%/levels/template.lev
%%DATADIR%%/levels/testzone.lev
%%DATADIR%%/levels/tutorial_1.lev
%%DATADIR%%/levels/tutorial_2.lev
%%DATADIR%%/license.txt
%%DATADIR%%/licenses/2xsai.txt
%%DATADIR%%/licenses/Allegro.txt
-%%DATADIR%%/licenses/AllegroPNG.txt
%%DATADIR%%/licenses/DUMB.txt
-%%DATADIR%%/licenses/lexgui.txt
+%%DATADIR%%/licenses/jpgalleg.txt
+%%DATADIR%%/licenses/loadpng.txt
%%DATADIR%%/licenses/logg.txt
-%%DATADIR%%/musics/boss.it
+%%DATADIR%%/licenses/nanoparser.txt
+%%DATADIR%%/musics/boss.ogg
%%DATADIR%%/musics/credits.txt
-%%DATADIR%%/musics/endofquest.it
-%%DATADIR%%/musics/exotic.it
-%%DATADIR%%/musics/invencible.it
-%%DATADIR%%/musics/ocean.it
-%%DATADIR%%/musics/speed.it
+%%DATADIR%%/musics/crusader.ogg
+%%DATADIR%%/musics/invincible.ogg
+%%DATADIR%%/musics/luminous_vein.ogg
+%%DATADIR%%/musics/options.ogg
+%%DATADIR%%/musics/speed.ogg
%%DATADIR%%/musics/title.ogg
-%%DATADIR%%/musics/tutorial.it
-%%DATADIR%%/opensonic_bin
-%%DATADIR%%/opensonic_launcher_bin
-%%DATADIR%%/quests/master.png
-%%DATADIR%%/quests/master.qst
-%%DATADIR%%/quests/tutorial.png
+%%DATADIR%%/objects/old_enemies.obj
+%%DATADIR%%/opensonic
+%%DATADIR%%/quests/default.qst
+%%DATADIR%%/quests/extra.qst
+%%DATADIR%%/quests/superbosses.qst
%%DATADIR%%/quests/tutorial.qst
%%DATADIR%%/readme.html
%%DATADIR%%/samples/1up.ogg
+%%DATADIR%%/samples/acidshield.wav
%%DATADIR%%/samples/bigring.wav
%%DATADIR%%/samples/bigshot.wav
%%DATADIR%%/samples/bosshit.wav
@@ -100,9 +108,10 @@
%%DATADIR%%/samples/endsign.wav
%%DATADIR%%/samples/fire.wav
%%DATADIR%%/samples/fire2.wav
+%%DATADIR%%/samples/fireshield.wav
%%DATADIR%%/samples/floorfall.wav
%%DATADIR%%/samples/glasses.wav
-%%DATADIR%%/samples/goal.wav
+%%DATADIR%%/samples/goal.ogg
%%DATADIR%%/samples/jump.wav
%%DATADIR%%/samples/puff.wav
%%DATADIR%%/samples/return.wav
@@ -114,6 +123,8 @@
%%DATADIR%%/samples/shield.wav
%%DATADIR%%/samples/shot.wav
%%DATADIR%%/samples/spikes.wav
+%%DATADIR%%/samples/spikes_appearing.wav
+%%DATADIR%%/samples/spikes_disappearing.wav
%%DATADIR%%/samples/spin.wav
%%DATADIR%%/samples/spindash1.wav
%%DATADIR%%/samples/spindash2.wav
@@ -122,32 +133,91 @@
%%DATADIR%%/samples/teleporter.wav
%%DATADIR%%/samples/tfly1.wav
%%DATADIR%%/samples/tfly2.wav
+%%DATADIR%%/samples/thundershield.wav
%%DATADIR%%/samples/touch.wav
%%DATADIR%%/samples/touch2.wav
+%%DATADIR%%/samples/watershield.wav
+%%DATADIR%%/samples/windshield.wav
%%DATADIR%%/screenshots/screenshots.txt
+%%DATADIR%%/sprites/animal.spr
+%%DATADIR%%/sprites/bigring.spr
+%%DATADIR%%/sprites/bluering.spr
+%%DATADIR%%/sprites/bosses.spr
+%%DATADIR%%/sprites/bumper.spr
+%%DATADIR%%/sprites/charge.spr
+%%DATADIR%%/sprites/checkpointorb.spr
+%%DATADIR%%/sprites/chef.spr
+%%DATADIR%%/sprites/danger.spr
+%%DATADIR%%/sprites/dangpower.spr
+%%DATADIR%%/sprites/dnadoor.spr
+%%DATADIR%%/sprites/door.spr
+%%DATADIR%%/sprites/explosion.spr
+%%DATADIR%%/sprites/fireball.spr
+%%DATADIR%%/sprites/flyingboy.spr
+%%DATADIR%%/sprites/flyingeyes.spr
+%%DATADIR%%/sprites/font.spr
+%%DATADIR%%/sprites/glasses.spr
+%%DATADIR%%/sprites/goal.spr
+%%DATADIR%%/sprites/goldfish.spr
+%%DATADIR%%/sprites/hud.spr
+%%DATADIR%%/sprites/icon.spr
+%%DATADIR%%/sprites/itembox.spr
+%%DATADIR%%/sprites/joan.spr
+%%DATADIR%%/sprites/kleps.spr
+%%DATADIR%%/sprites/lady_bugsy.spr
+%%DATADIR%%/sprites/levelact.spr
+%%DATADIR%%/sprites/loop.spr
+%%DATADIR%%/sprites/menu.spr
+%%DATADIR%%/sprites/misc.spr
+%%DATADIR%%/sprites/nafder.spr
+%%DATADIR%%/sprites/neon.spr
+%%DATADIR%%/sprites/oranjection.spr
+%%DATADIR%%/sprites/ring.spr
+%%DATADIR%%/sprites/roboxer.spr
+%%DATADIR%%/sprites/shield.spr
+%%DATADIR%%/sprites/spikes.spr
+%%DATADIR%%/sprites/spring.spr
+%%DATADIR%%/sprites/surge.spr
+%%DATADIR%%/sprites/surpreyes.spr
+%%DATADIR%%/sprites/switch.spr
+%%DATADIR%%/sprites/teleporter.spr
+%%DATADIR%%/themes/credits.bg
+%%DATADIR%%/themes/desert1.bg
+%%DATADIR%%/themes/desert1.brk
+%%DATADIR%%/themes/intro.bg
%%DATADIR%%/themes/island.bg
%%DATADIR%%/themes/island.brk
+%%DATADIR%%/themes/island.grp
%%DATADIR%%/themes/island2.bg
%%DATADIR%%/themes/island2.brk
%%DATADIR%%/themes/island3.bg
%%DATADIR%%/themes/island3.brk
+%%DATADIR%%/themes/langselect.bg
+%%DATADIR%%/themes/levelselect.bg
+%%DATADIR%%/themes/menu.bg
%%DATADIR%%/themes/ocean.bg
%%DATADIR%%/themes/ocean.brk
%%DATADIR%%/themes/ocean2.bg
%%DATADIR%%/themes/ocean2.brk
%%DATADIR%%/themes/ocean2b.bg
%%DATADIR%%/themes/oceanb.bg
+%%DATADIR%%/themes/oceanf.bg
+%%DATADIR%%/themes/options.bg
%%DATADIR%%/themes/prototype.bg
%%DATADIR%%/themes/prototype.brk
+%%DATADIR%%/themes/template.bg
+%%DATADIR%%/themes/template.brk
+%%DATADIR%%/themes/template.grp
+%%DATADIR%%/themes/tutorial.bg
@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/sprites
@dirrm %%DATADIR%%/screenshots
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/quests
+@dirrm %%DATADIR%%/objects
@dirrm %%DATADIR%%/musics
@dirrm %%DATADIR%%/licenses
@dirrm %%DATADIR%%/levels
@dirrm %%DATADIR%%/languages
@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/gui
@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307311213.r6VCDvKp003330>