Support NetBSD versions 2.x and tk 8.4.

4 files changed, 18 insertions, 13 deletions

diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 662af986dc6..93d65c574e9 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/03/08 20:27:15 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2004/06/18 12:50:51 markd Exp $
 #
 
 DISTNAME=	rat-3.0.28
@@ -9,16 +9,18 @@ MAINTAINER=	mycroft@NetBSD.org
 HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
 COMMENT=	Robust Audio Tool - multicast audioconferencing
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk83
-
 CRYPTO=		yes
+USE_BUILDLINK3= yes
 USE_GNU_TOOLS+=	make
 USE_X11BASE=	yes
 
 USER=		build
 
+post-patch:
+	${CP} ${WRKSRC}/Makefile_NetBSD_1 ${WRKSRC}/Makefile_NetBSD_2
+
 do-build:
-	cd ${WRKSRC} && USER=${USER} PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} ./Build rat
+	cd ${WRKSRC} && USER=${USER} PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh ./Build rat
 
 do-install:
 	cd ${WRKSRC} && ( \
@@ -28,4 +30,6 @@ do-install:
 	 ${INSTALL_MAN} \
 	    man/man1/rat.1 ${PREFIX}/man/man1/rat.1 )
 
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/rat/distinfo b/mbone/rat/distinfo
index 1887481b089..4efd1003fd7 100644
--- a/mbone/rat/distinfo
+++ b/mbone/rat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/10/10 04:44:07 rtr Exp $
+$NetBSD: distinfo,v 1.4 2004/06/18 12:50:51 markd Exp $
 
 SHA1 (rat-3.0.28.tar.gz) = 37ddf3a98fa9182016b1d132e767aec9838a2a9c
 Size (rat-3.0.28.tar.gz) = 351749 bytes
@@ -6,9 +6,9 @@ SHA1 (patch-aa) = 0bfc55971ad645ba82e6455324c0f97b3d92b193
 SHA1 (patch-ab) = c2729989f62aab05f3a741e1880c2e51d370a0dc
 SHA1 (patch-ac) = cad434382ac8c533215e2566d2ada219f1922d6a
 SHA1 (patch-ad) = 65ee926927401cb6c53786e6398f7de3c0c003b8
-SHA1 (patch-ae) = 5fda13af75ebf00bc6d831b9439c7dee5eea959e
+SHA1 (patch-ae) = 744982811f36e8bc18ae392d105b1e7fd14a9654
 SHA1 (patch-af) = 8b58c5ed398fb9d5c0bbe6d901fa90c6721ab703
 SHA1 (patch-ag) = ab08f597ce646a0fbc915c1b235da92e8bd83e5f
-SHA1 (patch-ah) = 18622ac59e75f1378c92ead6c75cb5d9ef296051
+SHA1 (patch-ah) = c727b18be73f6e91cb273735dbca45b822cf7126
 SHA1 (patch-ai) = 0cfe2a570e5870279ac765df458e727df134aaa2
 SHA1 (patch-aj) = 9e972414ced6aeb8ba434204dde7df22d9535379
diff --git a/mbone/rat/patches/patch-ae b/mbone/rat/patches/patch-ae
index 846740d3316..bddfc617ef7 100644
--- a/mbone/rat/patches/patch-ae
+++ b/mbone/rat/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 1998/11/05 02:46:09 mycroft Exp $
+$NetBSD: patch-ae,v 1.3 2004/06/18 12:50:51 markd Exp $
 
 --- Makefile.orig	Sat Aug 15 15:16:44 1998
 +++ Makefile	Wed Nov  4 21:27:03 1998
@@ -9,8 +9,9 @@ $NetBSD: patch-ae,v 1.2 1998/11/05 02:46:09 mycroft Exp $
 -DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
 +#DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
  CC     = gcc
- CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
+-CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
 -LDFLAGS= 
++CFLAGS = -Wall $(INCS) $(DEFS) -g -O -fsigned-char
 +#LDFLAGS= 
  LDLIBS=  $(LDLIBS) -lm
  RANLIB = ranlib
diff --git a/mbone/rat/patches/patch-ah b/mbone/rat/patches/patch-ah
index ed28f2a12a5..d514876eda3 100644
--- a/mbone/rat/patches/patch-ah
+++ b/mbone/rat/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.3 2000/08/31 00:11:32 jwise Exp $
+$NetBSD: patch-ah,v 1.4 2004/06/18 12:50:51 markd Exp $
 
 --- /dev/null	Wed Nov  4 21:26:51 1998
 +++ Makefile_NetBSD_1	Wed Nov  4 21:27:04 1998
 @@ -0,0 +1,7 @@
++TCL_LIBS= $(shell . ${TCLCONFIG} && echo $$TCL_LIBS)
 +INCS   = -I${X11BASE}/include \
 +         -I${LOCALBASE}/include \
 +         -I${LOCALBASE}/include
-+LDLIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83 \
++LDLIBS = -L${LOCALBASE}/lib -ltk -ltcl \
 +         -L${X11BASE}/lib -lXext -lX11 \
-+         -lm
-+
++         -lm ${TCL_LIBS}