Make this pkg compile on alpha again:

LP64 fixes to deal with -Werror
Re-enable INTTYPES stuff that was lost in the recent update.
Thanks to Matt for helping me with a nasty.. ;)

7 files changed, 104 insertions, 16 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 9fc79b590d6..dd54eebf3c0 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/11/05 06:35:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.14 1999/01/01 07:58:29 garbled Exp $
 #
 
 DISTNAME=	sdr-2.5.8
@@ -20,7 +20,8 @@ USE_X11=	yes
 _INTTYPES!=	if [ -e /usr/include/sys/inttypes.h ]; then echo "Exists"; else echo "No go"; fi
 
 .if (${_INTTYPES} == "Exists")
-CFLAGS+= -DHAVE_SYS_INTTYPES_H
+EXTRA_FLAGS+= -DHAVE_SYS_INTTYPES_H
+MAKE_FLAGS+=	EXTRA_FLAGS="${EXTRA_FLAGS}"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/sdr/files/Makefile.netbsd b/mbone/sdr/files/Makefile.netbsd
index 4c6d1cf79af..1fc70be35b8 100644
--- a/mbone/sdr/files/Makefile.netbsd
+++ b/mbone/sdr/files/Makefile.netbsd
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile.netbsd,v 1.4 1998/11/05 05:32:19 mycroft Exp $
+#	$NetBSD: Makefile.netbsd,v 1.5 1999/01/01 07:58:29 garbled Exp $
 
 CC	    = gcc -g -O
 INCLUDES    = -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include
 LIBS	    = -L${LOCALBASE}/lib -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
-CFLAGS	    = ${INCLUDES} -DNORANDPROTO -DUSE_PERROR -DAUTH -Werror
+CFLAGS	    = ${INCLUDES} -DNORANDPROTO -DUSE_PERROR -DAUTH ${EXTRA_FLAGS} -Werror
 
 all::	sdr
 
diff --git a/mbone/sdr/patches/patch-aa b/mbone/sdr/patches/patch-aa
new file mode 100644
index 00000000000..8fa83bef475
--- /dev/null
+++ b/mbone/sdr/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.6 1999/01/01 07:58:29 garbled Exp $
+--- src/polluted.c.orig	Thu Dec 31 23:09:13 1998
++++ src/polluted.c	Fri Jan  1 00:47:48 1999
+@@ -197,7 +197,7 @@
+     if (find_key_by_name(keyname, key)!=0)
+       return -1;
+     addata->length= strlen(adstr);
+-#ifdef NEVER
++#ifndef NEVER
+     encrypt_announcement(adstr, &encdata, &(addata->length), key);
+ #else
+     encrypt_announcement(adstr, &encdata, (int *)addata->length, key);
diff --git a/mbone/sdr/patches/patch-ab b/mbone/sdr/patches/patch-ab
index 784795cc731..a3d0bf39df1 100644
--- a/mbone/sdr/patches/patch-ab
+++ b/mbone/sdr/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.5 1998/11/05 05:32:19 mycroft Exp $
-
---- src/sip_common.c.orig	Thu Oct  1 18:53:01 1998
-+++ src/sip_common.c	Wed Nov  4 23:44:12 1998
-@@ -256,7 +256,7 @@
+$NetBSD: patch-ab,v 1.6 1999/01/01 07:58:29 garbled Exp $
+--- src/sip_common.c.orig	Thu Oct  1 15:53:01 1998
++++ src/sip_common.c	Thu Dec 31 23:04:38 1998
+@@ -41,6 +41,9 @@
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #endif
++#ifdef HAVE_SYS_INTTYPES_H
++#include <inttypes.h>
++#endif
+ #include "dns.h"
+ #include "prototypes.h"
+ #include <sys/uio.h>
+@@ -256,7 +259,7 @@
  	  len=res_mkquery(QUERY, hostname, C_IN, T_MX, NULL, NULL, 
  			  NULL, buf, 200);
  	  if (len==-1) perror("res_mkquery");
@@ -11,7 +20,7 @@ $NetBSD: patch-ab,v 1.5 1998/11/05 05:32:19 mycroft Exp $
  	  if (len==-1) perror("res_send");
  	  ans[0]=htonl(ans[0]);
  	  ans[1]=htonl(ans[1]);
-@@ -328,7 +328,8 @@
+@@ -328,7 +331,8 @@
  		    } else {
  		      /*it's compressed*/
  		        if(*tstr==0) tstr+=2;
@@ -21,3 +30,15 @@ $NetBSD: patch-ab,v 1.5 1998/11/05 05:32:19 mycroft Exp $
  			tstr+=1;
  			ctr=0;
  		    }
+@@ -1238,7 +1242,11 @@
+   }
+   printf("clen=%d\n", clen);
+   ptr=find_end_of_header(data, len);
++#ifdef HAVE_SYS_INTTYPES_H
++  printf("eoh at %x, start at %x, len: %d\n", (intptr_t)ptr, (intptr_t)data, len);
++#else
+   printf("eoh at %x, start at %x, len: %d\n", (unsigned int)ptr, (unsigned int)data, len);
++#endif
+   if (ptr==NULL) return 0;
+   if (clen==0) return 1;
+   if ((ptr-data)+clen<=len) return 1;
diff --git a/mbone/sdr/patches/patch-ad b/mbone/sdr/patches/patch-ad
index 3951f77f203..9b30e2f9bdc 100644
--- a/mbone/sdr/patches/patch-ad
+++ b/mbone/sdr/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.5 1998/11/05 05:32:19 mycroft Exp $
-
---- src/sd_listen.c.orig	Wed Oct  7 07:18:56 1998
-+++ src/sd_listen.c	Wed Nov  4 23:52:04 1998
-@@ -484,10 +484,18 @@
+$NetBSD: patch-ad,v 1.6 1999/01/01 07:58:29 garbled Exp $
+--- src/sd_listen.c.orig	Wed Oct  7 04:18:56 1998
++++ src/sd_listen.c	Thu Dec 31 22:59:57 1998
+@@ -55,6 +55,9 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #endif
++#ifdef HAVE_SYS_INTTYPES_H
++#include <inttypes.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <setjmp.h>
+@@ -484,10 +487,18 @@
        }
  
        if (strncmp(k1, "k=", 2)==0) {
@@ -22,7 +31,19 @@ $NetBSD: patch-ad,v 1.5 1998/11/05 05:32:19 mycroft Exp $
            key[0]='\0';
          }
  	p=strchr(k1, '\n')+1;
-@@ -1509,7 +1517,11 @@
+@@ -1344,7 +1355,11 @@
+     if (cli) {
+       init_cli();
+       inChannel = fileno(stdin);
++#ifdef HAVE_SYS_INTTYPES_H
++      Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData)(intptr_t) inChannel);
++#else
+       Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData) inChannel);
++#endif
+     }
+ #endif
+ 
+@@ -1509,7 +1524,11 @@
      char buf[MAXADSIZE];
      char debugbuf[MAXADSIZE];
  
diff --git a/mbone/sdr/patches/patch-ag b/mbone/sdr/patches/patch-ag
new file mode 100644
index 00000000000..b0eac102f0a
--- /dev/null
+++ b/mbone/sdr/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.4 1999/01/01 07:58:29 garbled Exp $
+--- src/crypt.c.orig	Thu Dec 31 23:07:10 1998
++++ src/crypt.c	Thu Dec 31 23:07:36 1998
+@@ -2,6 +2,7 @@
+   the padding bit is 0x80 in byte 0, rather than 0x20 in RTP.*/
+ 
+ #include <sys/types.h>
++#include <string.h>
+ #include "crypt.h"
+ #include "qfDES.h"
+ #include "md5.h"
diff --git a/mbone/sdr/patches/patch-ah b/mbone/sdr/patches/patch-ah
new file mode 100644
index 00000000000..25dee1bdcc2
--- /dev/null
+++ b/mbone/sdr/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.4 1999/01/01 07:58:29 garbled Exp $
+--- src/polluted.c.orig	Thu Dec 31 23:09:13 1998
++++ src/polluted.c	Thu Dec 31 23:11:35 1998
+@@ -1,3 +1,6 @@
++#ifdef HAVE_SYS_INTTYPES_H
++#include <inttypes.h>
++#endif
+ #include "sdr.h"
+ #include "prototypes.h"
+ #include "prototypes_crypt.h"
+@@ -200,7 +203,11 @@
+ #ifdef NEVER
+     encrypt_announcement(adstr, &encdata, &(addata->length), key);
+ #else
++#ifdef HAVE_SYS_INTTYPES_H
++    encrypt_announcement(adstr, &encdata, (intptr_t)addata->length, key);
++#else
+     encrypt_announcement(adstr, &encdata, (int *)addata->length, key);
++#endif
+ #endif
+     addata->data=malloc(addata->length);
+     memcpy(addata->data, encdata, addata->length);