From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 2 15:50:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 26A671C9 for ; Sat, 2 Nov 2013 15:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 011452AF6 for ; Sat, 2 Nov 2013 15:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2Fo0k8027230 for ; Sat, 2 Nov 2013 15:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rA2Fo0YG027229; Sat, 2 Nov 2013 15:50:00 GMT (envelope-from gnats) Resent-Date: Sat, 2 Nov 2013 15:50:00 GMT Resent-Message-Id: <201311021550.rA2Fo0YG027229@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yoshihiko Sarumaru Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 86F3CF6B for ; Sat, 2 Nov 2013 15:40:28 +0000 (UTC) (envelope-from sarumaru@yamayuri.org) Received: from yumi.yamayuri.org (yumi.yamayuri.org [218.45.22.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1F292AB5 for ; Sat, 2 Nov 2013 15:40:24 +0000 (UTC) Received: from yumi.yamayuri.org (sarumaru@localhost [127.0.0.1]) by yumi.yamayuri.org (8.14.5/8.14.5) with ESMTP id rA2FcTfu081453 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 3 Nov 2013 00:38:30 +0900 (JST) (envelope-from sarumaru@yamayuri.org) Received: (from sarumaru@localhost) by yumi.yamayuri.org (8.14.5/8.14.5/Submit) id rA2FcTsn081452; Sun, 3 Nov 2013 00:38:29 +0900 (JST) (envelope-from sarumaru) Message-Id: <201311021538.rA2FcTsn081452@yumi.yamayuri.org> Date: Sun, 3 Nov 2013 00:38:29 +0900 (JST) From: Yoshihiko Sarumaru To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/183590: Update port: japanese/rogue_s X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Yoshihiko Sarumaru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2013 15:50:01 -0000 >Number: 183590 >Category: ports >Synopsis: Update port: japanese/rogue_s >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 02 15:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Yoshihiko Sarumaru >Release: FreeBSD 9.1-RELEASE-p7 i386 >Organization: >Environment: System: FreeBSD yumi.yamayuri.org 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:23:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Fix build error on 10 branch and head. >How-To-Repeat: Build japanese/rogue_s on 10-STABLE or CURRENT. >Fix: Add following patch file. or just add -Wno-return-prototype to CFLAGS like manner until 9-STABLE, but this patch also fixes one missing argument error that potentially cause a runtime error. # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # files/patch-prototype # echo x - files/patch-prototype sed 's/^X//' >files/patch-prototype << '0368169738111a2e1f9a0e15e5c831cf' X--- curses.c.orig 2013-11-02 19:55:55.000000000 +0900 X+++ curses.c 2013-11-02 22:31:58.000000000 +0900 X@@ -188,6 +188,7 @@ X } X X #ifdef COLOR X+void X addch(ch) X register int ch; X { X@@ -212,6 +213,7 @@ X screen_dirty = 1; X } X #else X+void X addch(ch) X register int ch; X { X@@ -473,6 +475,7 @@ X putstr(buf); X } X #else X+void X put_cursor(row, col) X register row, col; X { X--- hit.c.orig 2013-11-02 20:59:42.000000000 +0900 X+++ hit.c 2013-11-02 22:33:21.000000000 +0900 X@@ -20,6 +20,7 @@ X extern short add_strength, ring_exp, r_rings; X extern boolean being_held, interrupted, wizard; X X+void X mon_hit(monster, other, flame) X register object *monster; X char *other; X@@ -96,6 +97,7 @@ X } X } X X+void X rogue_hit(monster, force_hit) X register object *monster; X boolean force_hit; X@@ -275,6 +277,7 @@ X return(1); X } X X+void X fight(to_the_death) X boolean to_the_death; X { X--- init.c.orig 2013-11-02 21:06:56.000000000 +0900 X+++ init.c 2013-11-02 22:34:13.000000000 +0900 X@@ -421,6 +421,7 @@ X set_opts(envbuf); X } X X+void X set_opts(env) X char *env; X { X--- invent.c.orig 2013-11-02 21:09:20.000000000 +0900 X+++ invent.c 2013-11-02 22:35:06.000000000 +0900 X@@ -44,6 +44,7 @@ X X char descs[DROWS][DCOLS]; /* multi-purpose screen saver */ X X+void X inventory(pack, mask) X object *pack; X unsigned short mask; X@@ -184,6 +185,7 @@ X } X X #ifdef JAPAN /* for whole function */ X+void X get_desc(obj, desc, capitalized) X register object *obj; X register char *desc; X@@ -567,6 +569,7 @@ X } X } X X+void X single_inv(ichar) X short ichar; X { X@@ -653,6 +656,7 @@ X { 0 } X }; X X+void X discovered() X { X short i, j, n; X--- message.c.orig 2013-11-02 21:14:34.000000000 +0900 X+++ message.c 2013-11-02 22:36:14.000000000 +0900 X@@ -27,6 +27,7 @@ X extern short add_strength; X extern short cur_level; X X+void X message(msg, intrpt) X char *msg; X boolean intrpt; X@@ -67,6 +68,7 @@ X } X } X X+void X check_message() X { X if (msg_cleared) { X--- monster.c.orig 2013-11-02 21:18:50.000000000 +0900 X+++ monster.c 2013-11-02 22:37:33.000000000 +0900 X@@ -108,6 +108,7 @@ X return(monster); X } X X+void X mv_mons() X { X register object *monster, *next_monster; X@@ -212,6 +213,7 @@ X return(monster->m_char); X } X X+void X mv_monster(monster, row, col) X register object *monster; X short row, col; X@@ -552,6 +554,7 @@ X } X } X X+void X show_monsters() X { X object *monster; X--- move.c.orig 2013-11-02 21:22:17.000000000 +0900 X+++ move.c 2013-11-02 22:38:15.000000000 +0900 X@@ -518,6 +518,7 @@ X return (*("jklhyubn" + get_rand(1, 8) - 1)); X } X X+void X heal() X { X static short heal_exp = -1, n, c = 0; X--- object.c.orig 2013-11-02 21:23:33.000000000 +0900 X+++ object.c 2013-11-02 22:39:49.000000000 +0900 X@@ -138,6 +138,7 @@ X } X #endif X X+void X put_objects() X { X short i, n; X@@ -407,6 +408,7 @@ X } X } X X+void X gr_scroll(obj) X object *obj; X { X@@ -426,6 +428,7 @@ X } X } X X+void X gr_potion(obj) X object *obj; X { X@@ -663,6 +666,7 @@ X X } X X+void X new_object_for_wizard() X { X short ch, max; X@@ -778,6 +782,7 @@ X } X X #ifndef ORIGINAL X+void X list_object(obj, max) X object *obj; X short max; X--- pack.c.orig 2013-11-02 21:28:07.000000000 +0900 X+++ pack.c 2013-11-02 21:30:48.000000000 +0900 X@@ -103,6 +103,7 @@ X return(obj); X } X X+void X drop() X { X object *obj, *new; X@@ -295,6 +296,7 @@ X } X } X X+void X wear() X { X short ch; X@@ -349,6 +351,7 @@ X obj->identified = 1; X } X X+void X wield() X { X short ch; X@@ -407,6 +410,7 @@ X rogue.weapon = (object *) 0; X } X X+void X call_it() X { X short ch; X--- play.c.orig 2013-11-02 21:32:58.000000000 +0900 X+++ play.c 2013-11-02 22:56:17.000000000 +0900 X@@ -22,6 +22,7 @@ X extern char hit_message[]; X extern boolean wizard, trap_door; X X+void X play_level() X { X short ch, cmd, oldcmd; X@@ -163,7 +164,7 @@ X #ifndef ORIGINAL X message("Japanese edition: Ver.1.3a (enhanced by ohta@src.ricoh.co.jp)", 0); X message("Ver.1.3aS program bug fix/separate (by brx@kmc.kyoto-u.ac.jp)", 0); /* by Yasha */ X-message(mesg[1]); /* for message version */ X+message(mesg[1], 0); /* for message version */ X #endif X break; X case 'Q': X@@ -353,6 +354,7 @@ X mesg[150], mesg[151], mesg[152], mesg[153], mesg[154] X }; X X+void X identify() X { X short ch, n; X--- ring.c.orig 2013-11-02 21:34:29.000000000 +0900 X+++ ring.c 2013-11-02 21:35:01.000000000 +0900 X@@ -21,6 +21,7 @@ X extern char *curse_message; X extern boolean wizard; X X+void X put_on_ring() X { X short ch; X--- rogue.h.orig 2013-11-02 22:12:31.000000000 +0900 X+++ rogue.h 2013-11-02 23:04:35.000000000 +0900 X@@ -447,6 +447,59 @@ X int onintr(); X #endif X X+void addch(int ch); X+void put_cursor(int row, int col); X+void mon_hit(object *monster, char *other, boolean flame); X+void rogue_hit(object *monster, boolean force_hit); X+void fight(boolean to_the_death); X+void set_opts(char *env); X+void inventory(object *pack, unsigned short mask); X+void get_desc(object *obj, char *desc, boolean capitalized); X+void single_inv(short ichar); X+void discovered(); X+void message(char *msg, boolean intrpt); X+void check_message(); X+void mv_mons(); X+void mv_monster(object *monster, short row, short col); X+void show_monsters(); X+void heal(); X+void put_objects(); X+void gr_scroll(object *obj); X+void gr_potion(object *obj); X+void new_object_for_wizard(); X+void list_object(object *obj, short max); X+void drop(); X+void wear(); X+void wield(); X+void call_it(); X+void play_level(); X+void identify(); X+void put_on_ring(); X+void light_passage(int row, int col); X+void dr_course(object *monster, boolean entering, short row, short col); X+void save_game(); X+void quit(boolean from_intrpt); X+void nickize(char *buf, char *score, char *n_name); X+void special_hit(object *monster); X+void rust(object *monster); X+void freeze(object *monster); X+void steal_gold(object *monster); X+void steal_item(object *monster); X+void cough_up(object *monster); X+void sting(object *monster); X+void drop_level(); X+void drain_life(); X+void throw(); X+void trap_player(short row, short col); X+void id_trap(); X+void search(short n, boolean is_auto); X+void quaff(); X+void read_scroll(); X+void idntfy(); X+void eat(); X+void hallucinate(); X+void zapp(); X+ X struct rogue_time { X short year; /* >= 1987 */ X short month; /* 1 - 12 */ X--- room.c.orig 2013-11-02 21:35:25.000000000 +0900 X+++ room.c 2013-11-02 21:36:40.000000000 +0900 X@@ -45,6 +45,7 @@ X } X } X X+void X light_passage(row, col) X { X short i, j, i_end, j_end; X@@ -324,6 +325,7 @@ X } X } X X+void X dr_course(monster, entering, row, col) X object *monster; X boolean entering; X--- save.c.orig 2013-11-02 21:37:31.000000000 +0900 X+++ save.c 2013-11-02 21:37:41.000000000 +0900 X@@ -40,6 +40,7 @@ X X extern boolean msg_cleared; X X+void X save_game() X { X char fname[64]; X--- score.c.orig 2013-11-02 21:38:54.000000000 +0900 X+++ score.c 2013-11-02 22:46:01.000000000 +0900 X@@ -397,6 +397,7 @@ X } X #endif X X+void X quit(from_intrpt) X boolean from_intrpt; X { X@@ -1076,6 +1077,7 @@ X return(r); X } X X+void X nickize(buf, score, n_name) X char *buf, *score, *n_name; X { X--- spechit.c.orig 2013-11-02 22:02:02.000000000 +0900 X+++ spechit.c 2013-11-02 22:48:49.000000000 +0900 X@@ -22,6 +22,7 @@ X extern boolean sustain_strength, maintain_armor; X extern char *you_can_move_again; X X+void X special_hit(monster) X object *monster; X { X@@ -53,6 +54,7 @@ X } X } X X+void X rust(monster) X object *monster; X { X@@ -72,6 +74,7 @@ X } X } X X+void X freeze(monster) X object *monster; X { X@@ -104,6 +107,7 @@ X } X } X X+void X steal_gold(monster) X object *monster; X { X@@ -124,6 +128,7 @@ X disappear(monster); X } X X+void X steal_item(monster) X object *monster; X { X@@ -218,6 +223,7 @@ X mon_disappeared = 1; X } X X+void X cough_up(monster) X object *monster; X { X@@ -368,6 +374,7 @@ X return(0); X } X X+void X sting(monster) X object *monster; X { X@@ -391,6 +398,7 @@ X } X } X X+void X drop_level() X { X int hp; X@@ -410,6 +418,7 @@ X add_exp(1, 0); X } X X+void X drain_life() X { X short n; X--- throw.c.orig 2013-11-02 22:07:28.000000000 +0900 X+++ throw.c 2013-11-02 22:07:40.000000000 +0900 X@@ -16,6 +16,7 @@ X extern char *curse_message; X extern char hit_message[]; X X+void X throw() X { X short wch; X--- trap.c.orig 2013-11-02 22:08:33.000000000 +0900 X+++ trap.c 2013-11-02 22:09:10.000000000 +0900 X@@ -41,6 +41,7 @@ X return(NO_TRAP); X } X X+void X trap_player(row, col) X short row, col; X { X@@ -137,6 +138,7 @@ X } X } X X+void X id_trap() X { X short dir, row, col; X@@ -172,6 +174,7 @@ X } X } X X+void X search(n, is_auto) X short n; X boolean is_auto; X--- use.c.orig 2013-11-02 22:59:31.000000000 +0900 X+++ use.c 2013-11-02 23:02:38.000000000 +0900 X@@ -1,3 +1,5 @@ X+void idntfy(); X+ X /* X * use.c X * X@@ -31,6 +33,7 @@ X extern boolean sustain_strength; X X #ifdef JAPAN X+void X quaff() X { X short ch; X@@ -268,6 +271,7 @@ X #endif /*JAPAN*/ X X #ifdef JAPAN X+void X read_scroll() X { X short ch; X@@ -550,6 +554,7 @@ X } X } X X+void X idntfy() X { X short ch; X@@ -576,6 +581,7 @@ X message(desc, 0); X } X X+void X eat() X { X short ch; X@@ -665,6 +671,7 @@ X bear_trap = 0; X } X X+void X hallucinate() X { X object *obj, *monster; X--- zap.c.orig 2013-11-02 23:03:25.000000000 +0900 X+++ zap.c 2013-11-02 23:04:10.000000000 +0900 X@@ -19,6 +19,7 @@ X X extern boolean being_held, score_only, detect_monster; X X+void X zapp() X { X short wch; 0368169738111a2e1f9a0e15e5c831cf exit >Release-Note: >Audit-Trail: >Unformatted: