[pkgsrc/trunk]: pkgsrc/games/ularn Update Ularn to fix a few things:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games/ularn Update Ularn to fix a few things:
From: ben <ben%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:13:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b63dca61c073
branches:  trunk
changeset: 464329:b63dca61c073
user:      ben <ben%pkgsrc.org@localhost>
date:      Sat Dec 06 19:28:22 2003 +0000

description:
Update Ularn to fix a few things:
* Replace varargs with stdarg, in order to compile under gcc 3.3.
* Replace mktemp with mkstemp, in order to silence warnings
* Remove share directory from PLIST, since score file is not deleted.

diffstat:

 games/ularn/Makefile         |   3 +-
 games/ularn/PLIST            |   3 +-
 games/ularn/distinfo         |  12 +++---
 games/ularn/patches/patch-ae |  27 ++++++++++-----
 games/ularn/patches/patch-ah |  26 +++++++-------
 games/ularn/patches/patch-aj |  18 +++++++--
 games/ularn/patches/patch-al |  78 +++++++++++++++++++++++++------------------
 games/ularn/patches/patch-aw |  66 ++++++++++++++++++++++++------------
 8 files changed, 142 insertions(+), 91 deletions(-)

diffs (truncated from 728 to 300 lines):

diff -r 68e30f4236eb -r b63dca61c073 games/ularn/Makefile
--- a/games/ularn/Makefile      Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/Makefile      Sat Dec 06 19:28:22 2003 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/12/06 18:26:47 ben Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/06 19:28:22 ben Exp $
 
 DISTNAME=              ularn
 PKGNAME=               ularn-6.12.92
+PKGREVISION=           1
 WRKSRC=                        ${WRKDIR}
 CATEGORIES=            games
 MASTER_SITES=          http://www.cordier.com/ularn/
diff -r 68e30f4236eb -r b63dca61c073 games/ularn/PLIST
--- a/games/ularn/PLIST Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/PLIST Sat Dec 06 19:28:22 2003 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:55:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/06 19:28:22 ben Exp $
 bin/Ularn
 share/Ularn/Uhelp
 share/Ularn/Umaps
 share/Ularn/Ufortune
-@dirrm share/Ularn
diff -r 68e30f4236eb -r b63dca61c073 games/ularn/distinfo
--- a/games/ularn/distinfo      Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/distinfo      Sat Dec 06 19:28:22 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/01/03 13:06:50 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/12/06 19:28:22 ben Exp $
 
 SHA1 (ularn.tar.gz) = abc5bbecca65968e9ddaf2a8d07ac5141009459d
 Size (ularn.tar.gz) = 142790 bytes
@@ -6,14 +6,14 @@
 SHA1 (patch-ab) = a45fec8456da7b2b1985dc2332ede80082b2dab4
 SHA1 (patch-ac) = 859fb4ae3782658d2f2cf29d11da67a901499e61
 SHA1 (patch-ad) = ecf9b099ac8df2b86a9c45c0cf76c7caf194f64b
-SHA1 (patch-ae) = 6232c2735b01a275f840c458bf78618094c99e27
+SHA1 (patch-ae) = a6a68608da9daf237701ea18c2462e2de6c29413
 SHA1 (patch-af) = 252c2f2d318189efc9ab5d2ec78ff78c3d54fb68
 SHA1 (patch-ag) = 85dd443611465ddb3fc9819e8d69dd6028fa6fe7
-SHA1 (patch-ah) = ad5134994d8280fd3331a214eb5321b3cd541ed3
+SHA1 (patch-ah) = b56861b88f5abd7da2e2b0f5de4dc1f7261ff235
 SHA1 (patch-ai) = 43b9a2fb45a2a52347f0a83efca5ba70c3c58989
-SHA1 (patch-aj) = 34336ad095ecbba9c28cea1cb8f6d0d8023251a6
+SHA1 (patch-aj) = 09b5d87673103739c6bf7dfbf44c6fb8808fbd28
 SHA1 (patch-ak) = d2cb3bda3c2e95868362a0d0dcf4bb584d6df987
-SHA1 (patch-al) = cb3b13211c8897e0138347c74557dcbb7d318244
+SHA1 (patch-al) = ce8015f7f4b767549ba9d790f369bcfe8fdac287
 SHA1 (patch-am) = 1df190db775f3d2278275894f18246e4897738e0
 SHA1 (patch-an) = 8c669a56795a8b4a2a6e24fd2fb121aa0699c01a
 SHA1 (patch-ao) = 42a184fea3408fc935f3dcc62b7a127e81b71085
@@ -24,7 +24,7 @@
 SHA1 (patch-at) = f0fd98ce48e779e63122a8311d4a4223cda5a751
 SHA1 (patch-au) = 09f12532f42d39b59381d12c115842d5c7b8c7f3
 SHA1 (patch-av) = 028b49f03ca8e63f1adee5eb82460de2855aa6cb
-SHA1 (patch-aw) = 4e0e0501946928775e80f831f081fde887ddb67d
+SHA1 (patch-aw) = fac054bd83a12048a33991cf2be181aab44d0294
 SHA1 (patch-ax) = 31f39079aeb8ccf490cc7fbbd1d3c70d9f0737ed
 SHA1 (patch-ay) = 72bc4da5ec2006f3b1b4f29afec085e13f94ed11
 SHA1 (patch-az) = a2fbfbfacc77f297f77322ce66f30bf25bddbbfd
diff -r 68e30f4236eb -r b63dca61c073 games/ularn/patches/patch-ae
--- a/games/ularn/patches/patch-ae      Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/patches/patch-ae      Sat Dec 06 19:28:22 2003 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/04/27 15:27:31 agc Exp $
+$NetBSD: patch-ae,v 1.2 2003/12/06 19:28:22 ben Exp $
 
---- data.c.orig        Fri Jun 19 13:55:29 1992
-+++ data.c     Sun Jan 14 13:42:03 2001
-@@ -114,27 +114,27 @@
+--- data.c.orig        1992-06-19 13:55:29.000000000 -0700
++++ data.c
+@@ -102,7 +102,7 @@ long skill[] = {
+ };
+ #undef MEG
+ 
+-char *tempfilename;
++char *tempfilename = NULL;
+ 
+ char  *lpbuf,
+       *lpnt,
+@@ -114,27 +114,27 @@ char loginname[20];              /* players login na
  char logname[LOGNAMESIZE];    /* players name storage for scoring     */
  char char_class[20];          /* character class */
  
@@ -44,7 +53,7 @@
                        ** 2 means that the trap handling routines must do a
                        ** showplayer() after a trap.  0 means don't showplayer()
                        **              0 - we are in create player screen
-@@ -142,27 +142,29 @@
+@@ -142,27 +142,29 @@ char predostuff=0;       /*  
                        **              2 - we are in the normal game   
                        */
  
@@ -95,7 +104,7 @@
  
  long initialtime=0;           /* time playing began   */
  long gtime=0;                 /* the clock for the game       */
-@@ -289,7 +291,7 @@
+@@ -289,7 +291,7 @@ char *objectname[]=
   *
   *    array to do rnd() to create monsters <= a given level
   */
@@ -104,7 +113,7 @@
  
  struct monst monster[] = {
  
-@@ -380,82 +382,85 @@
+@@ -380,82 +382,85 @@ struct monst monster[] = {
  
  /*    name array for scrolls          */
  char *scrollname[MAXSCROLL] = {
@@ -255,7 +264,7 @@
        1,4,7,11,15,
        20,24,28,30,32,
        33,34,35,36,37,
-@@ -762,7 +767,7 @@
+@@ -762,7 +767,7 @@ char *spelmes[] = { 
   *    20 - remove curse       21 - annihilation                       
   *    22 - pulverization      23 - life protection
   */
@@ -264,7 +273,7 @@
        0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 
        4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8,
        9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 
-@@ -800,15 +805,15 @@
+@@ -800,15 +805,15 @@ char scprob[]= { 
   *  22 - poison               
   *  23 - see invisible
   */
diff -r 68e30f4236eb -r b63dca61c073 games/ularn/patches/patch-ah
--- a/games/ularn/patches/patch-ah      Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/patches/patch-ah      Sat Dec 06 19:28:22 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/04/27 15:27:31 agc Exp $
+$NetBSD: patch-ah,v 1.2 2003/12/06 19:28:22 ben Exp $
 
---- extern.h.orig      Fri Jun 19 13:55:30 1992
-+++ extern.h   Sat Jan 13 21:29:33 2001
+--- extern.h.orig      1992-06-19 13:55:30.000000000 -0700
++++ extern.h
 @@ -2,19 +2,19 @@
  
  /* module: action.c */
@@ -32,7 +32,7 @@
  
  /* module: bill.c */
  
-@@ -24,53 +24,53 @@
+@@ -24,53 +24,53 @@ int letter3(void);
  int letter4(void);
  int letter5(void);
  int letter6(void);
@@ -115,7 +115,7 @@
  
  /* module: fortune.c */
  
-@@ -78,178 +78,178 @@
+@@ -78,178 +78,178 @@ char *fortune(char *);
  
  /* module: help.c */
  
@@ -136,7 +136,7 @@
 -int lprintf();
 -int lprint(long);
 -int lwrite(char *, int);
-+void lprintf();
++void lprintf(char *, ...);
 +void lprint(long);
 +void lwrite(char *, int);
  long lgetc1(void);
@@ -403,7 +403,7 @@
  unsigned int sum(unsigned char *, int);
  
  /* module: scores.c */
-@@ -261,112 +261,112 @@
+@@ -261,112 +261,112 @@ int hashewon(void);
  long paytaxes(long);
  int winshou(void);
  int shou(int);
@@ -592,7 +592,7 @@
  
  /* module: bill.c */
  
-@@ -376,53 +376,53 @@
+@@ -376,53 +376,53 @@ int letter3();
  int letter4();
  int letter5();
  int letter6();
@@ -675,7 +675,7 @@
  
  /* module: fortune.c */
  
-@@ -430,178 +430,178 @@
+@@ -430,178 +430,178 @@ char *fortune();
  
  /* module: help.c */
  
@@ -696,7 +696,7 @@
 -int lprintf();
 -int lprint();
 -int lwrite();
-+void lprintf();
++void lprintf(char *, ...);
 +void lprint();
 +void lwrite();
  long lgetc1();
@@ -963,7 +963,7 @@
  unsigned int sum();
  
  /* module: scores.c */
-@@ -613,96 +613,96 @@
+@@ -613,96 +613,96 @@ int hashewon();
  long paytaxes();
  int winshou();
  int shou();
@@ -1129,7 +1129,7 @@
  
  #endif /* __STD__ */
  
-@@ -718,20 +718,20 @@
+@@ -718,20 +718,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 @@
+@@ -739,6 +739,17 @@ extern short iarg[MAXX][MAXY], lastnum;   
  
  extern int yrepcount,userid;
  extern int ipoint, iepoint;
diff -r 68e30f4236eb -r b63dca61c073 games/ularn/patches/patch-aj
--- a/games/ularn/patches/patch-aj      Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/patches/patch-aj      Sat Dec 06 19:28:22 2003 +0000
@@ -1,8 +1,18 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
+$NetBSD: patch-aj,v 1.2 2003/12/06 19:28:22 ben Exp $
 
---- header.h.orig      Sat Jan 13 21:51:26 2001
-+++ header.h   Sat Jan 13 21:51:43 2001
-@@ -120,7 +120,7 @@
+--- header.h.orig      1992-06-19 13:55:30.000000000 -0700
++++ header.h
+@@ -27,7 +27,8 @@
+ #include <pwd.h>
+ #include <signal.h>
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
++#include <stdlib.h>
+ #ifdef USG
+ #  include <strings.h>
+ #else
+@@ -120,7 +121,7 @@
  #define resetbold() {if (boldon) *lpnt++ = ST_END;}
  
        /* clear the screen and home the cursor */
diff -r 68e30f4236eb -r b63dca61c073 games/ularn/patches/patch-al
--- a/games/ularn/patches/patch-al      Sat Dec 06 18:51:52 2003 +0000
+++ b/games/ularn/patches/patch-al      Sat Dec 06 19:28:22 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 2001/04/27 15:27:32 agc Exp $
+$NetBSD: patch-al,v 1.2 2003/12/06 19:28:22 ben Exp $
 
---- io.c.orig  Wed Jan 18 11:48:27 1995
-+++ io.c       Sun Jan 14 07:56:12 2001
+--- io.c.orig  1995-01-18 11:48:27.000000000 -0800
++++ io.c
 @@ -47,6 +47,12 @@
   *
   * Note: ** entries are available only in termcap mode.
@@ -15,7 +15,7 @@
  #include "header.h"
  #include "extern.h"
  
-@@ -61,13 +67,13 @@
+@@ -61,13 +67,13 @@ static char lgetwbuf[LINBUFSIZE];  /* get
  /*
   *    getcharacter()  Routine to read in one character from the terminal
   */
@@ -31,7 +31,7 @@
  }
  
  
-@@ -75,7 +81,7 @@
+@@ -75,7 +81,7 @@ getcharacter ()
   *    newgame() 
   *            Subroutine to save the initial time and seed rnd()
   */
@@ -40,16 +40,28 @@
  {
        long *p,*pe;
  
-@@ -101,7 +107,7 @@
+@@ -101,18 +107,14 @@ newgame ()
   */
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note PKGREVISION bump on Ularn due to misc fixes.
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc + py-Lupy
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note PKGREVISION bump on Ularn due to misc fixes.
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc + py-Lupy
Indexes:
Home | Main Index | Thread Index | Old Index