Re: pkg/29426: package games/netmaze fails build

[Julian Coleman <jdc%coris.org.uk@localhost>]

The following reply was made to PR pkg/29426; it has been noted by GNATS.

From: Julian Coleman <jdc%coris.org.uk@localhost>
To: spamnjet%yahoo.de@localhost
Cc: gnats-bugs%netbsd.org@localhost
Subject: Re: pkg/29426: package games/netmaze fails build
Date: Tue, 5 Apr 2005 15:46:34 +0100

 --BXVAT5kNtrzKuDFl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 > Thanks for the efforts.  Regret having to advise that build still fails 
 > after
 > including the 2 files (patch and distinfo) you sent me.  Greetings, Lux
 
 (Hampered by only having access to a linux machine without X.)
 
 Can you try these 3 patches (in addition to the previous one) and latest
 distinfo file, please?
 
 Thanks,
 
 J
 
 -- 
   My other computer also runs NetBSD    /        Sailing at Newbiggin
         http://www.netbsd.org/        /   http://www.newbigginsailingclub.org/
 
 --BXVAT5kNtrzKuDFl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-ac
 
 $NetBSD$
 --- iocntl.c.dist      1994-03-21 21:42:49.000000000 +0000
 +++ iocntl.c   2005-04-05 15:15:23.000000000 +0100
 @@ -4,7 +4,7 @@
  
  #include "netmaze.h"
  
 -#ifdef RS6000
 +#if (RS6000 || Linux)
   #include <sys/select.h>
  #endif
  
 @@ -16,8 +16,13 @@
  #include <sys/ioctl.h>
  
  #ifdef HAVE_FDSET
 +# ifdef Linux
 + fd_set readmask;
 + fd_set writemask;
 +# else
   struct fd_set readmask;
   struct fd_set writemask;
 +# endif
  #else
   struct fd_mask readmask;
   struct fd_mask writemask;
 @@ -63,7 +68,7 @@
   #ifdef RS6000 /* ibm rs/6000 */
     sigemptyset(&vec.sa_mask);
   #else
 -  vec.sa_mask = 0;
 +   (void)sigprocmask (SIG_SETMASK, 0, NULL);
   #endif
    vec.sa_flags = 0;
    if ( sigaction(SIGIO, &vec, (struct sigaction *) 0) == -1)
 @@ -144,8 +149,13 @@
    static char buf[256];
  
  #ifdef HAVE_FDSET
 +# ifdef Linux
 + fd_set readmask1;
 + fd_set writemask1;
 +# else
    struct fd_set        readmask1;
    struct fd_set        writemask1;
 +# endif
  #else
    struct fd_mask readmask1;
    struct fd_mask writemask1;
 
 --BXVAT5kNtrzKuDFl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-ae
 
 $NetBSD$
 --- netserv.c.dist     1994-04-10 11:07:23.000000000 +0100
 +++ netserv.c  2005-04-05 15:25:17.000000000 +0100
 @@ -106,7 +106,11 @@
  
  
  #ifdef HAVE_FDSET
 +#  ifdef Linux
 +  fd_set readmask;
 +#  else
    struct fd_set readmask;
 +#  endif
  #else
    struct fd_mask readmask;
  #endif
 @@ -629,7 +633,7 @@
   #ifdef RS6000 /* ibm rs/6000 */
     sigemptyset(&vec1.sa_mask);
   #else
 -  vec1.sa_mask = 0;
 +   (void)sigprocmask (SIG_SETMASK, 0, NULL);
   #endif
    vec1.sa_flags = 0;
    if ( sigaction(SIGALRM, &vec1, (struct sigaction *) 0) == -1) 
perror("SIGALRM\n");
 @@ -652,7 +656,7 @@
   #ifdef RS6000 /* ibm rs/6000 */
     sigemptyset(&svec1.sa_mask);
   #else
 -  svec1.sa_mask = 0;
 +   (void)sigprocmask (SIG_SETMASK, 0, NULL);
   #endif
    svec1.sa_flags = 0;
    if(sigaction(SIGCHLD,&svec1,(struct sigaction *)0) == -1) 
perror("SIGCHLD\n");
 @@ -779,7 +783,11 @@
  void io_cntl(void)
  {
  #ifdef HAVE_FDSET
 +#  ifdef Linux
 +  fd_set readmask1;
 +#  else
    struct fd_set readmask1;
 +#  endif
  #else
    struct fd_mask readmask1;
  #endif
 @@ -914,7 +922,7 @@
    char *saddr = (char *) &(((struct sockaddr_in *) 
&(q->remoteaddr))->sin_addr.s_addr);
    hp = gethostbyaddr(saddr,4,AF_INET);
  
 -  if(strlen(hp->h_name) > 0)
 +  if(hp && strlen(hp->h_name) > 0)
      strcpy(name,hp->h_name);
    else
      sprintf(name,"%d.%d.%d.%d",(int) saddr[0],(int) saddr[1],(int) 
saddr[2],(int) saddr[3]);
 
 --BXVAT5kNtrzKuDFl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-af
 
 $NetBSD$
 --- robot.c.dist       1994-03-22 11:06:17.000000000 +0000
 +++ robot.c    2005-04-05 15:25:37.000000000 +0100
 @@ -49,7 +49,11 @@
  extern void ident_player(void);
  
  #ifdef HAVE_FDSET
 +#  ifdef Linux
 +  fd_set readmask;
 +#  else
  struct fd_set readmask;
 +#  endif
  #else
  struct fd_mask readmask;
  #endif
 @@ -97,7 +101,7 @@
   #ifdef RS6000 /* ibm rs/6000 */
     sigemptyset(&vec.sa_mask);
   #else
 -  vec.sa_mask = 0;
 +   (void)sigprocmask (SIG_SETMASK, 0, NULL);
   #endif
    vec.sa_flags = 0;
    if ( sigaction(SIGIO, &vec, (struct sigaction *) 0) == -1)
 @@ -139,7 +143,11 @@
    int numfds;
  
  #ifdef HAVE_FDSET
 +#  ifdef Linux
 +  fd_set readmask1;
 +#  else
    struct fd_set readmask1;
 +#  endif
  #else
    struct fd_mask readmask1;
  #endif
 
 --BXVAT5kNtrzKuDFl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=distinfo
 
 $NetBSD: distinfo,v 1.5 2005/02/23 23:12:01 agc Exp $
 
 SHA1 (netmaze0.81.tar.gz) = 61c3e1dc00372b18a622cd330c322817e73a6cf4
 RMD160 (netmaze0.81.tar.gz) = fe30487c441d0789a1526e4ec2f4cd2cf57a416a
 Size (netmaze0.81.tar.gz) = 281463 bytes
 SHA1 (patch-aa) = 9bf19e360d54fe8130f93252e82f7c22773884a4
 SHA1 (patch-ab) = 412e8a9a27413b3d7c579d1abc34a4addf6f4e83
 SHA1 (patch-ac) = 35c058c8e20bcbe8300cd3ef7c467eab2cb1d0ff
 SHA1 (patch-ad) = 9fd31fa10618f76eb705fe1f77895889019e07b8
 SHA1 (patch-ae) = 4a3e4a962dbe11022cfef3fce38d6363d04351a6
 SHA1 (patch-af) = 74d4237139c528ee4c9f961feb57af86bcf1ba54
 SHA1 (patch-ag) = 8370210cfbeca003e942e60afa02c7df47fc8a4a
 SHA1 (patch-ah) = e291a07a14372eb440e4dc2ed955404fda409452
 SHA1 (patch-ai) = ed8a0ad9b19f1a8d1d4812930bd137b4aacfa954
 SHA1 (patch-aj) = ff443fab49624c62ef7d14562b1adbfb3b32f651
 SHA1 (patch-ak) = b0a6ee3cb435852cf43cd231f7e8e4f269215225
 SHA1 (patch-al) = 17c66e5dda796258b935ebee974df8a092f38c4f
 SHA1 (patch-am) = af29aa8ed0955cf314fa27117457daf57078ddfb
 SHA1 (patch-an) = 28a25e4d493f6c24d6fb9499a939f659a51c436c
 SHA1 (patch-ao) = 37ede535ccda7ffb267ea1927a197590f1088b37
 
 --BXVAT5kNtrzKuDFl--