pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/minami Get a bit further with gcc3 - no more mul...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/71d279fd54a3
branches:  trunk
changeset: 466477:71d279fd54a3
user:      agc <agc%pkgsrc.org@localhost>
date:      Mon Jan 19 08:45:48 2004 +0000

description:
Get a bit further with gcc3 - no more multiline string constants in
the C source in the distribution.  There are still multi-line C
strings in the generated C source, but I'll leave that for someone
more versed in Perl than I am.

diffstat:

 games/minami/distinfo         |    5 +-
 games/minami/patches/patch-ac |  165 +++++++++++++++++
 games/minami/patches/patch-ad |  387 ++++++++++++++++++++++++++++++++++++++++++
 games/minami/patches/patch-ae |   21 ++
 4 files changed, 577 insertions(+), 1 deletions(-)

diffs (truncated from 600 to 300 lines):

diff -r 3e78a0db384a -r 71d279fd54a3 games/minami/distinfo
--- a/games/minami/distinfo     Mon Jan 19 05:11:44 2004 +0000
+++ b/games/minami/distinfo     Mon Jan 19 08:45:48 2004 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.4 2002/11/15 00:23:48 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/01/19 08:45:48 agc Exp $
 
 SHA1 (minami-1.0.2.tgz) = c64f0e7dfd29e9cf6569a37ad0c21639c0ddf070
 Size (minami-1.0.2.tgz) = 89527 bytes
 SHA1 (patch-aa) = 72b8b91d8a9a1926054c677ef6de959af1494500
 SHA1 (patch-ab) = 084ba46c1c7ddaa00d8624f6e896acac35b4d395
+SHA1 (patch-ac) = e94288b6bf92d00eed3b315c2b5e18940e1e96eb
+SHA1 (patch-ad) = 090f186b5292ca99dbdef267a82faa2ab21586a4
+SHA1 (patch-ae) = 51da678696ac130c184f35811d833f4ab214a08a
 SHA1 (patch-af) = 55e015142821cc8abffc0852c264b68d2f46c280
diff -r 3e78a0db384a -r 71d279fd54a3 games/minami/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/minami/patches/patch-ac     Mon Jan 19 08:45:48 2004 +0000
@@ -0,0 +1,165 @@
+$NetBSD: patch-ac,v 1.3 2004/01/19 08:45:48 agc Exp $
+
+--- action.c   2004/01/19 00:15:08     1.1
++++ action.c   2004/01/19 00:18:13
+@@ -36,8 +36,8 @@
+ hook_action_talk(int cur_scene, const char *verb, const char *obj)
+ {
+     if(you.f_ignore_talk){
+-      fmtmsg("Ïä·¤«¤±¤è¤¦¤È¤·¤¿¤¬¡¤¤¢¤Ê¤¿¤Ï̵»ë¤µ¤ì¤¿¡£
+-Ãå¤Æ¤¤¤ë¤â¤Î¤¬¤¤¤±¤Ê¤¤¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£", obj);
++      fmtmsg("Ïä·¤«¤±¤è¤¦¤È¤·¤¿¤¬¡¤¤¢¤Ê¤¿¤Ï̵»ë¤µ¤ì¤¿¡£\n"
++"Ãå¤Æ¤¤¤ë¤â¤Î¤¬¤¤¤±¤Ê¤¤¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£", obj);
+       return MIN_OK;
+     }
+     
+@@ -102,80 +102,80 @@
+ int
+ def_action_help(int cur_scene, const char *verb, const char *obj)
+ {
+-    fmtmsg("
+-¥³¥Þ¥ó¥É¤Ï´ðËÜŪ¤Ë
+-
+-[Æ°»ì] [ÌÜŪ¸ì]
+-
+-¤Ç»Ø¼¨¤¹¤ë¡£Âçʸ»ú¾®Ê¸»ú¤Ï̵»ë¤µ¤ì¤ë¡£
+-ÌÜŪ¸ì¤ò¾Êά¤¹¤ë¤ÈŬÅö¤ÊÁê¼ê¤¬Áª¤Ð¤ì¤ë¡£
+-¤è¤¯»È¤¦¥³¥Þ¥ó¥É¤Ï°ìʸ»ú¤ò¥¿¥¤¥×¤¹¤ë¤À¤±¤Ç¤è¤¤¡£
+-
+---¤è¤¯»È¤¦¥³¥Þ¥ó¥É--
+-
+-$bH$nelp ¤Þ¤¿¤Ï ? :¤³¤Îʸ¾Ï¤òɽ¼¨
+-$bE$nast            :Åì¤ØÊ⤯
+-$bW$nest            :À¾¤ØÊ⤯
+-$bN$north           :Ë̤ØÊ⤯
+-$bS$nouth           :Æî¤ØÊ⤯
+-$bI$nnventory :½ê»ý¶â/»ý¤Áʪɽ¼¨
+-Enter         :Ãæ¤ËÆþ¤ë
+-Exit          :Ã椫¤é½Ð¤ë
+-Look          :¤¢¤¿¤ê¤ò¸«¤ï¤¿¤¹
+-Use           :Æ»¶ñ¤ò»ÈÍѤ¹¤ë/Éð´ï¤òÁõÈ÷¤¹¤ë
+-Wear/Put on   :Ãå¤ë/Èï¤ë
+-Take off      :椰/Éð´ï¤ÎÁõÈ÷¤ò²ò¤¯
+-Buy           :Ç㤦
+-Open          :³«¤±¤ë
+-Close         :ÊĤ¸¤ë
+-
+-License               :¥²¡¼¥à¤Î¥é¥¤¥»¥ó¥¹¤Îɽ¼¨
+-Version               :¥Ð¡¼¥¸¥ç¥ó¤Îɽ¼¨
+-
+-Save <file>   :¥²¡¼¥à¤ò<file>¤ËÊݸ¤·¤ÆÃæÃǤ¹¤ë
+-$P
+-¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë .minamirc¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¤³¤È¤Ë¤è¤ê¡¤
+-¼«Ê¬¤Î̾Á°¤ä¥é¥¹¥Ü¥¹¤Î̾Á°¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
+-
+---ÀßÄêÎã--
+-name=°ìÀ®
+-friend=ÃÒ»Ò
+-nemesis=¼ÒĹ
+-");
++    fmtmsg("\n"
++"¥³¥Þ¥ó¥É¤Ï´ðËÜŪ¤Ë\n"
++"\n"
++"[Æ°»ì] [ÌÜŪ¸ì]\n"
++"\n"
++"¤Ç»Ø¼¨¤¹¤ë¡£Âçʸ»ú¾®Ê¸»ú¤Ï̵»ë¤µ¤ì¤ë¡£\n"
++"ÌÜŪ¸ì¤ò¾Êά¤¹¤ë¤ÈŬÅö¤ÊÁê¼ê¤¬Áª¤Ð¤ì¤ë¡£\n"
++"¤è¤¯»È¤¦¥³¥Þ¥ó¥É¤Ï°ìʸ»ú¤ò¥¿¥¤¥×¤¹¤ë¤À¤±¤Ç¤è¤¤¡£\n"
++"\n"
++"--¤è¤¯»È¤¦¥³¥Þ¥ó¥É--\n"
++"\n"
++"$bH$nelp ¤Þ¤¿¤Ï ? :¤³¤Îʸ¾Ï¤òɽ¼¨\n"
++"$bE$nast            :Åì¤ØÊ⤯\n"
++"$bW$nest            :À¾¤ØÊ⤯\n"
++"$bN$north           :Ë̤ØÊ⤯\n"
++"$bS$nouth           :Æî¤ØÊ⤯\n"
++"$bI$nnventory        :½ê»ý¶â/»ý¤Áʪɽ¼¨\n"
++"Enter                :Ãæ¤ËÆþ¤ë\n"
++"Exit         :Ã椫¤é½Ð¤ë\n"
++"Look         :¤¢¤¿¤ê¤ò¸«¤ï¤¿¤¹\n"
++"Use          :Æ»¶ñ¤ò»ÈÍѤ¹¤ë/Éð´ï¤òÁõÈ÷¤¹¤ë\n"
++"Wear/Put on  :Ãå¤ë/Èï¤ë\n"
++"Take off     :椰/Éð´ï¤ÎÁõÈ÷¤ò²ò¤¯\n"
++"Buy          :Ç㤦\n"
++"Open         :³«¤±¤ë\n"
++"Close                :ÊĤ¸¤ë\n"
++"\n"
++"License              :¥²¡¼¥à¤Î¥é¥¤¥»¥ó¥¹¤Îɽ¼¨\n"
++"Version              :¥Ð¡¼¥¸¥ç¥ó¤Îɽ¼¨\n"
++"\n"
++"Save <file>  :¥²¡¼¥à¤ò<file>¤ËÊݸ¤·¤ÆÃæÃǤ¹¤ë\n"
++"$P\n"
++"¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë .minamirc¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¤³¤È¤Ë¤è¤ê¡¤\n"
++"¼«Ê¬¤Î̾Á°¤ä¥é¥¹¥Ü¥¹¤Î̾Á°¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¡£\n"
++"\n"
++"--ÀßÄêÎã--\n"
++"name=°ìÀ®\n"
++"friend=ÃÒ»Ò\n"
++"nemesis=¼ÒĹ\n"
++);
+     return cur_scene;
+ }
+ 
+ int
+ def_action_license(int cur_scene, const char *verb, const char *obj)
+ {
+-    rawmsg("
+-MINAMI SHINJUKU ADVENTURE
+-
+-Copyright (c) 2001
+-    Issei Numata and ASCII CORPORATION. All rights reserved.
+-
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions
+-are met:
+-1. Redistributions of source code must retain the above copyright
+-   notice, this list of conditions and the following disclaimer,
+-   verbatim and that no modifications are made prior to this
+-   point in the file.
+-2. Redistributions in binary form must reproduce the above copyright
+-   notice, this list of conditions and the following disclaimer in the
+-   documentation and/or other materials provided with the distribution.
+-
+-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND
+-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR THEIR PETS BE LIABLE
+-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+-OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)
+-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+-SUCH DAMAGE.
+-");
++    rawmsg("\n"
++"MINAMI SHINJUKU ADVENTURE\n"
++"\n"
++"Copyright (c) 2001\n"
++"    Issei Numata and ASCII CORPORATION. All rights reserved.\n"
++"\n"
++"Redistribution and use in source and binary forms, with or without\n"
++"modification, are permitted provided that the following conditions\n"
++"are met:\n"
++"1. Redistributions of source code must retain the above copyright\n"
++"   notice, this list of conditions and the following disclaimer,\n"
++"   verbatim and that no modifications are made prior to this\n"
++"   point in the file.\n"
++"2. Redistributions in binary form must reproduce the above copyright\n"
++"   notice, this list of conditions and the following disclaimer in the\n"
++"   documentation and/or other materials provided with the distribution.\n"
++"\n"
++"THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND\n"
++"ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
++"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"
++"ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR THEIR PETS BE LIABLE\n"
++"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n"
++"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n"
++"OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)\n"
++"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n"
++"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n"
++"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n"
++"SUCH DAMAGE.\n"
++);
+     return cur_scene;
+ }
diff -r 3e78a0db384a -r 71d279fd54a3 games/minami/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/minami/patches/patch-ad     Mon Jan 19 08:45:48 2004 +0000
@@ -0,0 +1,387 @@
+$NetBSD: patch-ad,v 1.3 2004/01/19 08:45:48 agc Exp $
+
+--- misc.c     2004/01/19 08:12:47     1.1
++++ misc.c     2004/01/19 08:30:17
+@@ -285,209 +285,209 @@
+     if(typ == 0){
+       switch(n){
+       case 1:
+-          fmtmsg("
+-        -----   -----
+-        |   |   |   |
+-        |   |   | > |
+-        |   |   |   |
+-        --+--   -----
+-          #
+------   --+--   -----
+-|   |   |   |   |   |
+-|   +###+   +###+   |
+-|   |   |   |   |   |
+---+--   -----   --+--
+-  #               #
+---+--   -----   --+--
+-|   |   |   |   |   |
+-|<  |   |<  |   |  >|
+-|   |   |   |   |   |
+------   --#--   -----
+-          #
+-###########
+-");
++          fmtmsg("\n"
++"        -----   -----\n"
++"        |   |   |   |\n"
++"        |   |   | > |\n"
++"        |   |   |   |\n"
++"        --+--   -----\n"
++"          #\n"
++"-----   --+--   -----\n"
++"|   |   |   |   |   |\n"
++"|   +###+   +###+   |\n"
++"|   |   |   |   |   |\n"
++"--+--   -----   --+--\n"
++"  #               #\n"
++"--+--   -----   --+--\n"
++"|   |   |   |   |   |\n"
++"|<  |   |<  |   |  >|\n"
++"|   |   |   |   |   |\n"
++"-----   --#--   -----\n"
++"          #\n"
++"###########\n"
++);
+           break;
+       case 2:
+-          fmtmsg("
+------   -----   -----
+-|   |   |   |   |   |
+-|   +###+   |   | < |
+-|   |   |   |   |   |
+---+--   --+--   --+--
+-  #       #       #
+---+--   --+--   --+--
+-|   |   |   |   |   |
+-|   |   |   +###+   |
+-|   |   |   |   |   |
+---+--   -----   --+--
+-  #               #
+---+--   -----   --+--
+-|   |   |   |   |   |
+-| > |   |< >|   | < |
+-|   |   |   |   |   |
+------   -----   -----
+-");
++          fmtmsg("\n"
++"-----   -----   -----\n"
++"|   |   |   |   |   |\n"
++"|   +###+   |   | < |\n"
++"|   |   |   |   |   |\n"
++"--+--   --+--   --+--\n"
++"  #       #       #\n"
++"--+--   --+--   --+--\n"
++"|   |   |   |   |   |\n"
++"|   |   |   +###+   |\n"
++"|   |   |   |   |   |\n"
++"--+--   -----   --+--\n"
++"  #               #\n"
++"--+--   -----   --+--\n"
++"|   |   |   |   |   |\n"
++"| > |   |< >|   | < |\n"
++"|   |   |   |   |   |\n"
++"-----   -----   -----\n"
++);
+           break;
+       case 3:
+-          fmtmsg("
+-        -----   -----
+-        |   |   |   |
+-        | { +###+   |
+-        |   |   |   |
+-        --+--   -----
+-          #
+------   --+--   -----
+-|   |   |   |   |   |
+-|   +###+   +###+   |
+-|   |   |   |   |   |
+---+--   -----   --+--
+-  #               #
+---+--   -----   --+--
+-|   |   |   |   |   |
+-|<  |   |< >|   |  >|
+-|   |   |   |   |   |
+------   -----   -----
+-");
++          fmtmsg("\n"



Home | Main Index | Thread Index | Old Index