[pkgsrc/trunk]: pkgsrc/games/ularn Make ularn build and run in Linux.

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/82447f0d6ccb
branches:  trunk
changeset: 473069:82447f0d6ccb
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu Apr 15 21:17:08 2004 +0000

description:
Make ularn build and run in Linux.

diffstat:

 games/ularn/Makefile         |  12 +++++++++-
 games/ularn/distinfo         |  12 ++++----
 games/ularn/patches/patch-aa |  53 ++++++++++++++++++++++++++++++-------------
 games/ularn/patches/patch-al |  11 +++++++-
 games/ularn/patches/patch-aw |  46 ++++++++++++++++++++-----------------
 games/ularn/patches/patch-az |  51 ++++++++++++++++++++++++++++++++++--------
 games/ularn/patches/patch-bc |  31 +++++++++++++++++--------
 7 files changed, 150 insertions(+), 66 deletions(-)

diffs (truncated from 559 to 300 lines):

diff -r 902326799df6 -r 82447f0d6ccb games/ularn/Makefile
--- a/games/ularn/Makefile      Thu Apr 15 20:37:37 2004 +0000
+++ b/games/ularn/Makefile      Thu Apr 15 21:17:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/15 21:17:08 ben Exp $
 
 DISTNAME=              ularn
 PKGNAME=               ularn-6.12.92
@@ -16,6 +16,16 @@
 CONFIGURE_SCRIPT=       ./Configure
 CONFIGURE_ARGS+=        -d
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+SUBST_CLASSES+=                termlib
+SUBST_MESSAGE.termlib= "Adding -lcompat dependency."
+SUBST_STAGE.termlib=   post-patch
+SUBST_FILES.termlib=   Configure
+SUBST_SED.termlib=     -e 's,^termlib=..termlib,& -lcompat,'
+.endif
+
 pre-configure:
        ${MV} ${WRKSRC}/Configure ${WRKSRC}/Configure.template
        ${SED} 's:XXXLIBDIRXXX:${LOCALBASE}/share/Ularn:;\
diff -r 902326799df6 -r 82447f0d6ccb games/ularn/distinfo
--- a/games/ularn/distinfo      Thu Apr 15 20:37:37 2004 +0000
+++ b/games/ularn/distinfo      Thu Apr 15 21:17:08 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/12/06 19:28:22 ben Exp $
+$NetBSD: distinfo,v 1.4 2004/04/15 21:17:08 ben Exp $
 
 SHA1 (ularn.tar.gz) = abc5bbecca65968e9ddaf2a8d07ac5141009459d
 Size (ularn.tar.gz) = 142790 bytes
-SHA1 (patch-aa) = 729fbce5942d1a8867ffcdb79a1bbfd516535106
+SHA1 (patch-aa) = 1ce8bbbc05f275a832814b08c38bc6df066fe7b0
 SHA1 (patch-ab) = a45fec8456da7b2b1985dc2332ede80082b2dab4
 SHA1 (patch-ac) = 859fb4ae3782658d2f2cf29d11da67a901499e61
 SHA1 (patch-ad) = ecf9b099ac8df2b86a9c45c0cf76c7caf194f64b
@@ -13,7 +13,7 @@
 SHA1 (patch-ai) = 43b9a2fb45a2a52347f0a83efca5ba70c3c58989
 SHA1 (patch-aj) = 09b5d87673103739c6bf7dfbf44c6fb8808fbd28
 SHA1 (patch-ak) = d2cb3bda3c2e95868362a0d0dcf4bb584d6df987
-SHA1 (patch-al) = ce8015f7f4b767549ba9d790f369bcfe8fdac287
+SHA1 (patch-al) = 051ac587d3181df8a1161fd45cbd7eff4877e2e0
 SHA1 (patch-am) = 1df190db775f3d2278275894f18246e4897738e0
 SHA1 (patch-an) = 8c669a56795a8b4a2a6e24fd2fb121aa0699c01a
 SHA1 (patch-ao) = 42a184fea3408fc935f3dcc62b7a127e81b71085
@@ -24,11 +24,11 @@
 SHA1 (patch-at) = f0fd98ce48e779e63122a8311d4a4223cda5a751
 SHA1 (patch-au) = 09f12532f42d39b59381d12c115842d5c7b8c7f3
 SHA1 (patch-av) = 028b49f03ca8e63f1adee5eb82460de2855aa6cb
-SHA1 (patch-aw) = fac054bd83a12048a33991cf2be181aab44d0294
+SHA1 (patch-aw) = 2ca6c7fdb63548a40613aa1a726d162aa8629014
 SHA1 (patch-ax) = 31f39079aeb8ccf490cc7fbbd1d3c70d9f0737ed
 SHA1 (patch-ay) = 72bc4da5ec2006f3b1b4f29afec085e13f94ed11
-SHA1 (patch-az) = a2fbfbfacc77f297f77322ce66f30bf25bddbbfd
+SHA1 (patch-az) = 0de2f5a8312bc7ff508dd40f254dcc61c0127f1a
 SHA1 (patch-ba) = be841fd37db8b8f0b588076f032c213d3eecb2f5
 SHA1 (patch-bb) = 5500e86403adc57c8315c4df66a13b851e74ef1c
-SHA1 (patch-bc) = b2a894056c94cf6b21c614b000fb9de0744f0268
+SHA1 (patch-bc) = fbe69ff9e69146e75180727fa65c1f767411e1ca
 SHA1 (patch-bd) = 54063f569eb03349b888d0dfaf02b7dcf15f7321
diff -r 902326799df6 -r 82447f0d6ccb games/ularn/patches/patch-aa
--- a/games/ularn/patches/patch-aa      Thu Apr 15 20:37:37 2004 +0000
+++ b/games/ularn/patches/patch-aa      Thu Apr 15 21:17:08 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/01/03 13:06:51 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/15 21:17:08 ben Exp $
 
---- Configure.orig     Wed Jan 18 20:41:26 1995
+--- Configure.orig     2004-04-15 13:55:44.000000000 -0700
 +++ Configure
 @@ -18,11 +18,6 @@
  PATH='.:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:/usr/bin/X11:/usr/X11/bin:/usr/openwin/bin:/usr/ccs/bin'
@@ -14,7 +14,7 @@
  (alias) >/dev/null 2>&1 && \
      echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
      echo "especially on exotic machines.  If yours does, try the Bourne shell instead.)"
-@@ -58,7 +53,7 @@
+@@ -58,7 +53,7 @@ small=''
  medium=''
  large=''
  huge=''
@@ -23,7 +23,7 @@
  ldflags=''
  cc=''
  n=''
-@@ -98,7 +93,7 @@
+@@ -98,7 +93,7 @@ compress=''
  uncompress=''
  imake=''
  xmkmf=''
@@ -32,7 +32,7 @@
  d_drand48=''
  d_havetlib=''
  termlib=''
-@@ -107,7 +102,7 @@
+@@ -107,7 +102,7 @@ d_systime=''
  d_random=''
  defcomp=''
  imaketmpl=''
@@ -41,7 +41,7 @@
  mycompress=''
  myuncompress=''
  CONFIG=''
-@@ -187,7 +182,7 @@
+@@ -187,7 +182,7 @@ EOM
      c='\c'
  fi
  echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
@@ -50,16 +50,7 @@
  rm -f .echotmp
  
  : now set up to do reads with possible shell escape and default assignment
-@@ -1361,6 +1356,8 @@
-     ;;
- esac
- 
-+termlib="$termlib -lcompat"
-+
- echo " "
- echo "End of configuration questions."
- echo " "
-@@ -1520,7 +1517,7 @@
+@@ -1520,7 +1515,7 @@ fastread=''
  echo "If you didn't make any mistakes, then just type a carriage return here."
  rp="If you need to edit config.sh, do it as a shell escape here:"
  $echo $n "$rp $c"
@@ -68,3 +59,33 @@
  case "$ans" in
  '') ;;
  *) : in case they cannot read
+@@ -1571,7 +1566,8 @@ case "$xmkmf" in
+         *) dflt="y"
+             rp="How about using "imake" to build your Makefile? [$dflt]"
+             $echo $n "$rp $c"
+-               . UU/myread
++#               . UU/myread
++            ans=n
+             case "$ans" in
+                 y*) rm -f Makefile
+                     $imake -DUseInstalled -I$imakedir -f Imakefile -s Makefile 2>/dev/null
+@@ -1602,7 +1598,8 @@ case "$xmkmf" in
+     *)     dflt="y"
+         rp="How about using "xmkmf" to build your Makefile? [$dflt]"
+         $echo $n "$rp $c"
+-        . UU/myread
++#        . UU/myread
++        ans=n
+         case "$ans" in
+             y*) echo "OK..."
+                 $xmkmf
+@@ -1621,7 +1618,8 @@ case "$xmkmf" in
+                 *) dflt="y"
+                     rp="No? Ok, how about "imake"? [$dflt]"
+                     $echo $n "$rp $c"
+-                    . UU/myread
++#                    . UU/myread
++                    ans=n
+                     case "$ans" in
+                         y*) rm -f Makefile
+                             $imake -DUseInstalled -I$imakedir -f Imakefile -s Makefile 2>/dev/null
diff -r 902326799df6 -r 82447f0d6ccb games/ularn/patches/patch-al
--- a/games/ularn/patches/patch-al      Thu Apr 15 20:37:37 2004 +0000
+++ b/games/ularn/patches/patch-al      Thu Apr 15 21:17:08 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2003/12/06 19:28:22 ben Exp $
+$NetBSD: patch-al,v 1.3 2004/04/15 21:17:08 ben Exp $
 
 --- io.c.orig  1995-01-18 11:48:27.000000000 -0800
 +++ io.c
-@@ -47,6 +47,12 @@
+@@ -47,12 +47,18 @@
   *
   * Note: ** entries are available only in termcap mode.
   */
@@ -11,10 +11,17 @@
 +#include <sys/uio.h>
 +#include <stdlib.h>
 +#include <termcap.h>
++#include <time.h>
 +#include <unistd.h>
  #include "header.h"
  #include "extern.h"
  
+ #define LINBUFSIZE 128                /* size of the lgetw() and lgetl() buffer */
+ 
+-extern short ospeed;
+ 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
  /*
   *    getcharacter()  Routine to read in one character from the terminal
diff -r 902326799df6 -r 82447f0d6ccb games/ularn/patches/patch-aw
--- a/games/ularn/patches/patch-aw      Thu Apr 15 20:37:37 2004 +0000
+++ b/games/ularn/patches/patch-aw      Thu Apr 15 21:17:08 2004 +0000
@@ -1,18 +1,22 @@
-$NetBSD: patch-aw,v 1.2 2003/12/06 19:28:22 ben Exp $
+$NetBSD: patch-aw,v 1.3 2004/04/15 21:17:08 ben Exp $
 
 --- savelev.c.orig     1992-06-19 13:55:34.000000000 -0700
 +++ savelev.c
-@@ -1,4 +1,6 @@
+@@ -1,4 +1,7 @@
  /* savelev.c  */
++#include <errno.h>
 +#include <stdlib.h>
 +#include <unistd.h>
  #include "header.h"
  #include "sphere.h"
  #include "player.h"
-@@ -9,9 +11,7 @@
- extern char *sys_errlist[];
- extern int errno;
+@@ -6,12 +9,7 @@
+ #include "monst.h"
+ #include "extern.h"
  
+-extern char *sys_errlist[];
+-extern int errno;
+-
 -typedef char  Char_Ary[MAXX][MAXY];
 -typedef short Short_Ary[MAXX][MAXY];
 -typedef long  Long_Ary[MAXX][MAXY];
@@ -20,7 +24,7 @@
  typedef struct_mitem  Mitem_Ary[MAXX][MAXY];
  
  static int w = 0;
-@@ -19,11 +19,11 @@ static int r = 0;
+@@ -19,11 +17,11 @@ static int r = 0;
  
  /* this is the structure that holds the entire dungeon specifications */
  typedef struct save_lev_str {
@@ -36,7 +40,7 @@
  } Saved_Level;
  
  static Saved_Level *saved_levels[NLEVELS];
-@@ -33,15 +33,15 @@ static unsigned int FileSum;
+@@ -33,15 +31,15 @@ static unsigned int FileSum;
  /*
   *    routine to save the present level into storage
   */
@@ -57,7 +61,7 @@
        level_sums[level] = sum((unsigned char *)storage, sizeof(Saved_Level));
  }
  
-@@ -49,17 +49,17 @@ savelevel()
+@@ -49,17 +47,17 @@ savelevel()
  /*
   *    routine to restore a level from storage
   */
@@ -80,7 +84,7 @@
  
        if (level_sums[level] > 0) {
          if ((i = sum((unsigned char *)storage,sizeof(Saved_Level))) 
-@@ -82,7 +82,7 @@ getlevel()
+@@ -82,7 +80,7 @@ getlevel()
  /*
   *    to save the game in a file
   */
@@ -89,7 +93,7 @@
  char  *fname;
  {
        int     i;
-@@ -145,10 +145,10 @@ char     *fname;
+@@ -145,10 +143,10 @@ char     *fname;
        bwrite(fd,(char * )char_class, 20 * sizeof(char));
  
        for (i=0; i<MAXSCROLL; i++)
@@ -102,7 +106,7 @@
  
        bwrite(fd,(char *)spelknow, sizeof(char) * SPNUM);
        bwrite(fd,(char *)&wizard, sizeof(wizard));
-@@ -192,18 +192,22 @@ char     *fname;
+@@ -192,18 +190,22 @@ char     *fname;
  }
  
  
@@ -128,7 +132,7 @@
                        fprintf(stderr,"Can't create temp file to restore game\n");
                        perror("mktemp");
                        nosignal=0;
-@@ -221,15 +225,18 @@ char     *fname;
+@@ -221,15 +223,18 @@ char     *fname;
                        sleep(4);
                        c[GOLD] = c[BANKACCOUNT] = 0;
                        died(-265);
@@ -148,7 +152,7 @@
                        return;
                }
        } else {
-@@ -273,10 +280,10 @@ char     *fname;
+@@ -273,10 +278,10 @@ char     *fname;
        bread(fd,(char * )char_class, sizeof(char) * 20);
  
        for (i=0; i<MAXSCROLL; i++)
@@ -161,7 +165,7 @@