Date: Fri, 21 Dec 2012 22:30:00 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/174382: [PATCH] games/rocksndiamonds: Added Master site, desktop entry, icons, take maintainership Message-ID: <201212212230.qBLMU0ZH071007@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174382; it has been noted by GNATS. From: nemysis <nemysis@gmx.ch> To: bug-followup@FreeBSD.org, Pawel Pekala <pawel@FreeBSD.org> Cc: Subject: Re: ports/174382: [PATCH] games/rocksndiamonds: Added Master site, desktop entry, icons, take maintainership Date: Fri, 21 Dec 2012 23:25:07 +0100 --MP_/2_gILeo5pzsExjam5uMDD0Z Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Here is rocksndiamonds.diff --MP_/2_gILeo5pzsExjam5uMDD0Z Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=rocksndiamonds.diff =3D=3D=3D> Generating patch =3D=3D=3D> Viewing diff with more diff -ruN --exclude=3DCVS /usr/ports/games/rocksndiamonds/Makefile ./Makefi= le --- /usr/ports/games/rocksndiamonds/Makefile 2012-12-05 00:44:52.000000000 = +0100 +++ ./Makefile 2012-12-21 23:04:43.000000000 +0100 @@ -3,56 +3,177 @@ =20 PORTNAME=3D rocksndiamonds PORTVERSION=3D 3.3.0.1 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D games -MASTER_SITES=3D SF/${PORTNAME}.mirror \ - http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ +MASTER_SITES=3D SF/${PORTNAME}.mirror/ \ + http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \ + http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels \ + http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/:unix_levels \ + SF/nemysisfreebsdp/${PORTNAME}/:nemysis_levels \ + SF/nemysisfreebsdp/${PORTNAME}/:icons +# Please contact the MAINTAINER if a Level is missing +DISTFILES=3D ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + rnd_jue-v8_1.zip:nemysis_levels \ + ZeldaII-1.0.0.zip:levels \ + Zelda-1.0.0.zip:levels \ + Emerald_Mine_Club-2.1.1.7z:levels \ + Sokoban-1.0.0.zip:levels \ + Contributions-1.2.0.zip:levels \ + Snake_Bite-1.0.0.zip:levels \ + BD2K3-1.0.0.zip:levels \ + Earth_Shaker_Explosions_v1-1.zip:nemysis_levels \ + Earth_Shaker_Old_Set_B_v1-2.zip:nemysis_levels \ + Walpurgis_Flashbacks_v1-3.zip:nemysis_levels \ + Walpurgis_Gardens_v1-0.zip:nemysis_levels \ + Walpurgis_World_v1-0.zip:nemysis_levels \ + Boulder_Dash_Dream-1.0.0.zip:levels \ + rockslevels-sp-1.0.tar.gz:unix_levels \ + rockslevels-dx-1.0.tar.gz:unix_levels \ + ${PORTNAME}_icons.zip:icons +DIST_SUBDIR=3D ${PORTNAME} +EXTRACT_ONLY=3D ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons.zip =20 -MAINTAINER=3D ports@FreeBSD.org +MAINTAINER=3D nemysis@gmx.ch COMMENT=3D Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff =20 LICENSE=3D GPLv2 =20 -OPTIONS_DEFINE=3D SDL DOCS +LIB_DEPENDS+=3D smpeg:${PORTSDIR}/multimedia/smpeg +EXTRACT_DEPENDS+=3Dunzip:${PORTSDIR}/archivers/unzip \ + 7z:${PORTSDIR}/archivers/p7zip =20 +USE_SDL=3D image mixer net sdl USE_GMAKE=3D yes MAKE_ARGS=3D CC=3D"${CC}" MAKE=3D"${GMAKE}" OPTIONS=3D"${CFLAGS}" \ RO_GAME_DIR=3D"${DATADIR}" RW_GAME_DIR=3D"${DATADIR}/scores" \ X11_PATH=3D"${LOCALBASE}" +ALL_TARGET=3D sdl MAKE_JOBS_SAFE=3D yes =20 MAN1=3D rocksndiamonds.1 =20 +PORTDOCS=3D * + +DOCSRCDIR1=3D ${WRKSRC} +DOC_FILES1=3D CREDITS ChangeLog README + +DOCSRCDIR2=3D ${WRKSRC}/docs/elements +DOCSDIR2=3D ${DOCSDIR}/docs/elements +DOC_FILES2=3D *.txt + +INSTALLS_ICONS=3D yes +ICON_SIZES=3D 32x32 48x48 64x64 72x72 96x96 + +DESKTOP_ENTRIES=3D"Rocks'n'Diamonds" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" ${FALSE} + .include <bsd.port.options.mk> =20 -.if ${PORT_OPTIONS:MSDL} -LIB_DEPENDS+=3D smpeg:${PORTSDIR}/multimedia/smpeg -USE_SDL=3D image mixer net sdl -ALL_TARGET=3D sdl +.if ${PORT_OPTIONS:MEMERALD_MINE_CLUB} +DISTFILES+=3D Emerald_Mine_Club-2.1.1.7z:levels +EXTRACT_DEPENDS+=3D7z:${PORTSDIR}/archivers/p7zip +PLIST_SUB+=3D EMERALD_MINE_CLUB=3D"" .else -USE_XORG=3D x11 xpm xt -ALL_TARGET=3D x11 +PLIST_SUB+=3D EMERALD_MINE_CLUB=3D"@comment " .endif =20 +post-extract-script: +.for l in rnd_jue-v8_1.zip ZeldaII-1.0.0.zip Zelda-1.0.0.zip Sokoban-1.0.0= .zip \ + Contributions-1.2.0.zip Snake_Bite-1.0.0.zip BD2K3-1.0.0.zip \ + Earth_Shaker_Explosions_v1-1.zip Earth_Shaker_Old_Set_B_v1-2.zip \ + Walpurgis_Flashbacks_v1-3.zip Walpurgis_Gardens_v1-0.zip \ + Walpurgis_World_v1-0.zip Boulder_Dash_Dream-1.0.0.zip + @${UNZIP_CMD} -qo -d ${WRKSRC}/levels ${DISTDIR}/${DIST_SUBDIR}/${l} +.endfor +.for l in rockslevels-sp-1.0.tar.gz rockslevels-dx-1.0.tar.gz + @${TAR} xfjp ${DISTDIR}/${DIST_SUBDIR}/${l} -C ${WRKSRC} +.endfor + 7z x ${DISTDIR}/${DIST_SUBDIR}/Emerald_Mine_Club-2.1.1.7z -o${WRKSRC}/lev= els + post-patch: - @${REINPLACE_CMD} -e \ - 's|sdl-config|$${SDL_CONFIG}|g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} \ + -e 's|sdl-config|$${SDL_CONFIG}|g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} \ + -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/src/libgame/sound.c + @${REINPLACE_CMD} \ + -e 's|machine/joystick.h|sys/joystick.h|' ${WRKSRC}/src/libgame/joystick= .c =20 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${MANPREFIX}/man/man1 - @${MKDIR} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 + .for dir in graphics levels music scores sounds @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}) .endfor @${CHMOD} 777 ${DATADIR}/scores -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for docfile in ChangeLog CREDITS README - ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} + +post-install: + @(cd ${DATADIR}/levels/Snake_Bite/snake_bite && ${MV} "CBM 64" CBM_64 && \ + ${MV} "editor reference" editor_reference) + +.for s in ${ICON_SIZES} + ${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ + ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - @${MKDIR} ${DOCSDIR}/elements - ${INSTALL_DATA} ${WRKSRC}/docs/elements/*.txt ${DOCSDIR}/elements + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREF= IX}/share/pixmaps + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} + ${MKDIR} ${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} .endif =20 +# Dynamically generate part of the PLIST, because the Levels are large + @${FIND} ${DATADIR}/levels/rnd_jue/ ! -type d | ${SED} 's|^${PREFIX}/||' = >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/rnd_jue/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/zelda/ ! -type d | ${SED} 's|^${PREFIX}/||' >>= ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/zelda/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/zelda2/ ! -type d | ${SED} 's|^${PREFIX}/||' >= > ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/zelda2/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Emerald_Mine_Club/ ! -type d | ${SED} 's|^${PR= EFIX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Emerald_Mine_Club/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Sokoban/ ! -type d | ${SED} 's|^${PREFIX}/||' = >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Sokoban/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Contributions/ ! -type d | ${SED} 's|^${PREFIX= }/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Contributions/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Snake_Bite/ ! -type d | ${SED} 's|^${PREFIX}/|= |' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Snake_Bite/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/BD2K3/ ! -type d | ${SED} 's|^${PREFIX}/||' >>= ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/BD2K3/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Earth_Shaker_Explosions/ ! -type d | ${SED} 's= |^${PREFIX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Earth_Shaker_Explosions/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Earth_Shaker_Old_Set_B/ ! -type d | ${SED} 's|= ^${PREFIX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Earth_Shaker_Old_Set_B/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Walpurgis_Flashbacks/ ! -type d | ${SED} 's|^$= {PREFIX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Walpurgis_Flashbacks/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Walpurgis_Gardens/ ! -type d | ${SED} 's|^${PR= EFIX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Walpurgis_Gardens/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Walpurgis_World/ ! -type d | ${SED} 's|^${PREF= IX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Walpurgis_World/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Boulder_Dash_Dream/ ! -type d | ${SED} 's|^${P= REFIX}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Boulder_Dash_Dream/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/DX_Boulderdash/ ! -type d | ${SED} 's|^${PREFI= X}/||' >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/DX_Boulderdash/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + @${FIND} ${DATADIR}/levels/Supaplex/ ! -type d | ${SED} 's|^${PREFIX}/||'= >> ${TMPPLIST} + @${FIND} -ds ${DATADIR}/levels/Supaplex/ -type d | \ + ${SED} -E -e 's,(.*),@unexec ${RMDIR} \1 2>/dev/null || true,' >> ${TMPP= LIST} + .include <bsd.port.mk> diff -ruN --exclude=3DCVS /usr/ports/games/rocksndiamonds/distinfo ./distin= fo --- /usr/ports/games/rocksndiamonds/distinfo 2012-12-05 00:44:52.000000000 = +0100 +++ ./distinfo 2012-12-21 22:01:29.000000000 +0100 @@ -1,2 +1,36 @@ -SHA256 (rocksndiamonds-3.3.0.1.tar.gz) =3D 974897f14136ecec91c7bdded8d904d= 74f2064a6c8a6c6c83f2f7111108747d3 -SIZE (rocksndiamonds-3.3.0.1.tar.gz) =3D 2494558 +SHA256 (rocksndiamonds/rocksndiamonds-3.3.0.1.tar.gz) =3D 974897f14136ecec= 91c7bdded8d904d74f2064a6c8a6c6c83f2f7111108747d3 +SIZE (rocksndiamonds/rocksndiamonds-3.3.0.1.tar.gz) =3D 2494558 +SHA256 (rocksndiamonds/rnd_jue-v8_1.zip) =3D f9c48ecb6f04c0d70a49e48cfc477= b4927fca3d7b3222eba6a681ed0faf78a91 +SIZE (rocksndiamonds/rnd_jue-v8_1.zip) =3D 18756864 +SHA256 (rocksndiamonds/ZeldaII-1.0.0.zip) =3D bec04b0448f18f1b796972cccef7= 36ad250b782d08fad35d1387e5b9a05d3e32 +SIZE (rocksndiamonds/ZeldaII-1.0.0.zip) =3D 11542241 +SHA256 (rocksndiamonds/Zelda-1.0.0.zip) =3D 6c50778224d76a0c708eddcb2a505c= 5a38cc57092f05bee9c4d58e2bb519a5e1 +SIZE (rocksndiamonds/Zelda-1.0.0.zip) =3D 2175860 +SHA256 (rocksndiamonds/Emerald_Mine_Club-2.1.1.7z) =3D a9d69fe3bfb46ff5525= e713dadadfb04022b18ab76d0a0f6628e469468ca9841 +SIZE (rocksndiamonds/Emerald_Mine_Club-2.1.1.7z) =3D 20992125 +SHA256 (rocksndiamonds/Sokoban-1.0.0.zip) =3D 63f9d36789edca22c0f9454202f9= fd21fcee89111642459b5882314f13ebdc0e +SIZE (rocksndiamonds/Sokoban-1.0.0.zip) =3D 295339 +SHA256 (rocksndiamonds/Contributions-1.2.0.zip) =3D d533dc69cd136d2bb7d76d= 674ab087285799191e0a516320aba8ac2368ce6dd2 +SIZE (rocksndiamonds/Contributions-1.2.0.zip) =3D 9499312 +SHA256 (rocksndiamonds/Snake_Bite-1.0.0.zip) =3D 6f6b573d89588f56cb3b326f3= a42fb57277307bd709713dbef329885ac4d006d +SIZE (rocksndiamonds/Snake_Bite-1.0.0.zip) =3D 6506066 +SHA256 (rocksndiamonds/BD2K3-1.0.0.zip) =3D 5fc5130c859e69d6907bff87e01ff2= 296d59f7376202a8aacc03e55f359fb351 +SIZE (rocksndiamonds/BD2K3-1.0.0.zip) =3D 4715324 +SHA256 (rocksndiamonds/Earth_Shaker_Explosions_v1-1.zip) =3D 79690bcd4b0e6= d5e487509e2b8218005800e0bd62ae987df7a73a9ebc2948d53 +SIZE (rocksndiamonds/Earth_Shaker_Explosions_v1-1.zip) =3D 319722 +SHA256 (rocksndiamonds/Earth_Shaker_Old_Set_B_v1-2.zip) =3D e6900a2bc0aa0c= 3ae61bd3b38d9a681ec7f2145ac5793b0a64ac5d6a4eb63992 +SIZE (rocksndiamonds/Earth_Shaker_Old_Set_B_v1-2.zip) =3D 301070 +SHA256 (rocksndiamonds/Walpurgis_Flashbacks_v1-3.zip) =3D b15c4fdbf329a000= f47ecf57f0e17b6341cdd0d89549a4c8f162d2f0e4590aa5 +SIZE (rocksndiamonds/Walpurgis_Flashbacks_v1-3.zip) =3D 40859 +SHA256 (rocksndiamonds/Walpurgis_Gardens_v1-0.zip) =3D 4dc19d7fff4d15ba377= 8f32e0024caf9bc646809ec367c115b1c9bdd2b4b3090 +SIZE (rocksndiamonds/Walpurgis_Gardens_v1-0.zip) =3D 828905 +SHA256 (rocksndiamonds/Walpurgis_World_v1-0.zip) =3D 1d68835f5e70c2fa8f21a= 07fa1d0c27a7b7ded9821288d095c25460fe86043d7 +SIZE (rocksndiamonds/Walpurgis_World_v1-0.zip) =3D 202647 +SHA256 (rocksndiamonds/Boulder_Dash_Dream-1.0.0.zip) =3D 6f9dc48023830fbdc= 318d8f18013b5a7e84ab3c815ba566a4a2c46faeb65c969 +SIZE (rocksndiamonds/Boulder_Dash_Dream-1.0.0.zip) =3D 10923437 +SHA256 (rocksndiamonds/rockslevels-sp-1.0.tar.gz) =3D 770d75a5926bb924c678= 7a6f95ee9f7af743b629ea14005ab0375b57eb488f25 +SIZE (rocksndiamonds/rockslevels-sp-1.0.tar.gz) =3D 373564 +SHA256 (rocksndiamonds/rockslevels-dx-1.0.tar.gz) =3D 23f1710710eef1dcd1c4= 90670de16d2d58dc98f3fdd9a2df186bdca590e57579 +SIZE (rocksndiamonds/rockslevels-dx-1.0.tar.gz) =3D 211151 +SHA256 (rocksndiamonds/rocksndiamonds_icons.zip) =3D 8216932b9f7a3dc9297c9= 5ee074bd93a65ab40eb50cfb24194d35f4fa881efce +SIZE (rocksndiamonds/rocksndiamonds_icons.zip) =3D 4419 diff -ruN --exclude=3DCVS /usr/ports/games/rocksndiamonds/files/patch-ad ./= files/patch-ad --- /usr/ports/games/rocksndiamonds/files/patch-ad 2012-12-05 00:44:52.0000= 00000 +0100 +++ ./files/patch-ad 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/libgame/sound.c.orig Sat Jul 19 15:53:46 2003 -+++ src/libgame/sound.c Sat Jul 19 15:54:26 2003 -@@ -26,7 +26,7 @@ - #include <sys/ioctl.h> - #include <linux/soundcard.h> - #elif defined(PLATFORM_FREEBSD) --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #elif defined(PLATFORM_NETBSD) - #include <sys/ioctl.h> - #include <sys/audioio.h> diff -ruN --exclude=3DCVS /usr/ports/games/rocksndiamonds/files/patch-ag ./= files/patch-ag --- /usr/ports/games/rocksndiamonds/files/patch-ag 2012-12-05 00:44:52.0000= 00000 +0100 +++ ./files/patch-ag 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ ---- src/libgame/joystick.c.orig Sat Jul 19 16:12:04 2003 -+++ src/libgame/joystick.c Sat Jul 19 16:16:51 2003 -@@ -11,12 +11,12 @@ - * joystick.c * - ***********************************************************/ -=20 --#if defined(PLATFORM_FREEBSD) --#include <machine/joystick.h> --#endif -- - #include "joystick.h" - #include "misc.h" -+ -+#if defined(PLATFORM_FREEBSD) -+#include <sys/joystick.h> -+#endif -=20 -=20 - /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= */ diff -ruN --exclude=3DCVS /usr/ports/games/rocksndiamonds/files/patch-src-g= ame_em-sound.c ./files/patch-src-game_em-sound.c --- /usr/ports/games/rocksndiamonds/files/patch-src-game_em-sound.c 2012-12= -05 00:44:52.000000000 +0100 +++ ./files/patch-src-game_em-sound.c 2012-12-12 02:17:50.000000000 +0100 @@ -1,5 +1,5 @@ ---- src/game_em/sound.c.orig Sun Apr 24 04:02:41 2005 -+++ src/game_em/sound.c Sat Oct 8 20:13:38 2005 +--- src/game_em/sound.c.orig 2007-04-25 23:37:09.000000000 +0200 ++++ src/game_em/sound.c 2012-12-12 02:10:57.000000000 +0100 @@ -10,15 +10,8 @@ =20 #if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD) @@ -14,5 +14,5 @@ -#include <soundcard.h> -#endif =20 - #include "global.h" - #include "sample.h" + static char audioname[] =3D "/dev/audio"; +=20 diff -ruN --exclude=3DCVS /usr/ports/games/rocksndiamonds/pkg-plist ./pkg-p= list --- /usr/ports/games/rocksndiamonds/pkg-plist 2012-12-05 00:44:52.000000000= +0100 +++ ./pkg-plist 2012-12-21 03:28:04.000000000 +0100 @@ -1,238 +1,10 @@ bin/rocksndiamonds -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/elements/acid.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/acid_pool_bottom.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/acid_pool_bottomleft.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/acid_pool_bottomright.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/acid_pool_topleft.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/acid_pool_topright.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_dead.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_drop.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_dry.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_full.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_to_diamond.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_wet.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/any_element.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/arrow_down.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/arrow_left.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/arrow_right.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/arrow_up.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_any.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_down.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_left.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_none.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_right.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_up.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_amoeba.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_butterfly.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_diamond.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_firefly.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_magic_wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_rock.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bd_wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/biomaze.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/black_orb.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bomb.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/bug.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/char.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/char_space.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/conveyor_belt.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/conveyor_belt_switch.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/crystal.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/current_ce_score.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/current_ce_value.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/custom.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dark_yamyam.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dc_gate_fake_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dc_gate_white.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dc_gate_white_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dc_key_white.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dc_landmine.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dc_magic_wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/diamond.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dragon.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dx_supabomb.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dynabomb_increase_number.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dynabomb_increase_power.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dynabomb_increase_size.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dynamite.active.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/dynamite.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_exit_closed.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_exit_open.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_1.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_1_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_2.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_2_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_3.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_3_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_4.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_4_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_key_1.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_key_2.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_key_3.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_key_4.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_steel_exit_closed.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/em_steel_exit_open.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_android.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_dripper.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_fake_acid.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_fake_grass.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_5.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_5_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_6.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_6_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_7.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_7_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_8.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_8_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_grass.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_5.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_6.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_7.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_8.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_lenses.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_magic_ball.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_magic_ball_switch.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_magnifier.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_plant.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emc_spring_bumper.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/emerald.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/empty_space.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/envelope.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/exit_closed.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/exit_open.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/expandable_wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/expandable_wall_any.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/expandable_wall_horizontal.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/expandable_wall_vertical.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/extra_time.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/frankie.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/from_level_template.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/game_of_life.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_1.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_1_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_2.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_2_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_3.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_3_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_4.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/gate_4_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/group.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/invisible_sand.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/invisible_steelwall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/invisible_wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/key_1.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/key_2.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/key_3.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/key_4.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/lamp.active.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/lamp.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/landmine.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/light_switch.active.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/light_switch.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/magic_wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/mole.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/next_ce.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/nut.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/pacman.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/pearl.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/penguin.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/pig.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/player_1.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/player_2.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/player_3.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/player_4.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/prev_ce.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_empty.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_fast_empty.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_fast_full.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_full.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/robot.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/robot_wheel.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/rock.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sand.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/satellite.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/self.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/shield_deadly.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/shield_normal.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sign.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_field_empty.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_field_full.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_field_player.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_object.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_base.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_buggy_base.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_chip_bottom.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_chip_left.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_chip_right.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_chip_single.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_chip_top.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_disk_orange.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_disk_red.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_disk_yellow.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_electron.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_exit_closed.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_gravity_off_port.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_gravity_on_port.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_gravity_port.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_base_1.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_base_2.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_base_3.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_base_4.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_base_5.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_base_6.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_blue.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_gray.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_green.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_red.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_hardware_yellow.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_infotron.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_murphy.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_port.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_port_any.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_port_horizontal.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_port_vertical.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_sniksnak.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_terminal.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/sp_zonk.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/spaceship.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/speed_pill.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/spring.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/steel_char.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/steel_exit_closed.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/steel_exit_open.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/steelwall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/steelwall_slippery.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/stoneblock.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/switchgate.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/switchgate_switch.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/time_orb_empty.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/time_orb_full.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/timegate_closed.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/timegate_open.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/timegate_switch.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/trap.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/trigger_ce_score.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/trigger_ce_value.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/trigger_element.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/trigger_player.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/tube.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/unknown.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/unused.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_bd_diamond.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_crystal.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_diamond.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_emerald.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_emerald_purple.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_emerald_red.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_emerald_yellow.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_pearl.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/wall_slippery.txt -%%PORTDOCS%%%%DOCSDIR%%/elements/yamyam.txt +share/icons/hicolor/32x32/apps/rocksndiamonds.png +share/icons/hicolor/48x48/apps/rocksndiamonds.png +share/icons/hicolor/64x64/apps/rocksndiamonds.png +share/icons/hicolor/72x72/apps/rocksndiamonds.png +share/icons/hicolor/96x96/apps/rocksndiamonds.png +share/pixmaps/rocksndiamonds.png %%DATADIR%%/graphics/gfx_classic/RocksBusy.pcx %%DATADIR%%/graphics/gfx_classic/RocksCE.pcx %%DATADIR%%/graphics/gfx_classic/RocksDC.pcx @@ -752,9 +524,9 @@ %%DATADIR%%/sounds/snd_classic/zisch.wav %%DATADIR%%/sounds/snd_classic/zonkdown.wav %%DATADIR%%/sounds/snd_classic/zonkpush.wav -@exec mkdir -p %D/%%DATADIR%%/scores @dirrm %%DATADIR%%/sounds/snd_classic @dirrm %%DATADIR%%/sounds +@dirrm %%DATADIR%%/scores @dirrm %%DATADIR%%/music/mus_classic @dirrm %%DATADIR%%/music @dirrm %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/tapes @@ -771,7 +543,16 @@ @dirrm %%DATADIR%%/levels @dirrm %%DATADIR%%/graphics/gfx_classic @dirrm %%DATADIR%%/graphics -@dirrmtry %%DATADIR%%/scores -@dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/elements -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%% +@dirrmtry share/icons/hicolor/96x96/apps +@dirrmtry share/icons/hicolor/96x96 +@dirrmtry share/icons/hicolor/72x72/apps +@dirrmtry share/icons/hicolor/72x72 +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons =3D=3D=3D> Done --MP_/2_gILeo5pzsExjam5uMDD0Z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212212230.qBLMU0ZH071007>