Make it compile on solaris.

3 files changed, 34 insertions, 4 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index e4f5d6eca75..e731182c515 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/10/28 02:40:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.25 2000/03/15 07:17:39 bouyer Exp $
 #
 
 DISTNAME=	sdr-2.7
@@ -15,21 +15,33 @@ USE_GMAKE=	yes
 
 RESTRICTED=	"Uses encryption"
 
+.include "../../mk/bsd.prefs.mk"
+
 .if exists(/usr/include/sys/inttypes.h)
 EXTRA_FLAGS+=	-DHAVE_SYS_INTTYPES_H
 MAKE_FLAGS+=	EXTRA_FLAGS="${EXTRA_FLAGS}"
 .endif
 
+.if ${OPSYS} == "SunOS"
+SYSDIR= solaris
+.else
+SYSDIR= netbsd
+.endif
+
 do-configure:
 	cd ${WRKSRC}/common	; ${SH} ./configure
+.if ${OPSYS} == "SunOS"
+	${CAT} ${WRKSRC}/sdr/solaris/Makefile.solaris ${WRKSRC}/sdr/src/Makefile.template > ${WRKSRC}/sdr/solaris/Makefile
+.else
 	${MKDIR} ${WRKSRC}/sdr/netbsd
 	${CAT} ${FILESDIR}/Makefile.netbsd ${WRKSRC}/sdr/src/Makefile.template > ${WRKSRC}/sdr/netbsd/Makefile
+.endif
 
 do-build:
 	cd ${WRKSRC}/common	; ${GMAKE}
-	cd ${WRKSRC}/sdr/netbsd	; ${GMAKE}
+	cd ${WRKSRC}/sdr/${SYSDIR}	; ${GMAKE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sdr/netbsd/sdr ${PREFIX}/bin/sdr
+	${INSTALL_PROGRAM} ${WRKSRC}/sdr/${SYSDIR}/sdr ${PREFIX}/bin/sdr
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/sdr/files/patch-sum b/mbone/sdr/files/patch-sum
index c6ce8fa45c8..14c81eafd70 100644
--- a/mbone/sdr/files/patch-sum
+++ b/mbone/sdr/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 1999/10/28 02:40:24 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/03/15 07:17:41 bouyer Exp $
 
 MD5 (patch-aa) = b10166bf243215b706006e9b5255f208
 MD5 (patch-ab) = 5d1e2bf629f06344db61bba29d14b555
@@ -11,3 +11,4 @@ MD5 (patch-ah) = 63512e42ca7b6a2c16e5440841b5f3ed
 MD5 (patch-aj) = 616a9c2ae2efc53196a94d2a89019a8c
 MD5 (patch-ak) = d013192600f69a313d6477ef47fac6de
 MD5 (patch-ao) = 5cbb4d6c6d77e02bd885307fdd406d4c
+MD5 (patch-ap) = a01a5ed0b4fb3fa40b9288398510a3d4
diff --git a/mbone/sdr/patches/patch-ap b/mbone/sdr/patches/patch-ap
new file mode 100644
index 00000000000..3eae5dd0e3a
--- /dev/null
+++ b/mbone/sdr/patches/patch-ap
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.1 2000/03/15 07:17:41 bouyer Exp $
+
+--- sdr/solaris/Makefile.solaris.orig	Mon Mar 13 16:11:46 2000
++++ sdr/solaris/Makefile.solaris	Mon Mar 13 16:13:20 2000
+@@ -1,7 +1,8 @@
+ CC          = gcc 
+-INCLUDES    = -I/usr/openwin/include -I../../tcl-8.0/generic -I../../tk-8.0/generic -I../../common
+-LIBS        = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a \
+-             -L/usr/openwin/lib -lX11 -lm -lnsl -ldl -lsocket -lresolv 
++INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.0/generic -I${LOCALBASE}/include/tcl8.0/generic -I../../common
++LIBS        = -L${LOCALBASE}/lib -ltk80 -ltcl80 ../../common/libcommon.a \
++		-lm -L${X11BASE}/lib -lX11 -lz  -lnsl -ldl -lsocket -lresolv \
++		-Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
+-CFLAGS      = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris
++CFLAGS      = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris -DHAVE_ZLIB
+ 
+ all::	sdr