summaryrefslogtreecommitdiff
path: root/mbone/sdr
diff options
context:
space:
mode:
authorgarbled <garbled>1998-09-13 18:02:10 +0000
committergarbled <garbled>1998-09-13 18:02:10 +0000
commitb8287a68962e33c5c92eb0d6c00148d77ef98386 (patch)
treeeb6d5c0148251a7ff5491d48d92d7abf075171fa /mbone/sdr
parent201828a4fd4da1b82e29728e49577c9aa3db3eee (diff)
downloadpkgsrc-b8287a68962e33c5c92eb0d6c00148d77ef98386.tar.gz
Make the makefile honor LDFLAGS from the environment, and fix up a few
LP64'isms with help from kleink.
Diffstat (limited to 'mbone/sdr')
-rw-r--r--mbone/sdr/files/Makefile.netbsd4
-rw-r--r--mbone/sdr/patches/patch-ac20
-rw-r--r--mbone/sdr/patches/patch-ad26
-rw-r--r--mbone/sdr/patches/patch-ae12
4 files changed, 60 insertions, 2 deletions
diff --git a/mbone/sdr/files/Makefile.netbsd b/mbone/sdr/files/Makefile.netbsd
index 808cbdb9859..ff4285df414 100644
--- a/mbone/sdr/files/Makefile.netbsd
+++ b/mbone/sdr/files/Makefile.netbsd
@@ -1,10 +1,10 @@
#
-# $NetBSD: Makefile.netbsd,v 1.2 1998/08/07 11:09:58 agc Exp $
+# $NetBSD: Makefile.netbsd,v 1.3 1998/09/13 18:02:10 garbled Exp $
#
CC=cc
INCLUDES=-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include
LIB_DIR=${LOCALBASE}/lib
-LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
+LIBS= ${LDFLAGS} -L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
CFLAGS+=-ggdb $(INCLUDES) -DNORANDPROTO -DUSE_PERROR -Werror
LIBRARY_TCL = ${LIB_DIR}/tcl8.0
LIBRARY_TK = ${LIB_DIR}/tk8.0
diff --git a/mbone/sdr/patches/patch-ac b/mbone/sdr/patches/patch-ac
new file mode 100644
index 00000000000..b7c83af0b19
--- /dev/null
+++ b/mbone/sdr/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.3 1998/09/13 18:02:10 garbled Exp $
+--- src/iohandler.c.orig Sun Sep 13 10:28:50 1998
++++ src/iohandler.c Sun Sep 13 10:30:44 1998
+@@ -43,6 +43,7 @@
+ #include <time.h>
+ #include <winsock.h>
+ #endif
++#include <sys/inttypes.h>
+ #include <tk.h>
+ #ifdef WIN32
+ #define WM_WSOCK_READY WM_USER+123
+@@ -135,7 +136,7 @@
+ sockproc[fd] = callback;
+ #else
+ Tcl_CreateFileHandler(fd,
+- mask, callback, (ClientData)fd);
++ mask, callback, (ClientData)(intptr_t)fd);
+ #endif
+ }
+
diff --git a/mbone/sdr/patches/patch-ad b/mbone/sdr/patches/patch-ad
new file mode 100644
index 00000000000..ad8bc96c5d7
--- /dev/null
+++ b/mbone/sdr/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.3 1998/09/13 18:02:10 garbled Exp $
+--- src/sd_listen.c.orig Sun Sep 13 10:34:47 1998
++++ src/sd_listen.c Sun Sep 13 10:37:01 1998
+@@ -316,10 +316,10 @@
+
+ if (strncmp(k1, "k=", 2)==0)
+ {
+- if ((u_int)k2>=(u_int)k1+2)
++ if ((uintptr_t)k2>=(uintptr_t)k1+2)
+ {
+- memcpy(key, k1+2, (u_int)k2-((u_int)k1+1));
+- key[(u_int)k2-((u_int)k1+1)]='\0';
++ memcpy(key, k1+2, (uintptr_t)k2-((uintptr_t)k1+1));
++ key[(uintptr_t)k2-((uintptr_t)k1+1)]='\0';
+ }
+ else
+ {
+@@ -648,7 +648,7 @@
+ struct timeval tv;
+ unsigned long src, hfrom;
+ char *data;
+- int ix = rfd2sock[PTOI(fd)];
++ intptr_t ix = rfd2sock[PTOI(fd)];
+
+ fromlen=sizeof(struct sockaddr);
+
diff --git a/mbone/sdr/patches/patch-ae b/mbone/sdr/patches/patch-ae
new file mode 100644
index 00000000000..d6a4422848e
--- /dev/null
+++ b/mbone/sdr/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 1998/09/13 18:02:10 garbled Exp $
+--- src/generic_prototypes.h.orig Sun Sep 13 10:38:28 1998
++++ src/generic_prototypes.h Sun Sep 13 10:39:31 1998
+@@ -37,7 +37,7 @@
+ #endif
+
+ /*yeuch - dont use these unless you really know why*/
+-#ifdef ALPHA
++#ifdef __alpha__
+ #define PTOI(p) (int)(long)p
+ #define ITOP(p) (void *)(long)p
+ #else