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 -0000 1.1.1.1 > +++ zsdx/Makefile 23 Jun 2013 22:23:42 -0000 > @@ -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 -0000 1.1.1.1 > +++ zsdx/distinfo 23 Jun 2013 22:23:42 -0000 > @@ -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 -0000 > +++ zsdx/patches/patch-CMakeLists_txt 23 Jun 2013 22:23:43 -0000 > @@ -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 -0000 1.1.1.1 > +++ zsxd/Makefile 23 Jun 2013 22:23:44 -0000 > @@ -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 2013 02:51:13 -0000 1.1.1.1 > +++ zsxd/distinfo 23 Jun 2013 22:23:44 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (zsxd-1.5.4.tar.gz) = pro1SYCKha+diW0X3C8I4WjvKZ9rbCIK6iTVErfrDPo= > -SIZE (zsxd-1.5.4.tar.gz) = 4004141 > +SHA256 (zsxd-1.6.tar.gz) = wQO6dBf3TWF9rfosrxb7ruj2EZYN89Ad3i41XMclOuM= > +SIZE (zsxd-1.6.tar.gz) = 3797858 > Index: zsxd/patches/patch-CMakeLists_txt > =================================================================== > RCS file: zsxd/patches/patch-CMakeLists_txt > diff -N zsxd/patches/patch-CMakeLists_txt > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ zsxd/patches/patch-CMakeLists_txt 23 Jun 2013 22:23:45 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- CMakeLists.txt.orig Sun Jun 23 18:04:53 2013 > ++++ CMakeLists.txt Sun Jun 23 18:05:07 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
