CC'ing ports@ in case someone feels like OK these while Marc enjoys the
snow...
slash
* makedefs time_t fixed
* ospeed size mismatch fixed (remember that ABI change?)
* suspicious format strings fixed
* include string.h - give 64bit archs a chance
slash-em
* makedefs
* ospeed
* format strings
nethack/falconseye
* makedefs
* ospeed
Play-tested on sparc32/sparc64
Example diff, more attached:
Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/games/slash/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 10 Nov 2013 11:28:19 -0000 1.44
+++ Makefile 24 Mar 2015 00:17:50 -0000
@@ -4,7 +4,7 @@ COMMENT = dungeon explorin', hackin' gam
DISTNAME = slash-e8
PKGNAME = slash-3.2.2.e8
-REVISION = 2
+REVISION = 3
CATEGORIES = games
MASTER_SITES = ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \
@@ -14,7 +14,7 @@ MASTER_SITES = ftp://ftp.nethack.org/pub
MASTER_SITES0 = ftp://ftp.nethack.org/pub/nethack/oldver/3.2.3/src/
MASTER_SITES1 = http://www.rz.tu-ilmenau.de/~wi019/Slash/
-DISTFILES = nethack-3.2.2.tar.gz Slash-Unix.tar.gz:1
+DISTFILES = nethack-3.2.2.tar.gz Slash-Unix.tar.gz:1
PATCHFILES = nh-3.2.2-3.2.3.diff:0
Index: patches/patch-include_termcap_h
===================================================================
RCS file: patches/patch-include_termcap_h
diff -N patches/patch-include_termcap_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_termcap_h 24 Mar 2015 00:17:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/termcap.h.orig Fri Mar 20 19:25:57 2015
++++ include/termcap.h Fri Mar 20 19:26:11 2015
+@@ -43,7 +43,7 @@ extern struct tc_lcl_data { /* defined and set up in
+ #define UE tc_lcl_data.tc_UE
+ #define ul_hack tc_lcl_data.tc_ul_hack
+
+-extern short ospeed; /* set up in termcap.c */
++extern int ospeed; /* set up in termcap.c */
+
+ #ifdef TEXTCOLOR
+ # ifdef TOS
Index: patches/patch-include_unixconf_h
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/games/slash/patches/patch-include_unixconf_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-include_unixconf_h
--- patches/patch-include_unixconf_h 16 Apr 2000 21:19:07 -0000 1.1
+++ patches/patch-include_unixconf_h 24 Mar 2015 00:17:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 21:19:07 espie Exp $
--- include/unixconf.h.orig Tue Dec 10 21:20:08 1996
-+++ include/unixconf.h Fri Apr 14 15:15:02 2000
++++ include/unixconf.h Thu Mar 19 22:54:05 2015
@@ -19,12 +19,16 @@
*/
@@ -65,7 +65,15 @@ $OpenBSD: patch-include_unixconf_h,v 1.1
/* The Andrew Message System does mail a little differently from normal
* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
-@@ -286,7 +292,7 @@
+@@ -263,6 +269,7 @@
+
+ #if defined(BSD) || defined(ULTRIX)
+ # if !defined(DGUX) && !defined(SUNOS4)
++#include <string.h>
+ #define memcpy(d, s, n) bcopy(s, d, n)
+ #define memcmp(s1, s2, n) bcmp(s2, s1, n)
+ # endif
+@@ -286,7 +293,7 @@
#endif
#ifdef TIMED_DELAY
Index: patches/patch-src_botl_c
===================================================================
RCS file: patches/patch-src_botl_c
diff -N patches/patch-src_botl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_botl_c 24 Mar 2015 00:17:50 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/botl.c.orig Sat Mar 21 10:22:30 2015
++++ src/botl.c Sat Mar 21 10:25:35 2015
+@@ -543,7 +543,7 @@ bot2()
+ if (Upolyd)
+ Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
+ Sprintf(nb = eos(nb), " Level:%u Exp:%-1ld(%-1ld)",
u.ulevel,u.uexp,newuexp(u.ulevel));
+- Sprintf(nb = eos(nb), "
Wt:%ld/%ld",inv_weight()+weight_cap(),weight_cap());
++ Sprintf(nb = eos(nb), "
Wt:%d/%d",inv_weight()+weight_cap(),weight_cap());
+ if(strcmp(hu_stat[u.uhs], " ")) {
+ Sprintf(nb = eos(nb), " ");
+ Strcat(newbot2, hu_stat[u.uhs]);
+@@ -571,7 +571,7 @@ bot3()
+ else Sprintf(newbot3, "Dlvl:%-2d ", depth(&u.uz));
+ #ifdef SCORE_ON_BOTL
+ Sprintf(nb = eos(newbot3),
+- "%c:%-2ld Score:%d", oc_syms[GOLD_CLASS],
++ "%c:%-2ld Score:%ld", oc_syms[GOLD_CLASS],
+ u.ugold, botl_score());
+ Sprintf(nb = eos(nb), " Turn:%ld", moves);
+ #else
Index: patches/patch-src_dokick_c
===================================================================
RCS file: patches/patch-src_dokick_c
diff -N patches/patch-src_dokick_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dokick_c 24 Mar 2015 00:17:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/dokick.c.orig Sat Mar 21 10:26:12 2015
++++ src/dokick.c Sat Mar 21 10:27:00 2015
+@@ -76,7 +76,7 @@ register boolean clumsy;
+ }
+ dmg += u.udaminc; /* add ring(s) of increase damage */
+ if (dmg > 0) {
+- pline("You hit.[%ld pts.]",dmg);
++ pline("You hit.[%d pts.]",dmg);
+ mon->mhp -= dmg;
+ }
+ if(mon->mhp > 0 && martial() && !bigmonst(mon->data) && !rn2(3)
Index: patches/patch-src_shk_c
===================================================================
RCS file: patches/patch-src_shk_c
diff -N patches/patch-src_shk_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_shk_c 24 Mar 2015 00:17:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/shk.c.orig Sat Mar 21 10:27:30 2015
++++ src/shk.c Sat Mar 21 10:28:08 2015
+@@ -4577,7 +4577,7 @@ shk_offer_price(slang, charge, shkp)
+ char sbuf[BUFSZ];
+
+ /* Ask y/n if player wants to pay */
+- Sprintf(sbuf, "It'll cost you %ld zorkmid%s. Interested?",
++ Sprintf(sbuf, "It'll cost you %d zorkmid%s. Interested?",
+ charge, plur(charge));
+
+ if ( yn(sbuf) != 'y' )
Index: patches/patch-sys_share_unixtty_c
===================================================================
RCS file: patches/patch-sys_share_unixtty_c
diff -N patches/patch-sys_share_unixtty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sys_share_unixtty_c 24 Mar 2015 00:17:51 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- sys/share/unixtty.c.orig Sat Mar 21 10:16:45 2015
++++ sys/share/unixtty.c Sat Mar 21 10:18:17 2015
+@@ -120,9 +120,9 @@ struct tchars inittyb2, curttyb2;
+ # ifndef LINT
+ extern /* it is defined in libtermlib (libtermcap) */
+ # endif
+- short ospeed; /* terminal baudrate; set by gettty */
++ int ospeed; /* terminal baudrate; set by gettty */
+ #else
+-short ospeed = 0; /* gets around "not defined" error message */
++int ospeed = 0; /* gets around "not defined" error message */
+ #endif
+
+ #if defined(POSIX_TYPES) && defined(BSD)
Index: patches/patch-util_makedefs_c
===================================================================
RCS file: patches/patch-util_makedefs_c
diff -N patches/patch-util_makedefs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_makedefs_c 24 Mar 2015 00:17:51 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- util/makedefs.c.orig Thu Mar 19 22:28:24 2015
++++ util/makedefs.c Thu Mar 19 22:30:27 2015
+@@ -526,7 +526,7 @@ const char *build_date;
+ void
+ do_date()
+ {
+- long clocktim = 0;
++ time_t clocktim = 0;
+ char *c, cbuf[60], buf[BUFSZ];
+ const char *ul_sfx;
+
+@@ -557,7 +557,7 @@ do_date()
+ ul_sfx = "L";
+ #endif
+ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf);
+- Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", clocktim);
++ Fprintf(ofp,"#define BUILD_TIME (%lldLL)\n", (long long)clocktim);
+ Fprintf(ofp,"\n");
+ Fprintf(ofp,"#define VERSION_NUMBER 0x%08lx%s\n",
+ version.incarnation, ul_sfx);
Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/games/slash/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 10 Nov 2013 11:28:19 -0000 1.44
+++ Makefile 24 Mar 2015 00:17:50 -0000
@@ -4,7 +4,7 @@ COMMENT = dungeon explorin', hackin' gam
DISTNAME = slash-e8
PKGNAME = slash-3.2.2.e8
-REVISION = 2
+REVISION = 3
CATEGORIES = games
MASTER_SITES = ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \
@@ -14,7 +14,7 @@ MASTER_SITES = ftp://ftp.nethack.org/pub
MASTER_SITES0 = ftp://ftp.nethack.org/pub/nethack/oldver/3.2.3/src/
MASTER_SITES1 = http://www.rz.tu-ilmenau.de/~wi019/Slash/
-DISTFILES = nethack-3.2.2.tar.gz Slash-Unix.tar.gz:1
+DISTFILES = nethack-3.2.2.tar.gz Slash-Unix.tar.gz:1
PATCHFILES = nh-3.2.2-3.2.3.diff:0
Index: patches/patch-include_termcap_h
===================================================================
RCS file: patches/patch-include_termcap_h
diff -N patches/patch-include_termcap_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_termcap_h 24 Mar 2015 00:17:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/termcap.h.orig Fri Mar 20 19:25:57 2015
++++ include/termcap.h Fri Mar 20 19:26:11 2015
+@@ -43,7 +43,7 @@ extern struct tc_lcl_data { /* defined and set up in
+ #define UE tc_lcl_data.tc_UE
+ #define ul_hack tc_lcl_data.tc_ul_hack
+
+-extern short ospeed; /* set up in termcap.c */
++extern int ospeed; /* set up in termcap.c */
+
+ #ifdef TEXTCOLOR
+ # ifdef TOS
Index: patches/patch-include_unixconf_h
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/games/slash/patches/patch-include_unixconf_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-include_unixconf_h
--- patches/patch-include_unixconf_h 16 Apr 2000 21:19:07 -0000 1.1
+++ patches/patch-include_unixconf_h 24 Mar 2015 00:17:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-include_unixconf_h,v 1.1 2000/04/16 21:19:07 espie Exp $
--- include/unixconf.h.orig Tue Dec 10 21:20:08 1996
-+++ include/unixconf.h Fri Apr 14 15:15:02 2000
++++ include/unixconf.h Thu Mar 19 22:54:05 2015
@@ -19,12 +19,16 @@
*/
@@ -65,7 +65,15 @@ $OpenBSD: patch-include_unixconf_h,v 1.1
/* The Andrew Message System does mail a little differently from normal
* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
-@@ -286,7 +292,7 @@
+@@ -263,6 +269,7 @@
+
+ #if defined(BSD) || defined(ULTRIX)
+ # if !defined(DGUX) && !defined(SUNOS4)
++#include <string.h>
+ #define memcpy(d, s, n) bcopy(s, d, n)
+ #define memcmp(s1, s2, n) bcmp(s2, s1, n)
+ # endif
+@@ -286,7 +293,7 @@
#endif
#ifdef TIMED_DELAY
Index: patches/patch-src_botl_c
===================================================================
RCS file: patches/patch-src_botl_c
diff -N patches/patch-src_botl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_botl_c 24 Mar 2015 00:17:50 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/botl.c.orig Sat Mar 21 10:22:30 2015
++++ src/botl.c Sat Mar 21 10:25:35 2015
+@@ -543,7 +543,7 @@ bot2()
+ if (Upolyd)
+ Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
+ Sprintf(nb = eos(nb), " Level:%u Exp:%-1ld(%-1ld)",
u.ulevel,u.uexp,newuexp(u.ulevel));
+- Sprintf(nb = eos(nb), "
Wt:%ld/%ld",inv_weight()+weight_cap(),weight_cap());
++ Sprintf(nb = eos(nb), "
Wt:%d/%d",inv_weight()+weight_cap(),weight_cap());
+ if(strcmp(hu_stat[u.uhs], " ")) {
+ Sprintf(nb = eos(nb), " ");
+ Strcat(newbot2, hu_stat[u.uhs]);
+@@ -571,7 +571,7 @@ bot3()
+ else Sprintf(newbot3, "Dlvl:%-2d ", depth(&u.uz));
+ #ifdef SCORE_ON_BOTL
+ Sprintf(nb = eos(newbot3),
+- "%c:%-2ld Score:%d", oc_syms[GOLD_CLASS],
++ "%c:%-2ld Score:%ld", oc_syms[GOLD_CLASS],
+ u.ugold, botl_score());
+ Sprintf(nb = eos(nb), " Turn:%ld", moves);
+ #else
Index: patches/patch-src_dokick_c
===================================================================
RCS file: patches/patch-src_dokick_c
diff -N patches/patch-src_dokick_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dokick_c 24 Mar 2015 00:17:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/dokick.c.orig Sat Mar 21 10:26:12 2015
++++ src/dokick.c Sat Mar 21 10:27:00 2015
+@@ -76,7 +76,7 @@ register boolean clumsy;
+ }
+ dmg += u.udaminc; /* add ring(s) of increase damage */
+ if (dmg > 0) {
+- pline("You hit.[%ld pts.]",dmg);
++ pline("You hit.[%d pts.]",dmg);
+ mon->mhp -= dmg;
+ }
+ if(mon->mhp > 0 && martial() && !bigmonst(mon->data) && !rn2(3)
Index: patches/patch-src_shk_c
===================================================================
RCS file: patches/patch-src_shk_c
diff -N patches/patch-src_shk_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_shk_c 24 Mar 2015 00:17:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/shk.c.orig Sat Mar 21 10:27:30 2015
++++ src/shk.c Sat Mar 21 10:28:08 2015
+@@ -4577,7 +4577,7 @@ shk_offer_price(slang, charge, shkp)
+ char sbuf[BUFSZ];
+
+ /* Ask y/n if player wants to pay */
+- Sprintf(sbuf, "It'll cost you %ld zorkmid%s. Interested?",
++ Sprintf(sbuf, "It'll cost you %d zorkmid%s. Interested?",
+ charge, plur(charge));
+
+ if ( yn(sbuf) != 'y' )
Index: patches/patch-sys_share_unixtty_c
===================================================================
RCS file: patches/patch-sys_share_unixtty_c
diff -N patches/patch-sys_share_unixtty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sys_share_unixtty_c 24 Mar 2015 00:17:51 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- sys/share/unixtty.c.orig Sat Mar 21 10:16:45 2015
++++ sys/share/unixtty.c Sat Mar 21 10:18:17 2015
+@@ -120,9 +120,9 @@ struct tchars inittyb2, curttyb2;
+ # ifndef LINT
+ extern /* it is defined in libtermlib (libtermcap) */
+ # endif
+- short ospeed; /* terminal baudrate; set by gettty */
++ int ospeed; /* terminal baudrate; set by gettty */
+ #else
+-short ospeed = 0; /* gets around "not defined" error message */
++int ospeed = 0; /* gets around "not defined" error message */
+ #endif
+
+ #if defined(POSIX_TYPES) && defined(BSD)
Index: patches/patch-util_makedefs_c
===================================================================
RCS file: patches/patch-util_makedefs_c
diff -N patches/patch-util_makedefs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_makedefs_c 24 Mar 2015 00:17:51 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- util/makedefs.c.orig Thu Mar 19 22:28:24 2015
++++ util/makedefs.c Thu Mar 19 22:30:27 2015
+@@ -526,7 +526,7 @@ const char *build_date;
+ void
+ do_date()
+ {
+- long clocktim = 0;
++ time_t clocktim = 0;
+ char *c, cbuf[60], buf[BUFSZ];
+ const char *ul_sfx;
+
+@@ -557,7 +557,7 @@ do_date()
+ ul_sfx = "L";
+ #endif
+ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf);
+- Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", clocktim);
++ Fprintf(ofp,"#define BUILD_TIME (%lldLL)\n", (long long)clocktim);
+ Fprintf(ofp,"\n");
+ Fprintf(ofp,"#define VERSION_NUMBER 0x%08lx%s\n",
+ version.incarnation, ul_sfx);
Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/games/slash-em/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 11 Mar 2013 11:07:40 -0000 1.25
+++ Makefile 24 Mar 2015 12:00:40 -0000
@@ -3,7 +3,7 @@
COMMENT = dungeon explorin', hackin', game. Hard
DISTNAME = se007e7f1
PKGNAME = slash-em-3.4.3.7e7f1
-REVISION = 3
+REVISION = 4
V = 3.4.3.7e7f1
CATEGORIES = games
Index: patches/patch-include_tcap_h
===================================================================
RCS file: patches/patch-include_tcap_h
diff -N patches/patch-include_tcap_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_tcap_h 24 Mar 2015 12:00:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/tcap.h.orig Fri Mar 20 19:29:51 2015
++++ include/tcap.h Fri Mar 20 19:30:09 2015
+@@ -44,7 +44,7 @@ extern struct tc_lcl_data { /* defined and set up in
+ #define nh_UE tc_lcl_data.tc_UE
+ #define ul_hack tc_lcl_data.tc_ul_hack
+
+-extern short ospeed; /* set up in termcap.c */
++extern int ospeed; /* set up in termcap.c */
+
+ #ifdef TEXTCOLOR
+ # ifdef TOS
Index: patches/patch-src_botl_c
===================================================================
RCS file: patches/patch-src_botl_c
diff -N patches/patch-src_botl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_botl_c 24 Mar 2015 12:00:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/botl.c.orig Mon Mar 23 16:05:46 2015
++++ src/botl.c Mon Mar 23 16:09:38 2015
+@@ -559,7 +559,7 @@ boolean reconfig;
+ *rv++ = reconfig ? "hunger" : strcmp(hu_stat[u.uhs], " ") ?
+ hu_stat[u.uhs] : "";
+ *rv++ = reconfig ? "encumberance" : enc_stat[near_capacity()];
+- *rv++ = reconfig ? "flags" : (Sprintf(flgs, "%lX",
++ *rv++ = reconfig ? "flags" : (Sprintf(flgs, "%X",
+ (Levitation ? RAW_STAT_LEVITATION : 0) |
+ (Confusion ? RAW_STAT_CONFUSION : 0) |
+ (Sick && (u.usick_type & SICK_VOMITABLE) ? RAW_STAT_FOODPOIS : 0) |
Index: patches/patch-src_cmd_c
===================================================================
RCS file: patches/patch-src_cmd_c
diff -N patches/patch-src_cmd_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_cmd_c 24 Mar 2015 12:00:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/cmd.c.orig Mon Mar 23 16:10:22 2015
++++ src/cmd.c Mon Mar 23 16:12:46 2015
+@@ -1511,7 +1511,7 @@ int final; /* 0 => still in progress; 1 => over,
survi
+ Sprintf(buf, "%s health", u.uhealbonus > 0 ? "extra" :
+ "reduced");
+ #ifdef WIZARD
+- if (wizard) Sprintf(eos(buf), " (%d)", u.uhealbonus);
++ if (wizard) Sprintf(eos(buf), " (%ld)", u.uhealbonus);
+ #endif
+ you_have(buf);
+ }
Index: patches/patch-src_topten_c
===================================================================
RCS file: patches/patch-src_topten_c
diff -N patches/patch-src_topten_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_topten_c 24 Mar 2015 12:00:40 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/topten.c.orig Mon Mar 23 16:13:42 2015
++++ src/topten.c Mon Mar 23 16:20:20 2015
+@@ -220,7 +220,7 @@ struct toptenentry *tt;
+ for(dp = tt->death; *dp; dp++) {
+ if(!strncmp(dp, " Conduct=", 9)) {
+ dp2 = dp + 9;
+- sscanf(dp2, "%d", &tt->conduct);
++ sscanf(dp2, "%ld", &tt->conduct);
+ /* Find trailing null or space */
+ while(*dp2 && *dp2 != ' ')
+ dp2++;
+@@ -262,7 +262,7 @@ struct toptenentry *tt;
+ /* Add a trailing " Conduct=%d" to tt->death */
+ if(tt->conduct != 4095) {
+ cp = tt->death + strlen(tt->death);
+- Sprintf(cp, " Conduct=%d", tt->conduct);
++ Sprintf(cp, " Conduct=%ld", tt->conduct);
+ }
+ #endif
+
Index: patches/patch-sys_share_unixtty_c
===================================================================
RCS file: patches/patch-sys_share_unixtty_c
diff -N patches/patch-sys_share_unixtty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sys_share_unixtty_c 24 Mar 2015 12:00:40 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- sys/share/unixtty.c.orig Mon Mar 23 15:53:04 2015
++++ sys/share/unixtty.c Mon Mar 23 15:54:13 2015
+@@ -130,9 +130,9 @@ struct tchars inittyb2, curttyb2;
+ # ifndef LINT
+ extern /* it is defined in libtermlib (libtermcap) */
+ # endif
+- short ospeed; /* terminal baudrate; set by gettty */
++ int ospeed; /* terminal baudrate; set by gettty */
+ #else
+-short ospeed = 0; /* gets around "not defined" error message */
++int ospeed = 0; /* gets around "not defined" error message */
+ #endif
+
+ #if defined(POSIX_TYPES) && defined(BSD)
Index: patches/patch-util_makedefs_c
===================================================================
RCS file: patches/patch-util_makedefs_c
diff -N patches/patch-util_makedefs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_makedefs_c 24 Mar 2015 12:00:40 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- util/makedefs.c.orig Thu Mar 19 23:39:33 2015
++++ util/makedefs.c Thu Mar 19 23:41:44 2015
+@@ -593,7 +593,7 @@ const char *build_date;
+ void
+ do_date()
+ {
+- long clocktim = 0;
++ time_t clocktim = 0;
+ char *c, *cbuf, buf[BUFSZ];
+ const char *ul_sfx;
+
+@@ -625,7 +625,7 @@ do_date()
+ ul_sfx = "L";
+ #endif
+ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf);
+- Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", clocktim);
++ Fprintf(ofp,"#define BUILD_TIME (%lldLL)\n", (long long)clocktim);
+ Fprintf(ofp,"\n");
+ Fprintf(ofp,"#define VERSION_NUMBER 0x%08lx%s\n",
+ version.incarnation, ul_sfx);
? build-no_x11-00
Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/games/nethack/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 30 Nov 2014 05:41:35 -0000 1.56
+++ Makefile 24 Mar 2015 03:11:39 -0000
@@ -4,7 +4,7 @@ COMMENT = dungeon explorin', hackin', ga
V = 3.4.3
DISTNAME = nethack-$V
PKGNAME = ${DISTNAME}
-REVISION = 6
+REVISION = 7
CATEGORIES = games
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nethack/} \
Index: patches/patch-include_tcap_h
===================================================================
RCS file: patches/patch-include_tcap_h
diff -N patches/patch-include_tcap_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_tcap_h 24 Mar 2015 03:11:39 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/tcap.h.orig Sat Mar 21 18:39:10 2015
++++ include/tcap.h Sat Mar 21 18:39:33 2015
+@@ -44,7 +44,7 @@ extern struct tc_lcl_data { /* defined and set up in
+ #define nh_UE tc_lcl_data.tc_UE
+ #define ul_hack tc_lcl_data.tc_ul_hack
+
+-extern short ospeed; /* set up in termcap.c */
++extern int ospeed; /* set up in termcap.c */
+
+ #ifdef TEXTCOLOR
+ # ifdef TOS
Index: patches/patch-sys_share_unixtty_c
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/games/nethack/patches/patch-sys_share_unixtty_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sys_share_unixtty_c
--- patches/patch-sys_share_unixtty_c 14 Oct 2006 10:01:09 -0000 1.1
+++ patches/patch-sys_share_unixtty_c 24 Mar 2015 03:11:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-sys_share_unixtty_c,v 1.1 2006/10/14 10:01:09 espie Exp $
---- sys/share/unixtty.c.orig Sat Oct 14 11:31:59 2006
-+++ sys/share/unixtty.c Sat Oct 14 11:32:33 2006
-@@ -121,7 +121,7 @@ struct tchars inittyb2, curttyb2;
+--- sys/share/unixtty.c.orig Mon Dec 8 00:39:13 2003
++++ sys/share/unixtty.c Sat Mar 21 18:40:41 2015
+@@ -121,13 +121,13 @@ struct tchars inittyb2, curttyb2;
#endif /* V7 */
@@ -10,3 +10,11 @@ $OpenBSD: patch-sys_share_unixtty_c,v 1.
# ifndef LINT
extern /* it is defined in libtermlib (libtermcap) */
# endif
+- short ospeed; /* terminal baudrate; set by gettty */
++ int ospeed; /* terminal baudrate; set by gettty */
+ #else
+-short ospeed = 0; /* gets around "not defined" error message */
++int ospeed = 0; /* gets around "not defined" error message */
+ #endif
+
+ #if defined(POSIX_TYPES) && defined(BSD)
Index: patches/patch-util_makedefs_c
===================================================================
RCS file: patches/patch-util_makedefs_c
diff -N patches/patch-util_makedefs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_makedefs_c 24 Mar 2015 03:11:39 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- util/makedefs.c.orig Fri Mar 20 14:12:00 2015
++++ util/makedefs.c Fri Mar 20 14:13:23 2015
+@@ -543,7 +543,7 @@ const char *build_date;
+ void
+ do_date()
+ {
+- long clocktim = 0;
++ time_t clocktim = 0;
+ char *c, cbuf[60], buf[BUFSZ];
+ const char *ul_sfx;
+
+@@ -569,7 +569,7 @@ do_date()
+ for (c = cbuf; *c; c++) if (*c == '\n') break;
+ *c = '\0'; /* strip off the '\n' */
+ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf);
+- Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", clocktim);
++ Fprintf(ofp,"#define BUILD_TIME (%lldLL)\n", (long long)clocktim);
+ Fprintf(ofp,"\n");
+ #ifdef NHSTDC
+ ul_sfx = "UL";
Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/games/falconseye/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 30 Nov 2014 07:08:48 -0000 1.26
+++ Makefile 25 Mar 2015 09:25:27 -0000
@@ -5,7 +5,7 @@ COMMENT = NetHack derivative
VERSION = 1.9.3
DISTNAME = nethack_source_331_jtp_${VERSION:S/.//g}
PKGNAME = falconseye-${VERSION}
-REVISION = 5
+REVISION = 6
CATEGORIES = games x11
EXTRACT_SUFX = .zip
Index: patches/patch-include_tcap_h
===================================================================
RCS file: patches/patch-include_tcap_h
diff -N patches/patch-include_tcap_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_tcap_h 25 Mar 2015 09:25:27 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- include/tcap.h.orig Wed Mar 25 00:52:16 2015
++++ include/tcap.h Wed Mar 25 00:52:30 2015
+@@ -44,7 +44,7 @@ extern struct tc_lcl_data { /* defined and set up in
+ #define nh_UE tc_lcl_data.tc_UE
+ #define ul_hack tc_lcl_data.tc_ul_hack
+
+-extern short ospeed; /* set up in termcap.c */
++extern int ospeed; /* set up in termcap.c */
+
+ #ifdef TEXTCOLOR
+ # ifdef TOS
Index: patches/patch-sys_share_unixtty_c
===================================================================
RCS file: patches/patch-sys_share_unixtty_c
diff -N patches/patch-sys_share_unixtty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sys_share_unixtty_c 25 Mar 2015 09:25:27 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- sys/share/unixtty.c.orig Wed Mar 25 00:54:22 2015
++++ sys/share/unixtty.c Wed Mar 25 00:55:08 2015
+@@ -120,9 +120,9 @@ struct tchars inittyb2, curttyb2;
+ # ifndef LINT
+ extern /* it is defined in libtermlib (libtermcap) */
+ # endif
+- short ospeed; /* terminal baudrate; set by gettty */
++ int ospeed; /* terminal baudrate; set by gettty */
+ #else
+-short ospeed = 0; /* gets around "not defined" error message */
++int ospeed = 0; /* gets around "not defined" error message */
+ #endif
+
+ #if defined(POSIX_TYPES) && defined(BSD)
Index: patches/patch-util_makedefs_c
===================================================================
RCS file: patches/patch-util_makedefs_c
diff -N patches/patch-util_makedefs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_makedefs_c 25 Mar 2015 09:25:27 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- util/makedefs.c.orig Fri Mar 20 20:59:01 2015
++++ util/makedefs.c Fri Mar 20 21:00:36 2015
+@@ -523,7 +523,7 @@ const char *build_date;
+ void
+ do_date()
+ {
+- long clocktim = 0;
++ time_t clocktim = 0;
+ char *c, cbuf[60], buf[BUFSZ];
+ const char *ul_sfx;
+
+@@ -549,7 +549,7 @@ do_date()
+ for (c = cbuf; *c; c++) if (*c == '\n') break;
+ *c = '\0'; /* strip off the '\n' */
+ Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf);
+- Fprintf(ofp,"#define BUILD_TIME (%ldL)\n", clocktim);
++ Fprintf(ofp,"#define BUILD_TIME (%lldLL)\n", (long long)clocktim);
+ Fprintf(ofp,"\n");
+ #ifdef NHSTDC
+ ul_sfx = "UL";
