Index: Makefile =================================================================== RCS file: /cvs/ports/games/opensonic/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 14 Jul 2019 00:39:36 -0000 1.10 +++ Makefile 10 Apr 2020 04:46:19 -0000 @@ -2,40 +2,36 @@ COMMENT = game based on the Sonic the Hedgehog universe -V = 0.1.2 -DISTNAME = opensnc-src${V} +V = 0.1.4 +DISTNAME = opensnc-src-${V} PKGNAME = opensonic-${V} -REVISION = 2 CATEGORIES= games HOMEPAGE = http://opensnc.sourceforge.net MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opensnc/} -#MASTER_SITES = http://downloads.sourceforge.net/project/opensnc/Open%20Sonic/${V}/ # GPLv2 or later PERMIT_PACKAGE= Yes MODULES = devel/cmake -BUILD_DEPENDS = graphics/allegropng \ - audio/dumb - LIB_DEPENDS = games/allegro \ - audio/libvorbis + audio/libvorbis \ + graphics/png -WANTLIB = alleg c ogg m pthread vorbis vorbisfile +WANTLIB += alleg c jpgalleg loadpng logg m ogg png vorbis vorbisfile z CFLAGS += -fgnu89-inline -CONFIGURE_ENV = OPENSNC_ALLEGRO_CFLAGS="`allegro-config --cflags`" \ - OPENSNC_ALLEGRO_LIBS="`allegro-config --libs`" \ - OPENSNC_ALLEGRO_VERSION="`allegro-config --version`" +CONFIGURE_ENV = _ALLEGRO_CFLAGS="`allegro-config --cflags`" \ + _ALLEGRO_LIBS="`allegro-config --libs`" \ + _ALLEGRO_VERSION="`allegro-config --version`" pre-configure: ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt post-install: - echo "#!/bin/sh\ncd ${TRUEPREFIX}/share/opensonic\n./opensonic_launcher" > \ + echo "#!/bin/sh\ncd ${TRUEPREFIX}/share/opensonic\n./opensonic" > \ ${PREFIX}/bin/opensonic chmod 755 ${PREFIX}/bin/opensonic Index: distinfo =================================================================== RCS file: /cvs/ports/games/opensonic/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 18 Jan 2015 03:14:00 -0000 1.2 +++ distinfo 10 Apr 2020 04:46:19 -0000 @@ -1,2 +1,2 @@ -SHA256 (opensnc-src0.1.2.tar.gz) = kXHuEjVW9mAPsrQZj3W3slLVFZ43FGZuNYnxe2p2saU= -SIZE (opensnc-src0.1.2.tar.gz) = 4392887 +SHA256 (opensnc-src-0.1.4.tar.gz) = Okw/qVOO4nwEteqEjJrQqD8zVHGTbUYXoY02SMQliOk= +SIZE (opensnc-src-0.1.4.tar.gz) = 10525059 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/opensonic/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -p -r1.2 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 23 Jun 2013 17:51:31 -0000 1.2 +++ patches/patch-CMakeLists_txt 10 Apr 2020 04:46:19 -0000 @@ -1,42 +1,49 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2013/06/23 17:51:31 dcoppa Exp $ ---- CMakeLists.txt.orig Wed Jul 22 07:54:28 2009 -+++ CMakeLists.txt Sun Jun 23 19:16:54 2013 -@@ -21,7 +21,7 @@ MESSAGE("Open Sonic version ${GAME_VERSION}") - - # configuring... - SET(DEFS "") --SET(CFLAGS "") -+SET(CFLAGS "$ENV{OPENSNC_ALLEGRO_CFLAGS}") - - IF(UNIX) - SET(ALLEGRO_UNIX_LIBS "$ENV{OPENSNC_ALLEGRO_LIBS}") -@@ -164,8 +164,8 @@ IF(UNIX) - SET_TARGET_PROPERTIES(${GAME_BIN} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) - TARGET_LINK_LIBRARIES(${GAME_BIN} m ${LOGG_LIBS} ${DUMB_LIBS} alpng) - SET_TARGET_PROPERTIES(${LAUNCHER_BIN} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) -- SET_TARGET_PROPERTIES(${GAME_BIN} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS}") -- SET_TARGET_PROPERTIES(${LAUNCHER_BIN} PROPERTIES COMPILE_FLAGS "-Wall -O2") -+ SET_TARGET_PROPERTIES(${GAME_BIN} PROPERTIES COMPILE_FLAGS "-Wall ${CFLAGS}") -+ SET_TARGET_PROPERTIES(${LAUNCHER_BIN} PROPERTIES COMPILE_FLAGS "-Wall ${CFLAGS}") - ENDIF(UNIX) - - -@@ -248,17 +248,12 @@ SET_TARGET_PROPERTIES(${LAUNCHER_BIN} PROPERTIES PROJE - - # Installing on *nix - IF(UNIX) -- SET(GAME_INSTALL_DIR "/usr/share/opensonic") -- SET(GAME_FINAL_DIR "/usr/bin") -+ SET(GAME_INSTALL_DIR "${PREFIX}/share/opensonic") - - 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}) - INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR}) - 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 "MESSAGE(\"Done! Run ${LAUNCHER_BIN} to start the game.\")") - ENDIF(UNIX) +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -31,7 +31,7 @@ MESSAGE("${GAME_NAME} version ${GAME_VERSION}") + # configuring... + SET(DEFS "") + SET(CFLAGS_EXTRA "-g") +-SET(CFLAGS "${CFLAGS} ${CMAKE_C_FLAGS}") ++SET(CFLAGS "${CFLAGS} ${CMAKE_C_FLAGS} $ENV{_ALLEGRO_CFLAGS}") + MESSAGE("Using CFLAGS='${CFLAGS}'") + + IF(UNIX) +@@ -251,7 +251,7 @@ IF(UNIX) + ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS}) + SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) + TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng) +- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS} ${CFLAGS_EXTRA}") ++ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall ${CFLAGS} ${CFLAGS_EXTRA}") + ENDIF(UNIX) + + +@@ -394,7 +394,7 @@ IF(WIN32) + SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "/D_CRT_SECURE_NO_DEPRECATE /D__WIN32__ /D__MSVC__ ${CFLAGS} ${CFLAGS_EXTRA}") + TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} logg vorbisfile vorbis ogg jpgalleg loadpng alleg png z) + ELSE(MSVC) +- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 -ansi ${CFLAGS} ${CFLAGS_EXTRA}") ++ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -ansi ${CFLAGS} ${CFLAGS_EXTRA}") + TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg loadpng alleg png z) + EXECUTE_PROCESS(COMMAND ${CMAKE_RC_COMPILER} -O coff -o src/misc/iconwin.res -i src/misc/iconwin.rc) + SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS "src/misc/iconwin.res") +@@ -410,16 +410,12 @@ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJ + + # Installing on *nix + IF(UNIX) +- SET(GAME_INSTALL_DIR "/usr/share/${GAME_UNIXNAME}") +- SET(GAME_FINAL_DIR "/usr/bin") ++ SET(GAME_INSTALL_DIR "${PREFIX}/share/${GAME_UNIXNAME}") + + INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")") + INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_INSTALL_DIR}) + INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR}) + INSTALL(DIRECTORY objects sprites config 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_UNIXNAME}\" \"${GAME_FINAL_DIR}/${GAME_UNIXNAME}\")") + + INSTALL(CODE "MESSAGE(\"Done! Please run ${GAME_UNIXNAME} to start ${GAME_NAME}.\")") + ENDIF(UNIX) Index: patches/patch-src_core_audio_c =================================================================== RCS file: patches/patch-src_core_audio_c diff -N patches/patch-src_core_audio_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_core_audio_c 10 Apr 2020 04:46:19 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/core/audio.c +--- src/core/audio.c.orig ++++ src/core/audio.c +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + #include "audio.h" + #include "osspec.h" Index: patches/patch-src_core_util_h =================================================================== RCS file: patches/patch-src_core_util_h diff -N patches/patch-src_core_util_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_core_util_h 10 Apr 2020 04:46:19 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/core/util.h +--- src/core/util.h.orig ++++ src/core/util.h +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include "global.h" + #include "v2d.h" + Index: patches/patch-src_global_h =================================================================== RCS file: patches/patch-src_global_h diff -N patches/patch-src_global_h --- patches/patch-src_global_h 15 Oct 2009 14:39:50 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ -$OpenBSD: patch-src_global_h,v 1.1.1.1 2009/10/15 14:39:50 phessler Exp $ ---- src/global.h.orig Fri Oct 9 17:58:18 2009 -+++ src/global.h Fri Oct 9 17:58:27 2009 -@@ -40,6 +40,5 @@ typedef unsigned long uint32; - #define FALSE 0 - #define EPSILON 0.00001 - #define PI 3.14159265 --#define INFINITY (1<<30) - - #endif Index: patches/patch-src_util_h =================================================================== RCS file: patches/patch-src_util_h diff -N patches/patch-src_util_h --- patches/patch-src_util_h 15 Oct 2009 14:39:50 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_util_h,v 1.1.1.1 2009/10/15 14:39:50 phessler Exp $ ---- src/util.h.orig Tue Jun 2 15:28:43 2009 -+++ src/util.h Tue Jun 2 15:29:15 2009 -@@ -21,6 +21,7 @@ - #define _UTIL_H - - #include -+#include - #include "global.h" - #include "osspec.h" - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/opensonic/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 15 Oct 2009 14:39:50 -0000 1.1.1.1 +++ pkg/PLIST 10 Apr 2020 04:46:19 -0000 @@ -2,65 +2,72 @@ bin/opensonic share/opensonic/ share/opensonic/config/ -share/opensonic/config/sprite.def -share/opensonic/gui/ -share/opensonic/gui/button1.tga -share/opensonic/gui/button_disabled.tga -share/opensonic/gui/buttonhi.tga -share/opensonic/gui/buttonpress.tga -share/opensonic/gui/checkbox.tga -share/opensonic/gui/dialog.tga -share/opensonic/gui/gui.dat -share/opensonic/gui/listbox.tga -share/opensonic/gui/logo.tga -share/opensonic/gui/radio.tga -share/opensonic/gui/scrollbar.tga -share/opensonic/gui/slider.tga -share/opensonic/gui/textbox.tga -share/opensonic/gui/vscroll.tga +share/opensonic/config/samples.def share/opensonic/images/ +share/opensonic/images/acts.png share/opensonic/images/animals.png share/opensonic/images/baddies.png share/opensonic/images/boss.png +share/opensonic/images/bumper.png share/opensonic/images/checkpoint_orb.png +share/opensonic/images/desert1.png +share/opensonic/images/dnadoors.png +share/opensonic/images/editorbg.png +share/opensonic/images/even_more_shields.png share/opensonic/images/font.png share/opensonic/images/gui.png -share/opensonic/images/icon.png share/opensonic/images/intro.png share/opensonic/images/island.png share/opensonic/images/island2.png share/opensonic/images/island3.png +share/opensonic/images/item_boxes.png share/opensonic/images/items.png +share/opensonic/images/lady_bugsy.png +share/opensonic/images/more_shields.png share/opensonic/images/null.png share/opensonic/images/ocean.png share/opensonic/images/ocean2.png +share/opensonic/images/oceanfg.png share/opensonic/images/player.png share/opensonic/images/prototype1.png share/opensonic/images/prototype2.png +share/opensonic/images/quest_extra.png +share/opensonic/images/quest_superbosses.png +share/opensonic/images/quest_tutorial.png +share/opensonic/images/questionmark.png share/opensonic/images/ring_shields.png share/opensonic/images/sourcecode.png +share/opensonic/images/special.png +share/opensonic/images/spikes.png share/opensonic/images/spring_pads.png share/opensonic/images/squarebg.png +share/opensonic/images/switches.png +share/opensonic/images/template.png +share/opensonic/images/template2.png +share/opensonic/images/template3.png share/opensonic/images/title.png share/opensonic/languages/ +share/opensonic/languages/deutsch.lng +share/opensonic/languages/dutch.lng share/opensonic/languages/english.lng -share/opensonic/languages/espanol.lng share/opensonic/languages/francais.lng +share/opensonic/languages/indonesian.lng +share/opensonic/languages/italiano.lng +share/opensonic/languages/polish.lng share/opensonic/languages/ptbr.lng share/opensonic/levels/ share/opensonic/levels/blue_ocean_1.lev -share/opensonic/levels/blue_ocean_1m.lev share/opensonic/levels/blue_ocean_2.lev -share/opensonic/levels/blue_ocean_2m.lev share/opensonic/levels/blue_ocean_3.lev -share/opensonic/levels/blue_ocean_3m.lev +share/opensonic/levels/desert1.lev share/opensonic/levels/exotic_1.lev -share/opensonic/levels/exotic_1m.lev share/opensonic/levels/exotic_2.lev -share/opensonic/levels/exotic_2m.lev share/opensonic/levels/exotic_3.lev -share/opensonic/levels/exotic_3m.lev +share/opensonic/levels/exotichell_1.lev share/opensonic/levels/prototype.lev +share/opensonic/levels/superboss_1.lev +share/opensonic/levels/superboss_2.lev +share/opensonic/levels/template.lev share/opensonic/levels/testzone.lev share/opensonic/levels/tutorial_1.lev share/opensonic/levels/tutorial_2.lev @@ -68,30 +75,32 @@ share/opensonic/license.txt share/opensonic/licenses/ share/opensonic/licenses/2xsai.txt share/opensonic/licenses/Allegro.txt -share/opensonic/licenses/AllegroPNG.txt share/opensonic/licenses/DUMB.txt -share/opensonic/licenses/lexgui.txt +share/opensonic/licenses/jpgalleg.txt +share/opensonic/licenses/loadpng.txt share/opensonic/licenses/logg.txt +share/opensonic/licenses/nanoparser.txt share/opensonic/musics/ -share/opensonic/musics/boss.it +share/opensonic/musics/boss.ogg share/opensonic/musics/credits.txt -share/opensonic/musics/endofquest.it -share/opensonic/musics/exotic.it -share/opensonic/musics/invencible.it -share/opensonic/musics/ocean.it -share/opensonic/musics/speed.it +share/opensonic/musics/crusader.ogg +share/opensonic/musics/invincible.ogg +share/opensonic/musics/luminous_vein.ogg +share/opensonic/musics/options.ogg +share/opensonic/musics/speed.ogg share/opensonic/musics/title.ogg -share/opensonic/musics/tutorial.it +share/opensonic/objects/ +share/opensonic/objects/old_enemies.obj @bin share/opensonic/opensonic -@bin share/opensonic/opensonic_launcher share/opensonic/quests/ -share/opensonic/quests/master.png -share/opensonic/quests/master.qst -share/opensonic/quests/tutorial.png +share/opensonic/quests/default.qst +share/opensonic/quests/extra.qst +share/opensonic/quests/superbosses.qst share/opensonic/quests/tutorial.qst share/opensonic/readme.html share/opensonic/samples/ share/opensonic/samples/1up.ogg +share/opensonic/samples/acidshield.wav share/opensonic/samples/bigring.wav share/opensonic/samples/bigshot.wav share/opensonic/samples/bosshit.wav @@ -110,9 +119,10 @@ share/opensonic/samples/door2.wav share/opensonic/samples/endsign.wav share/opensonic/samples/fire.wav share/opensonic/samples/fire2.wav +share/opensonic/samples/fireshield.wav share/opensonic/samples/floorfall.wav share/opensonic/samples/glasses.wav -share/opensonic/samples/goal.wav +share/opensonic/samples/goal.ogg share/opensonic/samples/jump.wav share/opensonic/samples/puff.wav share/opensonic/samples/return.wav @@ -124,6 +134,8 @@ share/opensonic/samples/select.wav share/opensonic/samples/shield.wav share/opensonic/samples/shot.wav share/opensonic/samples/spikes.wav +share/opensonic/samples/spikes_appearing.wav +share/opensonic/samples/spikes_disappearing.wav share/opensonic/samples/spin.wav share/opensonic/samples/spindash1.wav share/opensonic/samples/spindash2.wav @@ -132,22 +144,82 @@ share/opensonic/samples/switch.wav share/opensonic/samples/teleporter.wav share/opensonic/samples/tfly1.wav share/opensonic/samples/tfly2.wav +share/opensonic/samples/thundershield.wav share/opensonic/samples/touch.wav share/opensonic/samples/touch2.wav +share/opensonic/samples/watershield.wav +share/opensonic/samples/windshield.wav share/opensonic/screenshots/ share/opensonic/screenshots/screenshots.txt +share/opensonic/sprites/ +share/opensonic/sprites/animal.spr +share/opensonic/sprites/bigring.spr +share/opensonic/sprites/bluering.spr +share/opensonic/sprites/bosses.spr +share/opensonic/sprites/bumper.spr +share/opensonic/sprites/charge.spr +share/opensonic/sprites/checkpointorb.spr +share/opensonic/sprites/chef.spr +share/opensonic/sprites/danger.spr +share/opensonic/sprites/dangpower.spr +share/opensonic/sprites/dnadoor.spr +share/opensonic/sprites/door.spr +share/opensonic/sprites/explosion.spr +share/opensonic/sprites/fireball.spr +share/opensonic/sprites/flyingboy.spr +share/opensonic/sprites/flyingeyes.spr +share/opensonic/sprites/font.spr +share/opensonic/sprites/glasses.spr +share/opensonic/sprites/goal.spr +share/opensonic/sprites/goldfish.spr +share/opensonic/sprites/hud.spr +share/opensonic/sprites/icon.spr +share/opensonic/sprites/itembox.spr +share/opensonic/sprites/joan.spr +share/opensonic/sprites/kleps.spr +share/opensonic/sprites/lady_bugsy.spr +share/opensonic/sprites/levelact.spr +share/opensonic/sprites/loop.spr +share/opensonic/sprites/menu.spr +share/opensonic/sprites/misc.spr +share/opensonic/sprites/nafder.spr +share/opensonic/sprites/neon.spr +share/opensonic/sprites/oranjection.spr +share/opensonic/sprites/ring.spr +share/opensonic/sprites/roboxer.spr +share/opensonic/sprites/shield.spr +share/opensonic/sprites/spikes.spr +share/opensonic/sprites/spring.spr +share/opensonic/sprites/surge.spr +share/opensonic/sprites/surpreyes.spr +share/opensonic/sprites/switch.spr +share/opensonic/sprites/teleporter.spr share/opensonic/themes/ +share/opensonic/themes/credits.bg +share/opensonic/themes/desert1.bg +share/opensonic/themes/desert1.brk +share/opensonic/themes/intro.bg share/opensonic/themes/island.bg share/opensonic/themes/island.brk +share/opensonic/themes/island.grp share/opensonic/themes/island2.bg share/opensonic/themes/island2.brk share/opensonic/themes/island3.bg share/opensonic/themes/island3.brk +share/opensonic/themes/langselect.bg +share/opensonic/themes/levelselect.bg +share/opensonic/themes/menu.bg share/opensonic/themes/ocean.bg share/opensonic/themes/ocean.brk share/opensonic/themes/ocean2.bg share/opensonic/themes/ocean2.brk share/opensonic/themes/ocean2b.bg share/opensonic/themes/oceanb.bg +share/opensonic/themes/oceanf.bg +share/opensonic/themes/options.bg share/opensonic/themes/prototype.bg share/opensonic/themes/prototype.brk +share/opensonic/themes/template.bg +share/opensonic/themes/template.brk +share/opensonic/themes/template.grp +share/opensonic/themes/tutorial.bg