From 95b29e2467e224158b57e7c44c45a331eabd3302 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 23 Mar 2000 13:40:41 +0000 Subject: Make this "highly portable program" compile on Solaris. --- math/yacas/files/patch-sum | 10 +++++++--- math/yacas/patches/patch-aa | 13 +++++++++---- math/yacas/patches/patch-ab | 14 ++++++++++---- math/yacas/patches/patch-ae | 15 +++++++++++++++ math/yacas/patches/patch-af | 18 ++++++++++++++++++ math/yacas/patches/patch-ag | 14 ++++++++++++++ math/yacas/patches/patch-ah | 14 ++++++++++++++ 7 files changed, 87 insertions(+), 11 deletions(-) create mode 100644 math/yacas/patches/patch-ae create mode 100644 math/yacas/patches/patch-af create mode 100644 math/yacas/patches/patch-ag create mode 100644 math/yacas/patches/patch-ah diff --git a/math/yacas/files/patch-sum b/math/yacas/files/patch-sum index 7969918a4fc..ab13da252eb 100644 --- a/math/yacas/files/patch-sum +++ b/math/yacas/files/patch-sum @@ -1,6 +1,10 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/02/20 14:40:35 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.2 2000/03/23 13:40:41 agc Exp $ -MD5 (patch-aa) = 34d3d0591a66b371bfbb0f39a730293a -MD5 (patch-ab) = 52c89bbfbfaba1f55154406251ce3129 +MD5 (patch-aa) = 792f6d54a8de1136eaab2d33a1d571f0 +MD5 (patch-ab) = 5931588de7307d8f9f67debe5fcc617c MD5 (patch-ac) = 1ceb2d569c49797087f7df8e5486da3e MD5 (patch-ad) = cb7a4ea79580f13117a24c2907e54007 +MD5 (patch-ae) = 5cc67804bd32900e5a0134f7428cc81f +MD5 (patch-af) = ef47f34ba03079bec722669cf5b0c524 +MD5 (patch-ag) = 0b0e6f4047df99e4d4b856ed71967e79 +MD5 (patch-ah) = d05e2a6369847cecb4c47b62d3b8d086 diff --git a/math/yacas/patches/patch-aa b/math/yacas/patches/patch-aa index 1d7a4a43b83..4b872518d55 100644 --- a/math/yacas/patches/patch-aa +++ b/math/yacas/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/02/20 14:40:35 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2000/03/23 13:40:42 agc Exp $ ---- ./server/localsendreceive.cc.orig Sun Dec 12 22:34:42 1999 -+++ ./server/localsendreceive.cc Sat Feb 19 15:31:49 2000 -@@ -1,12 +1,16 @@ +--- server/localsendreceive.cc.orig Mon Dec 13 03:34:42 1999 ++++ server/localsendreceive.cc Thu Mar 23 12:11:34 2000 +@@ -1,14 +1,21 @@ +#if !defined(__NetBSD__) #include @@ -21,4 +21,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/02/20 14:40:35 dmcmahill Exp $ +#include +#include #include ++#if defined(__sun__) && defined(__svr4__) ++#include ++#endif #include + + void DBaseSendReceive(char* the_address,char* str,char* buffer,int max,int receive) diff --git a/math/yacas/patches/patch-ab b/math/yacas/patches/patch-ab index 16394aad6be..13aec3597cb 100644 --- a/math/yacas/patches/patch-ab +++ b/math/yacas/patches/patch-ab @@ -1,9 +1,15 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/02/20 14:40:35 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2000/03/23 13:40:42 agc Exp $ ---- ./server/sendreceive.cc.orig Sun Nov 28 12:50:55 1999 -+++ ./server/sendreceive.cc Sat Feb 19 21:08:41 2000 -@@ -1,3 +1,4 @@ +--- server/sendreceive.cc.orig Sun Nov 28 17:50:55 1999 ++++ server/sendreceive.cc Thu Mar 23 13:29:31 2000 +@@ -1,6 +1,10 @@ #include +#include #include #include ++#if defined(__sun__) && defined(__svr4__) ++#include ++#endif + #include + #include + #include diff --git a/math/yacas/patches/patch-ae b/math/yacas/patches/patch-ae new file mode 100644 index 00000000000..e028f2951ce --- /dev/null +++ b/math/yacas/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2000/03/23 13:40:42 agc Exp $ + +Include a header file for FIONREAD + +--- server/serverloop.cc 2000/03/23 12:09:40 1.1 ++++ server/serverloop.cc 2000/03/23 12:10:41 +@@ -1,5 +1,8 @@ + #include + #include ++#if defined(__sun__) && defined(__svr4__) ++#include ++#endif + #include + #include + #include diff --git a/math/yacas/patches/patch-af b/math/yacas/patches/patch-af new file mode 100644 index 00000000000..0cc34569ae0 --- /dev/null +++ b/math/yacas/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2000/03/23 13:40:42 agc Exp $ + +For Solaris, add -lsocket and -lnsl. +This patch assumes bmake. + +--- server/Makefile.in 2000/03/23 13:21:52 1.1 ++++ server/Makefile.in 2000/03/23 13:22:31 +@@ -101,6 +101,10 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ ++OPSYS!= uname -s ++.if ${OPSYS} == "SunOS" ++LIBS+= -lsocket -lnsl ++.endif + yacasserversingle_OBJECTS = yacasserver.o serverloop.o uncgi.o \ + yacasdo.o localsendreceive.o configread.o + yacasserversingle_DEPENDENCIES = ../src/libyacas.a \ diff --git a/math/yacas/patches/patch-ag b/math/yacas/patches/patch-ag new file mode 100644 index 00000000000..c84f72a81e9 --- /dev/null +++ b/math/yacas/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2000/03/23 13:40:43 agc Exp $ + +--- server/serverloopthreaded.cc 2000/03/23 13:27:39 1.1 ++++ server/serverloopthreaded.cc 2000/03/23 13:27:54 +@@ -4,6 +4,9 @@ + #include + #include + #include ++#if defined(__sun__) && defined(__svr4__) ++#include ++#endif + #include + #include + #include diff --git a/math/yacas/patches/patch-ah b/math/yacas/patches/patch-ah new file mode 100644 index 00000000000..457ed7992d2 --- /dev/null +++ b/math/yacas/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1 2000/03/23 13:40:43 agc Exp $ + +--- server/serverloopsingle.cc 2000/03/23 13:31:30 1.1 ++++ server/serverloopsingle.cc 2000/03/23 13:31:39 +@@ -5,6 +5,9 @@ + #include + #include + #include ++#if defined(__sun__) && defined(__svr4__) ++#include ++#endif + #include + #include + #include -- cgit v1.2.3