Hi ports --
Here's a single patch for all the Solarus subports, bringing them all
up-to-date with the new versions released yesterday.
The (long-ish) changelog can be found at
http://www.solarus-games.org/2013/10/13/solarus-1-1-released/
One thing the changelog is missing that everyone here mentioned last
time is if you don't point solarus to a game, it dies gracefully now
instead of segfaulting.
Make sure that the patch for solarus ends up in the patches/ directory
(since I had to create it).
Can someone test this on i386? Works for me on amd64 but my i386
machines are otherwise occupied for a while...
OK?
~Brian
Index: solarus/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/solarus/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- solarus/Makefile 1 Jul 2013 04:40:14 -0000 1.3
+++ solarus/Makefile 14 Oct 2013 17:38:12 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2013/07/01 04:40:14 bcallah Exp $
-V = 1.0.4
+V = 1.1.0
COMMENT = open-source Zelda-like 2D game engine
DISTNAME = solarus-${V}-src
PKGNAME = solarus-${V}
Index: solarus/distinfo
===================================================================
RCS file: /cvs/ports/games/solarus/solarus/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- solarus/distinfo 1 Jul 2013 04:40:14 -0000 1.3
+++ solarus/distinfo 14 Oct 2013 17:38:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (solarus-1.0.4-src.tar.gz) = A8q/1vEyEMXJYidEKhmzFXBUulcA93SfQ2lvqNjb9vU=
-SIZE (solarus-1.0.4-src.tar.gz) = 702674
+SHA256 (solarus-1.1.0-src.tar.gz) = jzjS6pvjCfrf08UWYved0NTqV4DbE4dnnrhpYKLYnLo=
+SIZE (solarus-1.1.0-src.tar.gz) = 2393855
Index: solarus/patches/patch-CMakeLists_txt
===================================================================
RCS file: solarus/patches/patch-CMakeLists_txt
diff -N solarus/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solarus/patches/patch-CMakeLists_txt 14 Oct 2013 17:38:12 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Fix include mess. Already upstreamed.
+
+--- CMakeLists.txt.orig Sun Oct 13 15:02:07 2013
++++ CMakeLists.txt Mon Oct 14 12:25:05 2013
+@@ -104,13 +104,13 @@ include_directories(
+ ${CMAKE_BINARY_DIR}/include
+ ${SOLARUS_ENGINE_SOURCE_DIR}/include
+ ${SOLARUS_ENGINE_SOURCE_DIR}/include/snes_spc
++ ${MODPLUG_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR}
+ ${SDLTTF_INCLUDE_DIR}
+ ${SDLIMAGE_INCLUDE_DIR}
+ ${OPENAL_INCLUDE_DIR}
+ ${VORBISFILE_INCLUDE_DIR}
+ ${OGG_INCLUDE_DIR}
+- ${MODPLUG_INCLUDE_DIR}
+ ${LUA_INCLUDE_DIR}
+ ${PHYSFS_INCLUDE_DIR}
+ )
Index: zsdx/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/zsdx/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- zsdx/Makefile 1 Jul 2013 04:44:42 -0000 1.2
+++ zsdx/Makefile 14 Oct 2013 17:38:12 -0000
@@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2013/07/01 04:44:42 bcallah Exp $
+V = 1.7.0
COMMENT = fan made Zelda game for Solarus engine
-DISTNAME = zsdx-1.6.2
+DISTNAME = zsdx-${V}
HOMEPAGE = http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
@@ -9,12 +10,14 @@ HOMEPAGE = http://www.solarus-games.org/
PERMIT_PACKAGE_CDROM = contains copyrighted artwork
PERMIT_PACKAGE_FTP = Yes
-MASTER_SITES = http://www.zelda-solarus.com/downloads/zsdx/
+MASTER_SITES = https://github.com/christopho/zsdx/archive/
MODULES = devel/cmake
BUILD_DEPENDS = archivers/zip
RUN_DEPENDS = games/solarus/solarus
+
+WRKDIST = ${WRKDIR}/zsdx-zsdx-${V}
.include <bsd.port.mk>
Index: zsdx/distinfo
===================================================================
RCS file: /cvs/ports/games/solarus/zsdx/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- zsdx/distinfo 1 Jul 2013 04:44:42 -0000 1.2
+++ zsdx/distinfo 14 Oct 2013 17:38:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (zsdx-1.6.2.tar.gz) = ShWDnT25i8fHcOrFmD4oMiPLKaafZI8BXSHHHOMthQo=
-SIZE (zsdx-1.6.2.tar.gz) = 11744669
+SHA256 (zsdx-1.7.0.tar.gz) = RXKMysiBCisr/cMQX8ROk+3UyhBPz60XpaEIe0A5xrI=
+SIZE (zsdx-1.7.0.tar.gz) = 22990557
Index: zsxd/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/zsxd/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- zsxd/Makefile 1 Jul 2013 04:46:24 -0000 1.2
+++ zsxd/Makefile 14 Oct 2013 17:38:12 -0000
@@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2013/07/01 04:46:24 bcallah Exp $
+V = 1.7.0
COMMENT = fan made parody Zelda game for Solarus engine
-DISTNAME = zsxd-1.6.2
+DISTNAME = zsxd-${V}
HOMEPAGE = http://www.solarus-games.org/games/zelda-mystery-of-solarus-xd/
@@ -9,12 +10,14 @@ HOMEPAGE = http://www.solarus-games.org/
PERMIT_PACKAGE_CDROM = contains copyrighted artwork
PERMIT_PACKAGE_FTP = Yes
-MASTER_SITES = http://www.zelda-solarus.com/downloads/zsxd/
+MASTER_SITES = https://github.com/christopho/zsxd/archive/
MODULES = devel/cmake
BUILD_DEPENDS = archivers/zip
RUN_DEPENDS = games/solarus/solarus
+
+WRKDIST = ${WRKDIR}/zsxd-zsxd-${V}
.include <bsd.port.mk>
Index: zsxd/distinfo
===================================================================
RCS file: /cvs/ports/games/solarus/zsxd/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- zsxd/distinfo 1 Jul 2013 04:46:24 -0000 1.2
+++ zsxd/distinfo 14 Oct 2013 17:38:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (zsxd-1.6.2.tar.gz) = L0fzJWdz32K7VK0Bry4VVVB3EQiiz1X9nEP9BzWvI+k=
-SIZE (zsxd-1.6.2.tar.gz) = 3799532
+SHA256 (zsxd-1.7.0.tar.gz) = GqxlHy2fXDZC0ObxDCi+GWjpFSxseAyNWLCJTAORWaE=
+SIZE (zsxd-1.7.0.tar.gz) = 3679685
