ports/127728: ports/games/freebsd-games doesn't build, and larn(6) segfaults!
Ulrich Spörlein
uqs at spoerlein.net
Tue Jul 21 18:10:05 UTC 2009
The following reply was made to PR ports/127728; it has been noted by GNATS.
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs at spoerlein.net>
To: bug-followup at FreeBSD.org, ino-news at spotteswoode.dnsalias.org
Cc:
Subject: Re: ports/127728: ports/games/freebsd-games doesn't build, and
larn(6) segfaults!
Date: Tue, 21 Jul 2009 20:00:13 +0200
--EeQfGwPcQSOJBaQU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Sigh, wrong file. Try this one ...
--EeQfGwPcQSOJBaQU
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="larn.diff"
Index: Makefile
===================================================================
RCS file: /tank/ncvs/ports/games/freebsd-games/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 2 Mar 2009 01:27:11 -0000 1.20
+++ Makefile 21 Jul 2009 17:59:56 -0000
@@ -7,7 +7,7 @@
PORTNAME= freebsd-games
PORTVERSION= 5.1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=markm
Index: files/patch-larn_Makefile
===================================================================
RCS file: /tank/ncvs/ports/games/freebsd-games/files/patch-larn_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-larn_Makefile
--- files/patch-larn_Makefile 23 Mar 2007 23:02:33 -0000 1.1
+++ files/patch-larn_Makefile 21 Jul 2009 17:59:56 -0000
@@ -1,10 +1,18 @@
-Index: larn/Makefile
-@@ -54,7 +54,7 @@
+--- larn/Makefile.orig 2003-11-11 00:47:00.000000000 +0100
++++ larn/Makefile 2009-07-21 19:08:50.000000000 +0200
+@@ -54,12 +54,12 @@
PROG= larn
MAN= larn.6
-CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -fwritable-strings -DNOVARARGS
-+CFLAGS+=-DPOSIX -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -DNOVARARGS
++CFLAGS+=-DPOSIX -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE
SRCS= main.c object.c create.c tok.c display.c global.c data.c io.c \
monster.c store.c diag.c help.c config.c nap.c bill.c scores.c \
signal.c moreobj.c movem.c regen.c fortune.c savelev.c
+-DPADD= ${LIBTERMCAP} ${LIBCOMPAT}
+-LDADD= -ltermcap -lcompat
++DPADD= ${LIBTERMCAP}
++LDADD= -ltermcap
+ FILES= larnmaze larnopts larn.help
+ FILESDIR= ${SHAREDIR}/games/larn
+
Index: files/patch-larn_data.c
===================================================================
RCS file: files/patch-larn_data.c
diff -N files/patch-larn_data.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-larn_data.c 21 Jul 2009 17:59:56 -0000
@@ -0,0 +1,38 @@
+--- larn/data.c.orig 1999-11-30 04:48:59.000000000 +0100
++++ larn/data.c 2009-07-21 19:08:50.000000000 +0200
+@@ -299,7 +299,7 @@
+
+ /* name array for scrolls */
+
+-char *scrollname[] = {
++char *scrollname[32] = {
+ "\0enchant armor",
+ "\0enchant weapon",
+ "\0enlightenment",
+@@ -327,11 +327,15 @@
+ "\0 ",
+ "\0 ",
+ "\0 ",
++"\0 ",
++"\0 ",
++"\0 ",
++"\0 ",
+ "\0 "
+ };
+
+ /* name array for magic potions */
+-char *potionname[] = {
++char *potionname[32] = {
+ "\0sleep",
+ "\0healing",
+ "\0raise level",
+@@ -363,9 +367,6 @@
+ "\0 ",
+ "\0 ",
+ "\0 ",
+-"\0 ",
+-"\0 ",
+-"\0 ",
+ "\0 "
+ };
+
Index: files/patch-larn_global.c
===================================================================
RCS file: files/patch-larn_global.c
diff -N files/patch-larn_global.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-larn_global.c 21 Jul 2009 17:59:56 -0000
@@ -0,0 +1,11 @@
+--- larn/global.c.orig 2002-05-08 22:39:10.000000000 +0200
++++ larn/global.c 2009-07-21 19:08:50.000000000 +0200
+@@ -27,7 +27,7 @@
+ extern char lastmonst[],*what[],*who[];
+ extern char winner[];
+ extern char logname[],monstlevel[];
+-extern char sciv[SCORESIZE+1][26][2],*potionname[],*scrollname[];
++extern char sciv[SCORESIZE+1][26][2],*potionname[][32],*scrollname[][32];
+ /*
+ ***********
+ RAISE LEVEL
Index: files/patch-larn_header.h
===================================================================
RCS file: /tank/ncvs/ports/games/freebsd-games/files/patch-larn_header.h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-larn_header.h
--- files/patch-larn_header.h 23 Mar 2007 23:02:33 -0000 1.1
+++ files/patch-larn_header.h 21 Jul 2009 17:59:56 -0000
@@ -1,4 +1,5 @@
-Index: larn/header.h
+--- larn/header.h.orig 2002-05-08 22:39:10.000000000 +0200
++++ larn/header.h 2009-07-21 19:08:50.000000000 +0200
@@ -326,7 +326,6 @@
#define DEMONLORD 57
#define DEMONPRINCE 64
@@ -7,7 +8,19 @@ Index: larn/header.h
#define BUFBIG 4096 /* size of the output buffer */
#define MAXIBUF 4096 /* size of the input buffer */
#define LOGNAMESIZE 40 /* max size of the players name */
-@@ -359,7 +359,7 @@
+@@ -342,9 +341,9 @@
+ extern char *lpnt,moved[MAXX][MAXY],mitem[MAXX][MAXY],monstlevel[];
+ extern char monstnamelist[],nch[],ndgg[],nlpts[],nomove,nosignal,nowelcome;
+ extern char nplt[],nsw[],*objectname[];
+-extern char objnamelist[],optsfile[],*potionname[],playerids[],potprob[];
++extern char objnamelist[],optsfile[],*potionname[][32],playerids[],potprob[];
+ extern char predostuff,psname[],restorflag,savefilename[],scorefile[],scprob[];
+-extern char screen[MAXX][MAXY],*scrollname[],sex,*spelcode[],*speldescript[];
++extern char screen[MAXX][MAXY],*scrollname[][32],sex,*spelcode[],*speldescript[];
+ extern char spelknow[],*spelname[],*spelmes[],spelweird[MAXMONST+8][SPNUM];
+ extern char splev[],stealth[MAXX][MAXY],to_lower[],to_upper[],wizard;
+ extern short diroffx[],diroffy[],hitflag,hit2flag,hit3flag,hitp[MAXX][MAXY];
+@@ -360,7 +359,7 @@
char *fortune(),*lgetw(),*lgetl();
char *tmcapcnv();
Index: files/patch-larn_io.c
===================================================================
RCS file: /tank/ncvs/ports/games/freebsd-games/files/patch-larn_io.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-larn_io.c
--- files/patch-larn_io.c 23 Mar 2007 23:02:33 -0000 1.1
+++ files/patch-larn_io.c 21 Jul 2009 17:59:56 -0000
@@ -1,4 +1,5 @@
-Index: larn/io.c
+--- larn/io.c.orig 2002-05-08 22:39:10.000000000 +0200
++++ larn/io.c 2009-07-21 19:08:50.000000000 +0200
@@ -24,7 +24,7 @@
* FILE INPUT ROUTINES
*
@@ -26,7 +27,36 @@ Index: larn/io.c
#else /* not SYSV */
#ifndef BSD
-@@ -345,7 +356,7 @@
+@@ -81,7 +92,7 @@
+ #endif /* not SYSV */
+
+ #ifndef NOVARARGS /* if we have varargs */
+-#include <varargs.h>
++#include <stdarg.h>
+ #else /* NOVARARGS *//* if we don't have varargs */
+ typedef char *va_list;
+ #define va_dcl int va_alist;
+@@ -194,17 +205,14 @@
+ }
+ #else /* lint */
+ /*VARARGS*/
+-lprintf(va_alist)
+-va_dcl
++lprintf(const char *fmt, ...)
+ {
+ va_list ap; /* pointer for variable argument list */
+- char *fmt;
+ char *outb,*tmpb;
+ long wide,left,cont,n; /* data for lprintf */
+ char db[12]; /* %d buffer in lprintf */
+
+- va_start(ap); /* initialize the var args pointer */
+- fmt = va_arg(ap, char *); /* pointer to format string */
++ va_start(ap, fmt); /* initialize the var args pointer */
+ if (lpnt >= lpend) lflush();
+ outb = lpnt;
+ for ( ; ; )
+@@ -345,7 +353,7 @@
}
/*
@@ -35,7 +65,7 @@ Index: larn/io.c
*
* +---------+---------+---------+---------+
* | high | | | low |
-@@ -357,7 +368,7 @@
+@@ -357,7 +365,7 @@
* The save order is low order first, to high order (4 bytes total)
* Returns the int read
*/
--EeQfGwPcQSOJBaQU--
More information about the freebsd-ports-bugs
mailing list