pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/ularn Fix Ularn to build on Mandrake Linux 10.1....
details: https://anonhg.NetBSD.org/pkgsrc/rev/50ca512edb97
branches: trunk
changeset: 489899:50ca512edb97
user: ben <ben%pkgsrc.org@localhost>
date: Mon Feb 28 02:26:59 2005 +0000
description:
Fix Ularn to build on Mandrake Linux 10.1. This addresses PR#29450.
Changes include:
* remove lrint(), which is unused, and collides with the C99 lrint().
* remove malloc() prototypes, which are incorrect
* add include search path to CFLAGS to catch Mandrake's termcap.h
* in the case of Linux, define GETOPT, to match glibc
diffstat:
games/ularn/Makefile | 6 +-
games/ularn/distinfo | 12 ++--
games/ularn/patches/patch-aa | 4 +-
games/ularn/patches/patch-ah | 20 +++---
games/ularn/patches/patch-ai | 14 ++++-
games/ularn/patches/patch-al | 108 +++++++++++++++++++++++++++---------------
games/ularn/patches/patch-an | 31 +++++++----
7 files changed, 124 insertions(+), 71 deletions(-)
diffs (truncated from 593 to 300 lines):
diff -r c9c3b6b660ae -r 50ca512edb97 games/ularn/Makefile
--- a/games/ularn/Makefile Mon Feb 28 02:22:02 2005 +0000
+++ b/games/ularn/Makefile Mon Feb 28 02:26:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/15 21:17:08 ben Exp $
+# $NetBSD: Makefile,v 1.15 2005/02/28 02:26:59 ben Exp $
DISTNAME= ularn
PKGNAME= ularn-6.12.92
@@ -26,6 +26,10 @@
SUBST_SED.termlib= -e 's,^termlib=..termlib,& -lcompat,'
.endif
+.if ${OPSYS} == "Linux"
+CFLAGS+= -I/usr/include/ncurses -DGETOPT
+.endif
+
pre-configure:
${MV} ${WRKSRC}/Configure ${WRKSRC}/Configure.template
${SED} 's:XXXLIBDIRXXX:${LOCALBASE}/share/Ularn:;\
diff -r c9c3b6b660ae -r 50ca512edb97 games/ularn/distinfo
--- a/games/ularn/distinfo Mon Feb 28 02:22:02 2005 +0000
+++ b/games/ularn/distinfo Mon Feb 28 02:26:59 2005 +0000
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/02/28 02:26:59 ben Exp $
SHA1 (ularn.tar.gz) = abc5bbecca65968e9ddaf2a8d07ac5141009459d
RMD160 (ularn.tar.gz) = 8560ec0f0fe0f800a4ca05f44ae6868164652251
Size (ularn.tar.gz) = 142790 bytes
-SHA1 (patch-aa) = 1ce8bbbc05f275a832814b08c38bc6df066fe7b0
+SHA1 (patch-aa) = ea20234faaf6699429d1f25734df820d233f34f7
SHA1 (patch-ab) = a45fec8456da7b2b1985dc2332ede80082b2dab4
SHA1 (patch-ac) = 859fb4ae3782658d2f2cf29d11da67a901499e61
SHA1 (patch-ad) = ecf9b099ac8df2b86a9c45c0cf76c7caf194f64b
SHA1 (patch-ae) = a6a68608da9daf237701ea18c2462e2de6c29413
SHA1 (patch-af) = 252c2f2d318189efc9ab5d2ec78ff78c3d54fb68
SHA1 (patch-ag) = 85dd443611465ddb3fc9819e8d69dd6028fa6fe7
-SHA1 (patch-ah) = b56861b88f5abd7da2e2b0f5de4dc1f7261ff235
-SHA1 (patch-ai) = 43b9a2fb45a2a52347f0a83efca5ba70c3c58989
+SHA1 (patch-ah) = f517cd95a7d8e2073a95fcdbc808fdd1a68f41bb
+SHA1 (patch-ai) = f48854df867e3aa1e700d110382657aa2e234dda
SHA1 (patch-aj) = 09b5d87673103739c6bf7dfbf44c6fb8808fbd28
SHA1 (patch-ak) = d2cb3bda3c2e95868362a0d0dcf4bb584d6df987
-SHA1 (patch-al) = 051ac587d3181df8a1161fd45cbd7eff4877e2e0
+SHA1 (patch-al) = f4896ea05a19b57df55b975aecbe909d104c0ccc
SHA1 (patch-am) = 1df190db775f3d2278275894f18246e4897738e0
-SHA1 (patch-an) = 8c669a56795a8b4a2a6e24fd2fb121aa0699c01a
+SHA1 (patch-an) = d92c9a2bd23303efabef2ac07b4c74c18eed3a10
SHA1 (patch-ao) = 42a184fea3408fc935f3dcc62b7a127e81b71085
SHA1 (patch-ap) = a46a3b27d2f5ac9e4479ac77bf193636608b42a4
SHA1 (patch-aq) = e5b1e4a63d242316d9db3184b4f3e5ab62b4271c
diff -r c9c3b6b660ae -r 50ca512edb97 games/ularn/patches/patch-aa
--- a/games/ularn/patches/patch-aa Mon Feb 28 02:22:02 2005 +0000
+++ b/games/ularn/patches/patch-aa Mon Feb 28 02:26:59 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/04/15 21:17:08 ben Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/28 02:26:59 ben Exp $
--- Configure.orig 2004-04-15 13:55:44.000000000 -0700
+++ Configure
@@ -19,7 +19,7 @@
large=''
huge=''
-ccflags=''
-+ccflags='-g -Wall -Wno-comment'
++ccflags="$CFLAGS -g -Wall -Wno-comment"
ldflags=''
cc=''
n=''
diff -r c9c3b6b660ae -r 50ca512edb97 games/ularn/patches/patch-ah
--- a/games/ularn/patches/patch-ah Mon Feb 28 02:22:02 2005 +0000
+++ b/games/ularn/patches/patch-ah Mon Feb 28 02:26:59 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
+$NetBSD: patch-ah,v 1.3 2005/02/28 02:26:59 ben Exp $
--- extern.h.orig 1992-06-19 13:55:30.000000000 -0700
+++ extern.h
@@ -115,7 +115,7 @@
/* module: fortune.c */
-@@ -78,178 +78,178 @@ char *fortune(char *);
+@@ -78,178 +78,177 @@ char *fortune(char *);
/* module: help.c */
@@ -140,7 +140,7 @@
+void lprint(long);
+void lwrite(char *, int);
long lgetc1(void);
- long lrint(void);
+-long lrint(void);
-int lrfill(char *, int);
+void lrfill(char *, int);
char *lgetw(void);
@@ -403,7 +403,7 @@
unsigned int sum(unsigned char *, int);
/* module: scores.c */
-@@ -261,112 +261,112 @@ int hashewon(void);
+@@ -261,112 +260,112 @@ int hashewon(void);
long paytaxes(long);
int winshou(void);
int shou(int);
@@ -592,7 +592,7 @@
/* module: bill.c */
-@@ -376,53 +376,53 @@ int letter3();
+@@ -376,53 +375,53 @@ int letter3();
int letter4();
int letter5();
int letter6();
@@ -675,7 +675,7 @@
/* module: fortune.c */
-@@ -430,178 +430,178 @@ char *fortune();
+@@ -430,178 +429,177 @@ char *fortune();
/* module: help.c */
@@ -700,7 +700,7 @@
+void lprint();
+void lwrite();
long lgetc1();
- long lrint();
+-long lrint();
-int lrfill();
+void lrfill();
char *lgetw();
@@ -963,7 +963,7 @@
unsigned int sum();
/* module: scores.c */
-@@ -613,96 +613,96 @@ int hashewon();
+@@ -613,96 +611,96 @@ int hashewon();
long paytaxes();
int winshou();
int shou();
@@ -1129,7 +1129,7 @@
#endif /* __STD__ */
-@@ -718,20 +718,20 @@ extern char savefilename[],scorefile[],
+@@ -718,20 +716,20 @@ extern char savefilename[],scorefile[],
extern char objnamelist[],optsfile[],*potionname[],stealth[MAXX][MAXY];
extern char *scrollname[],*spelcode[],*speldescript[];
extern char *class[],course[],diagfile[],fortfile[],helpfile[];
@@ -1155,7 +1155,7 @@
extern char ramboflag, compress;
extern short hitp[MAXX][MAXY], ivenarg[], screen[MAXX][MAXY];
-@@ -739,6 +739,17 @@ extern short iarg[MAXX][MAXY], lastnum;
+@@ -739,6 +737,17 @@ extern short iarg[MAXX][MAXY], lastnum;
extern int yrepcount,userid;
extern int ipoint, iepoint;
diff -r c9c3b6b660ae -r 50ca512edb97 games/ularn/patches/patch-ai
--- a/games/ularn/patches/patch-ai Mon Feb 28 02:22:02 2005 +0000
+++ b/games/ularn/patches/patch-ai Mon Feb 28 02:26:59 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/04/27 15:27:31 agc Exp $
+$NetBSD: patch-ai,v 1.2 2005/02/28 02:26:59 ben Exp $
---- fortune.c.orig Fri Jun 19 13:55:36 1992
-+++ fortune.c Sat Jan 13 18:07:37 2001
+--- fortune.c.orig 1992-06-19 13:55:36.000000000 -0700
++++ fortune.c
@@ -1,4 +1,8 @@
/* fortune.c */
+#include <sys/types.h>
@@ -11,3 +11,11 @@
#include "header.h"
#include "extern.h"
/*
+@@ -16,7 +20,6 @@ char *file;
+ int lines,tmp;
+ struct stat stat;
+ int retval;
+- char *malloc();
+
+ if (fortune_fd==0) {
+ /* open the file */
diff -r c9c3b6b660ae -r 50ca512edb97 games/ularn/patches/patch-al
--- a/games/ularn/patches/patch-al Mon Feb 28 02:22:02 2005 +0000
+++ b/games/ularn/patches/patch-al Mon Feb 28 02:26:59 2005 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
+$NetBSD: patch-al,v 1.4 2005/02/28 02:26:59 ben Exp $
--- io.c.orig 1995-01-18 11:48:27.000000000 -0800
+++ io.c
-@@ -47,12 +47,18 @@
+@@ -19,7 +19,6 @@
+ * FILE INPUT ROUTINES
+ *
+ * long lgetc() read one character from input buffer
+- * long lrint() read one integer from input buffer
+ * lrfill(address,number) put input bytes into a buffer
+ * char *lgetw() get a whitespace ended word from input
+ * char *lgetl() get a \n or EOF ended line from input
+@@ -47,12 +46,18 @@
*
* Note: ** entries are available only in termcap mode.
*/
@@ -22,7 +30,7 @@
static int lfd; /* output file numbers */
static int fd; /* input file numbers */
int ipoint=BUFSIZ,iepoint=BUFSIZ; /* input buffering pointers */
-@@ -61,13 +67,13 @@ static char lgetwbuf[LINBUFSIZE]; /* get
+@@ -61,13 +66,13 @@ static char lgetwbuf[LINBUFSIZE]; /* get
/*
* getcharacter() Routine to read in one character from the terminal
*/
@@ -38,7 +46,7 @@
}
-@@ -75,7 +81,7 @@ getcharacter ()
+@@ -75,7 +80,7 @@ getcharacter ()
* newgame()
* Subroutine to save the initial time and seed rnd()
*/
@@ -47,7 +55,7 @@
{
long *p,*pe;
-@@ -101,18 +107,14 @@ newgame ()
+@@ -101,18 +106,14 @@ newgame ()
*/
/*VARARGS*/
@@ -68,7 +76,7 @@
if (lpnt >= lpend) lflush();
outb = lpnt;
-@@ -164,7 +166,7 @@ va_dcl
+@@ -164,7 +165,7 @@ va_dcl
break;
}
if (wide==0) {
@@ -77,7 +85,7 @@
--outb;
}
else {
-@@ -172,7 +174,7 @@ va_dcl
+@@ -172,7 +173,7 @@ va_dcl
if (left)
while (n-- > 0)
*outb++ = ' ';
@@ -86,7 +94,7 @@
;
--outb;
if (left==0)
-@@ -230,7 +232,7 @@ va_dcl
+@@ -230,7 +231,7 @@ va_dcl
* No checking for output buffer overflow is done, but flushes if needed!
* Returns nothing of value.
*/
@@ -95,7 +103,7 @@
long x;
{
if (lpnt >= lpend)
-@@ -251,7 +253,7 @@ long x;
+@@ -251,7 +252,7 @@ long x;
* Enter with the address and number of bytes to write out
* Returns nothing of value
*/
@@ -104,7 +112,7 @@
char *buf;
int len;
{
-@@ -286,7 +288,7 @@ int len;
+@@ -286,7 +287,7 @@ int len;
*
* Returns 0 if EOF, otherwise the character
*/
@@ -113,16 +121,38 @@
{
int i;
-@@ -320,7 +322,7 @@ long lgetc1()
- * The save order is low order first, to high order (4 bytes total)
- * Returns the int read
- */
+@@ -308,30 +309,6 @@ long lgetc1()
+ }
+
+ /*
+- * long lrint() Read one integer from input buffer
+- *
+- * +---------+---------+---------+---------+
+- * | high | | | low |
+- * | order | | | order |
+- * | byte | | | byte |
+- * +---------+---------+---------+---------+
+- * 31 --- 24 23 --- 16 15 --- 8 7 --- 0
Home |
Main Index |
Thread Index |
Old Index