Upgrade to sdr 2.9

Submitted by:	Garrett Wollman <wollman@lcs.mit.edu>

8 files changed, 34 insertions, 26 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 4c2d3d686b2..8f888b148c2 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,32 +1,28 @@
 # New ports collection makefile for:	sdr
-# Version required:			2.7
+# Version required:			2.9
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sdr-2.7
+DISTNAME=	sdr-2.9
 CATEGORIES=	mbone tk82
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
+MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
 
 MAINTAINER=	fenner@FreeBSD.org
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+BUILD_DEPENDS=	${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/mbone/uclmmbase
 
+WRKSRC=		${WRKDIR}/sdr/freebsd
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${DISTNAME}/common ${DISTNAME}/sdr
-
 RESTRICTED=	"Contains DES cryptography."
 
-# Makefile.work and configure help to work with the sdr multi-platform
-# build structure.
 post-extract:
-	@${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR}/configure ${WRKSRC}
-	@${CHMOD} 755 ${WRKSRC}/configure
+	@${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd
 
 .include <bsd.port.mk>
diff --git a/mbone/sdr/distinfo b/mbone/sdr/distinfo
index 60d3f5cec6f..67a5bc2cd60 100644
--- a/mbone/sdr/distinfo
+++ b/mbone/sdr/distinfo
@@ -1 +1 @@
-MD5 (sdr-2.7.tar.gz) = da28a7a960007af129673997da945c0d
+MD5 (sdr-2.9.tar.gz) = ef0a3c8b92f7b3babf42ca5bd561fdd3
diff --git a/mbone/sdr/files/Makefile.freebsd b/mbone/sdr/files/Makefile.freebsd
new file mode 100644
index 00000000000..3022704ab5f
--- /dev/null
+++ b/mbone/sdr/files/Makefile.freebsd
@@ -0,0 +1,8 @@
+CC          = gcc -g -O
+INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/uclmmbase
+LIBS        = -L${LOCALBASE}/lib -ltk80 -ltcl80 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm
+CFLAGS      = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
+
+all::	sdr 
+install:
+	install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin
diff --git a/mbone/sdr/files/patch-ab b/mbone/sdr/files/patch-ab
index c894da39c0c..ca6c5f8fe01 100644
--- a/mbone/sdr/files/patch-ab
+++ b/mbone/sdr/files/patch-ab
@@ -1,5 +1,5 @@
---- sdr/src/Makefile.template.orig	Tue May 25 16:27:44 1999
-+++ sdr/src/Makefile.template	Thu Nov  4 11:05:39 1999
+--- ../src/Makefile.template.orig	Tue May 25 16:27:44 1999
++++ ../src/Makefile.template	Thu Nov  4 11:05:39 1999
 @@ -88,7 +88,7 @@
  $(SDR_UI_FILES): tcl2c
  
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index 4c2d3d686b2..8f888b148c2 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -1,32 +1,28 @@
 # New ports collection makefile for:	sdr
-# Version required:			2.7
+# Version required:			2.9
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sdr-2.7
+DISTNAME=	sdr-2.9
 CATEGORIES=	mbone tk82
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
+MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
 
 MAINTAINER=	fenner@FreeBSD.org
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+BUILD_DEPENDS=	${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/mbone/uclmmbase
 
+WRKSRC=		${WRKDIR}/sdr/freebsd
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${DISTNAME}/common ${DISTNAME}/sdr
-
 RESTRICTED=	"Contains DES cryptography."
 
-# Makefile.work and configure help to work with the sdr multi-platform
-# build structure.
 post-extract:
-	@${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR}/configure ${WRKSRC}
-	@${CHMOD} 755 ${WRKSRC}/configure
+	@${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd
 
 .include <bsd.port.mk>
diff --git a/net/sdr/distinfo b/net/sdr/distinfo
index 60d3f5cec6f..67a5bc2cd60 100644
--- a/net/sdr/distinfo
+++ b/net/sdr/distinfo
@@ -1 +1 @@
-MD5 (sdr-2.7.tar.gz) = da28a7a960007af129673997da945c0d
+MD5 (sdr-2.9.tar.gz) = ef0a3c8b92f7b3babf42ca5bd561fdd3
diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd
new file mode 100644
index 00000000000..3022704ab5f
--- /dev/null
+++ b/net/sdr/files/Makefile.freebsd
@@ -0,0 +1,8 @@
+CC          = gcc -g -O
+INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/uclmmbase
+LIBS        = -L${LOCALBASE}/lib -ltk80 -ltcl80 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm
+CFLAGS      = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD
+
+all::	sdr 
+install:
+	install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin
diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab
index c894da39c0c..ca6c5f8fe01 100644
--- a/net/sdr/files/patch-ab
+++ b/net/sdr/files/patch-ab
@@ -1,5 +1,5 @@
---- sdr/src/Makefile.template.orig	Tue May 25 16:27:44 1999
-+++ sdr/src/Makefile.template	Thu Nov  4 11:05:39 1999
+--- ../src/Makefile.template.orig	Tue May 25 16:27:44 1999
++++ ../src/Makefile.template	Thu Nov  4 11:05:39 1999
 @@ -88,7 +88,7 @@
  $(SDR_UI_FILES): tcl2c