Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On Tue, Jun 25, 2013 at 01:38:17PM -0700, Brian Callahan wrote: Like Ryan, I cannot reproduce this. Are the patches in the proper place? Indeed, I hadn't noticed that a 'patches' dir was missing and the patch didn't apply properly. With that fixed, the wrapper scripts work as expected. Thanks!
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On Wed, Jun 26, 2013 at 09:22:06PM -0600, Anthony J. Bentley wrote: Hi Stefan, Stefan Sperling writes: Windowed mode works fine, but trying to switch to fullscreen mode crashes the X server on my machine. Does this happen with software rendering too? (LIBGL_ALWAYS_SOFTWARE=1) Doen't help in this case, the solarus engine doesn't use libGL.
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On Thu, Jun 27, 2013 at 10:32:33AM +0200, Stefan Sperling wrote: On Wed, Jun 26, 2013 at 09:22:06PM -0600, Anthony J. Bentley wrote: Hi Stefan, Stefan Sperling writes: Windowed mode works fine, but trying to switch to fullscreen mode crashes the X server on my machine. Does this happen with software rendering too? (LIBGL_ALWAYS_SOFTWARE=1) Doen't help in this case, the solarus engine doesn't use libGL. This has nothing to do with the game after all. Mode switching is busted in this machine in general. I can crash the X server just by switching modes with xrandr. This used to work a few weeks ago, not sure what broke it.
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
Hi Stefan, Stefan Sperling writes: Windowed mode works fine, but trying to switch to fullscreen mode crashes the X server on my machine. Does this happen with software rendering too? (LIBGL_ALWAYS_SOFTWARE=1) -- Anthony J. Bentley
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On Sun, Jun 23, 2013 at 06:33:41PM -0400, Brian Callahan wrote:
Hi ports --
Attached is a patch to update both games/solarus/zsdx and
games/solarus/zsxd to their latest version, 1.6 (please apply from
the ports/games/solarus directory).
1.6 is considered a major release for both games, and the first
official releases to fully support the Solarus 1.0.x engine.
This update changes how the games are packaged. Instead of me taking
the time to build/host it myself (I had to do this before since the
games were not official releases), move to pulling the game sources
directly from the Solarus project and building it yourself. I have
been working with upstream, and will make it even simpler to install
the games in the future, but for now this should do.
This change has also been spurred on by recent problems with my
shell provider, who have been kindly hosting distfiles for some of
my ports for quite some time. But being down for 3 days in the last
week or so isn't a good sign.
OK?
looks good! tests good here (i386)
OK rfreeman@
~Brian
Index: zsdx/Makefile
===
RCS file: /cvs/ports/games/solarus/zsdx/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- zsdx/Makefile 17 Jun 2013 02:49:38 - 1.1.1.1
+++ zsdx/Makefile 23 Jun 2013 22:23:42 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/06/17 02:49:38 bcallah Exp $
COMMENT =fan made Zelda game for Solarus engine
-DISTNAME = zsdx-1.5.3
+DISTNAME = zsdx-1.6
HOMEPAGE = http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
@@ -9,19 +9,12 @@ HOMEPAGE = http://www.solarus-games.org/
PERMIT_PACKAGE_CDROM = contains copyrighted artwork
PERMIT_PACKAGE_FTP = Yes
-MASTER_SITES = http://devio.us/~bcallah/source/
+MASTER_SITES = http://www.zelda-solarus.com/downloads/zsdx/
-RUN_DEPENDS =games/solarus/solarus
-
-NO_BUILD = Yes
-PKG_ARCH = *
+MODULES =devel/cmake
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/zsdx
+BUILD_DEPENDS = archivers/zip
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/zsdx ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/solarus/zsdx
- ${INSTALL_DATA} ${WRKSRC}/data.solarus ${PREFIX}/share/solarus/zsdx
+RUN_DEPENDS =games/solarus/solarus
.include bsd.port.mk
Index: zsdx/distinfo
===
RCS file: /cvs/ports/games/solarus/zsdx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- zsdx/distinfo 17 Jun 2013 02:49:38 - 1.1.1.1
+++ zsdx/distinfo 23 Jun 2013 22:23:42 -
@@ -1,2 +1,2 @@
-SHA256 (zsdx-1.5.3.tar.gz) = PoSV4CZjyDVmhoukkd/ifCGWdV1N/1cZ2ZcPxDoI9Yc=
-SIZE (zsdx-1.5.3.tar.gz) = 12417671
+SHA256 (zsdx-1.6.tar.gz) = G8qBLybVzus5uBIBxggn89LcpjBeAlXaiJakJLG6PVg=
+SIZE (zsdx-1.6.tar.gz) = 11744743
Index: zsdx/patches/patch-CMakeLists_txt
===
RCS file: zsdx/patches/patch-CMakeLists_txt
diff -N zsdx/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ zsdx/patches/patch-CMakeLists_txt 23 Jun 2013 22:23:43 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Sun Jun 23 17:46:22 2013
CMakeLists.txt Sun Jun 23 17:46:38 2013
+@@ -47,7 +47,7 @@ add_custom_target(${quest_name}_data
+ add_custom_command(
+ OUTPUT ${quest_name}
+ COMMAND echo '\#!/bin/sh' ${quest_name}
+- COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name}
$*' ${quest_name}
++ COMMAND echo 'solarus
${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name}' ${quest_name}
+ )
+ add_custom_target(${quest_name}_command
+ ALL
Index: zsxd/Makefile
===
RCS file: /cvs/ports/games/solarus/zsxd/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- zsxd/Makefile 17 Jun 2013 02:51:13 - 1.1.1.1
+++ zsxd/Makefile 23 Jun 2013 22:23:44 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/06/17 02:51:13 bcallah Exp $
COMMENT =fan made parody Zelda game for Solarus engine
-DISTNAME = zsxd-1.5.4
+DISTNAME = zsxd-1.6
HOMEPAGE = http://www.solarus-games.org/games/zelda-mystery-of-solarus-xd/
@@ -9,19 +9,12 @@ HOMEPAGE = http://www.solarus-games.org/
PERMIT_PACKAGE_CDROM = contains copyrighted artwork
PERMIT_PACKAGE_FTP = Yes
-MASTER_SITES = http://devio.us/~bcallah/source/
+MASTER_SITES = http://www.zelda-solarus.com/downloads/zsxd/
-RUN_DEPENDS =games/solarus/solarus
-
-NO_BUILD = Yes
-PKG_ARCH = *
+MODULES =devel/cmake
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/zsxd
+BUILD_DEPENDS = archivers/zip
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/zsxd ${PREFIX}/bin
-
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On Sun, Jun 23, 2013 at 06:33:41PM -0400, Brian Callahan wrote: Hi ports -- Attached is a patch to update both games/solarus/zsdx and games/solarus/zsxd to their latest version, 1.6 (please apply from the ports/games/solarus directory). 1.6 is considered a major release for both games, and the first official releases to fully support the Solarus 1.0.x engine. This update changes how the games are packaged. Instead of me taking the time to build/host it myself (I had to do this before since the games were not official releases), move to pulling the game sources directly from the Solarus project and building it yourself. I have been working with upstream, and will make it even simpler to install the games in the future, but for now this should do. This change has also been spurred on by recent problems with my shell provider, who have been kindly hosting distfiles for some of my ports for quite some time. But being down for 3 days in the last week or so isn't a good sign. OK? With this update, I'm getting errors starting games using the provided wrapper scripts: $ zsxd Solarus 1.0.1 Opening quest 'zsxd' Fatal: No quest was found in the directory 'zsxd'. To specify your quest's path, run: solarus path/to/quest Abort trap (core dumped) $ cat /usr/local/bin/zsdx #!/bin/sh solarus /usr/local/share/solarus/zsdx zsdx The game needs to be started like this: $ solarus /usr/local/share/solarus/zsxd Solarus 1.0.1 Opening quest '/usr/local/share/solarus/zsxd' libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile The wrapper scripts work fine with the current in-tree version of the port. The following problems also existed before this update, so they're not regressions and should not prevent this update from being committed. But I thought I'd mention them anyway. The solarus engine core dumps a lot, often when exiting. Not a surprise for a game that is freshly ported to OpenBSD. We should fix these crashes up and send patches upstream. Windowed mode works fine, but trying to switch to fullscreen mode crashes the X server on my machine. $ xrandr Screen 0: minimum 320 x 200, current 1366 x 768, maximum 1366 x 1366 LVDS connected 1366x768+0+0 (normal left inverted right x axis y axis) 256mm x 144mm 1366x768 60.0*+ 1280x720 59.9 1152x768 59.8 1024x768 59.9 800x60059.9 640x48059.4 HDMI-0 disconnected (normal left inverted right x axis y axis) VGA-0 disconnected (normal left inverted right x axis y axis) (gdb) run Starting program: /usr/local/bin/solarus /usr/local/share/solarus/zsdx Solarus 1.0.1 Opening quest '/usr/local/share/solarus/zsdx' libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile ^[[CXIO: fatal IO error 35 (Resource temporarily unavailable) on X server :0.0 after 160 requests (160 known processed) with 2 events remaining. Program received signal SIGSEGV, Segmentation fault. 0x0a32b4708390 in ?? () (gdb) bt #0 0x0a32b4708390 in ?? () #1 0x0a32b148a147 in __cxa_finalize (dso=0x0) at /usr/src/lib/libc/stdlib/atexit.c:147 #2 0x0a32b147352a in exit (status=1) at /usr/src/lib/libc/stdlib/exit.c:57 #3 0x0a32b85bad53 in _XDefaultIOError () from /usr/X11R6/lib/libX11.so.15.2 #4 0x0a32b85badce in _XIOError () from /usr/X11R6/lib/libX11.so.15.2 #5 0x0a32b85b9270 in _XReply () from /usr/X11R6/lib/libX11.so.15.2 #6 0x0a32b0edace6 in XRRSetScreenConfigAndRate () from /usr/X11R6/lib/libXrandr.so.6.2 #7 0x0a32b0edae04 in XRRSetScreenConfig () from /usr/X11R6/lib/libXrandr.so.6.2 #8 0x0a32ab9e328b in X11_ResizeFullScreen () from /usr/local/lib/libSDL.so.8.0 #9 0x0a32ab9e4b5f in X11_EnterFullScreen () from /usr/local/lib/libSDL.so.8.0 #10 0x0a32ab9e7b64 in X11_SetVideoMode () from /usr/local/lib/libSDL.so.8.0 #11 0x0a32ab9d7985 in SDL_SetVideoMode () from /usr/local/lib/libSDL.so.8.0 #12 0x0a30a9795eeb in VideoManager::set_video_mode () from /usr/local/bin/solarus #13 0x0a30a97fe6b6 in LuaContext::video_api_set_mode () from /usr/local/bin/solarus ---Type return to continue, or q return to quit--- I'm not sure yet what video mode it is trying to switch to, and I don't know why it ends up bringing down all of X. Note that this is happening with a new and barely supported radeon card, no accellerated X. cpu0: AMD E-450 APU with Radeon(tm) HD Graphics, 1647.46 MHz vga1 at pci0 dev 1 function 0 ATI Radeon HD 6320 rev 0x00 I haven't yet had time to investigate further but will try to find time to fix this.
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On Tue, Jun 25, 2013 at 01:44:56PM +0200, Stefan Sperling wrote: On Sun, Jun 23, 2013 at 06:33:41PM -0400, Brian Callahan wrote: Hi ports -- Attached is a patch to update both games/solarus/zsdx and games/solarus/zsxd to their latest version, 1.6 (please apply from the ports/games/solarus directory). 1.6 is considered a major release for both games, and the first official releases to fully support the Solarus 1.0.x engine. This update changes how the games are packaged. Instead of me taking the time to build/host it myself (I had to do this before since the games were not official releases), move to pulling the game sources directly from the Solarus project and building it yourself. I have been working with upstream, and will make it even simpler to install the games in the future, but for now this should do. This change has also been spurred on by recent problems with my shell provider, who have been kindly hosting distfiles for some of my ports for quite some time. But being down for 3 days in the last week or so isn't a good sign. OK? With this update, I'm getting errors starting games using the provided wrapper scripts: $ zsxd Solarus 1.0.1 Opening quest 'zsxd' Fatal: No quest was found in the directory 'zsxd'. To specify your quest's path, run: solarus path/to/quest Abort trap (core dumped) $ cat /usr/local/bin/zsdx #!/bin/sh solarus /usr/local/share/solarus/zsdx zsdx i'm not sure why the script has that extra 'zsdx' at the end on your machine: $ cat `which zsdx` #!/bin/sh solarus /usr/local/share/solarus/zsdx $ pkg_info zsdx|head -1 Information for inst:zsdx-1.6 The game needs to be started like this: $ solarus /usr/local/share/solarus/zsxd Solarus 1.0.1 Opening quest '/usr/local/share/solarus/zsxd' libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile The wrapper scripts work fine with the current in-tree version of the port. The following problems also existed before this update, so they're not regressions and should not prevent this update from being committed. But I thought I'd mention them anyway. The solarus engine core dumps a lot, often when exiting. Not a surprise for a game that is freshly ported to OpenBSD. We should fix these crashes up and send patches upstream. I did mention this to bcallah@, and he has noticed as well. Upstream doesn't feel interested in fixing a crash on exit apparently? bcallah@ will know more :) Windowed mode works fine, but trying to switch to fullscreen mode crashes the X server on my machine. hmm, I can't get this to trigger a crash at all here, so likely as you say below its your newer radeon not being happy with the current mesa efforts. ;) i've run this on both i386 with r300 radeon and amd64 with r600 radeon, both with 'radeon' driver, heck just for sake of comparison: (r300) $ xrandr Screen 0: minimum 320 x 200, current 1400 x 1050, maximum 2840 x 1050 VGA-0 disconnected (normal left inverted right x axis y axis) LVDS connected 1400x1050+0+0 (normal left inverted right x axis y axis) 286mm x 214mm 1400x1050 60.0*+ 50.0 1280x1024 59.9 60.0 1280x960 59.9 1280x854 59.9 1280x800 59.8 1280x720 59.9 1152x768 59.8 1024x768 60.0 59.9 800x60060.3 59.9 640x48059.9 59.4 DVI-0 disconnected (normal left inverted right x axis y axis) $ xrandr Screen 0: minimum 320 x 200, current 1366 x 768, maximum 1366 x 1366 LVDS connected 1366x768+0+0 (normal left inverted right x axis y axis) 256mm x 144mm 1366x768 60.0*+ 1280x720 59.9 1152x768 59.8 1024x768 59.9 800x60059.9 640x48059.4 HDMI-0 disconnected (normal left inverted right x axis y axis) VGA-0 disconnected (normal left inverted right x axis y axis) (gdb) run Starting program: /usr/local/bin/solarus /usr/local/share/solarus/zsdx Solarus 1.0.1 Opening quest '/usr/local/share/solarus/zsdx' libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile ^[[CXIO: fatal IO error 35 (Resource temporarily unavailable) on X server :0.0 after 160 requests (160 known processed) with 2 events remaining. Program received signal SIGSEGV, Segmentation fault. 0x0a32b4708390 in ?? () (gdb) bt #0 0x0a32b4708390 in ?? () #1 0x0a32b148a147 in __cxa_finalize (dso=0x0) at /usr/src/lib/libc/stdlib/atexit.c:147 #2 0x0a32b147352a in exit (status=1) at /usr/src/lib/libc/stdlib/exit.c:57 #3 0x0a32b85bad53 in _XDefaultIOError () from
Re: UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
On 06/25/13 09:38, Ryan Freeman wrote: On Tue, Jun 25, 2013 at 01:44:56PM +0200, Stefan Sperling wrote: On Sun, Jun 23, 2013 at 06:33:41PM -0400, Brian Callahan wrote: Hi ports -- Attached is a patch to update both games/solarus/zsdx and games/solarus/zsxd to their latest version, 1.6 (please apply from the ports/games/solarus directory). 1.6 is considered a major release for both games, and the first official releases to fully support the Solarus 1.0.x engine. This update changes how the games are packaged. Instead of me taking the time to build/host it myself (I had to do this before since the games were not official releases), move to pulling the game sources directly from the Solarus project and building it yourself. I have been working with upstream, and will make it even simpler to install the games in the future, but for now this should do. This change has also been spurred on by recent problems with my shell provider, who have been kindly hosting distfiles for some of my ports for quite some time. But being down for 3 days in the last week or so isn't a good sign. OK? Sorry for the late response on this; I just finished flying across the US. With this update, I'm getting errors starting games using the provided wrapper scripts: $ zsxd Solarus 1.0.1 Opening quest 'zsxd' Fatal: No quest was found in the directory 'zsxd'. To specify your quest's path, run: solarus path/to/quest Abort trap (core dumped) $ cat /usr/local/bin/zsdx #!/bin/sh solarus /usr/local/share/solarus/zsdx zsdx i'm not sure why the script has that extra 'zsdx' at the end on your machine: $ cat `which zsdx` #!/bin/sh solarus /usr/local/share/solarus/zsdx $ pkg_info zsdx|head -1 Information for inst:zsdx-1.6 Like Ryan, I cannot reproduce this. Are the patches in the proper place? The game needs to be started like this: $ solarus /usr/local/share/solarus/zsxd Solarus 1.0.1 Opening quest '/usr/local/share/solarus/zsxd' libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile libpng warning: iCCP: known incorrect sRGB profile The wrapper scripts work fine with the current in-tree version of the port. The following problems also existed before this update, so they're not regressions and should not prevent this update from being committed. But I thought I'd mention them anyway. The solarus engine core dumps a lot, often when exiting. Not a surprise for a game that is freshly ported to OpenBSD. We should fix these crashes up and send patches upstream. I did mention this to bcallah@, and he has noticed as well. Upstream doesn't feel interested in fixing a crash on exit apparently? bcallah@ will know more :) Solarus doesn't work on it's own - it must be given an argument to a game - the crash is a reminder of that :) - I'll poke upstream again about it. Windowed mode works fine, but trying to switch to fullscreen mode crashes the X server on my machine. hmm, I can't get this to trigger a crash at all here, so likely as you say below its your newer radeon not being happy with the current mesa efforts. ;) i've run this on both i386 with r300 radeon and amd64 with r600 radeon, both with 'radeon' driver, heck just for sake of comparison: (r300) I can't reproduce that either; in fact I made sure switching between windowed and fullscreen mode (and back) works. FWIW my amd64 machine has intel hd 3000 graphics. Maybe this is an issue specific to your graphics card? ~Brian
UPDATEx2: games/solarus/zsdx and games/solarus/zsxd = 1.6
Hi ports --
Attached is a patch to update both games/solarus/zsdx and
games/solarus/zsxd to their latest version, 1.6 (please apply from the
ports/games/solarus directory).
1.6 is considered a major release for both games, and the first official
releases to fully support the Solarus 1.0.x engine.
This update changes how the games are packaged. Instead of me taking the
time to build/host it myself (I had to do this before since the games
were not official releases), move to pulling the game sources directly
from the Solarus project and building it yourself. I have been working
with upstream, and will make it even simpler to install the games in the
future, but for now this should do.
This change has also been spurred on by recent problems with my shell
provider, who have been kindly hosting distfiles for some of my ports
for quite some time. But being down for 3 days in the last week or so
isn't a good sign.
OK?
~Brian
Index: zsdx/Makefile
===
RCS file: /cvs/ports/games/solarus/zsdx/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- zsdx/Makefile 17 Jun 2013 02:49:38 - 1.1.1.1
+++ zsdx/Makefile 23 Jun 2013 22:23:42 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/06/17 02:49:38 bcallah Exp $
COMMENT = fan made Zelda game for Solarus engine
-DISTNAME = zsdx-1.5.3
+DISTNAME = zsdx-1.6
HOMEPAGE = http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
@@ -9,19 +9,12 @@ HOMEPAGE = http://www.solarus-games.org/
PERMIT_PACKAGE_CDROM = contains copyrighted artwork
PERMIT_PACKAGE_FTP = Yes
-MASTER_SITES = http://devio.us/~bcallah/source/
+MASTER_SITES = http://www.zelda-solarus.com/downloads/zsdx/
-RUN_DEPENDS = games/solarus/solarus
-
-NO_BUILD = Yes
-PKG_ARCH = *
+MODULES = devel/cmake
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/zsdx
+BUILD_DEPENDS = archivers/zip
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/zsdx ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/solarus/zsdx
- ${INSTALL_DATA} ${WRKSRC}/data.solarus ${PREFIX}/share/solarus/zsdx
+RUN_DEPENDS = games/solarus/solarus
.include bsd.port.mk
Index: zsdx/distinfo
===
RCS file: /cvs/ports/games/solarus/zsdx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- zsdx/distinfo 17 Jun 2013 02:49:38 - 1.1.1.1
+++ zsdx/distinfo 23 Jun 2013 22:23:42 -
@@ -1,2 +1,2 @@
-SHA256 (zsdx-1.5.3.tar.gz) = PoSV4CZjyDVmhoukkd/ifCGWdV1N/1cZ2ZcPxDoI9Yc=
-SIZE (zsdx-1.5.3.tar.gz) = 12417671
+SHA256 (zsdx-1.6.tar.gz) = G8qBLybVzus5uBIBxggn89LcpjBeAlXaiJakJLG6PVg=
+SIZE (zsdx-1.6.tar.gz) = 11744743
Index: zsdx/patches/patch-CMakeLists_txt
===
RCS file: zsdx/patches/patch-CMakeLists_txt
diff -N zsdx/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ zsdx/patches/patch-CMakeLists_txt 23 Jun 2013 22:23:43 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Sun Jun 23 17:46:22 2013
CMakeLists.txt Sun Jun 23 17:46:38 2013
+@@ -47,7 +47,7 @@ add_custom_target(${quest_name}_data
+ add_custom_command(
+ OUTPUT ${quest_name}
+ COMMAND echo '\#!/bin/sh' ${quest_name}
+- COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name} $*' ${quest_name}
++ COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name}' ${quest_name}
+ )
+ add_custom_target(${quest_name}_command
+ ALL
Index: zsxd/Makefile
===
RCS file: /cvs/ports/games/solarus/zsxd/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- zsxd/Makefile 17 Jun 2013 02:51:13 - 1.1.1.1
+++ zsxd/Makefile 23 Jun 2013 22:23:44 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/06/17 02:51:13 bcallah Exp $
COMMENT = fan made parody Zelda game for Solarus engine
-DISTNAME = zsxd-1.5.4
+DISTNAME = zsxd-1.6
HOMEPAGE = http://www.solarus-games.org/games/zelda-mystery-of-solarus-xd/
@@ -9,19 +9,12 @@ HOMEPAGE = http://www.solarus-games.org/
PERMIT_PACKAGE_CDROM = contains copyrighted artwork
PERMIT_PACKAGE_FTP = Yes
-MASTER_SITES = http://devio.us/~bcallah/source/
+MASTER_SITES = http://www.zelda-solarus.com/downloads/zsxd/
-RUN_DEPENDS = games/solarus/solarus
-
-NO_BUILD = Yes
-PKG_ARCH = *
+MODULES = devel/cmake
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/zsxd
+BUILD_DEPENDS = archivers/zip
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/zsxd ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/solarus/zsxd
- ${INSTALL_DATA} ${WRKSRC}/data.solarus ${PREFIX}/share/solarus/zsxd
+RUN_DEPENDS = games/solarus/solarus
.include bsd.port.mk
Index: zsxd/distinfo
===
RCS file: /cvs/ports/games/solarus/zsxd/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- zsxd/distinfo 17 Jun
