From 304794575255286e8122998eeb03af7146a7c172 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Tue, 9 Mar 2004 01:16:59 +0000
Subject: Switch to Tcl 8.4.  Bump PKGREVISION.

---
 textproc/tcl-expat/Makefile         |  5 +++--
 textproc/tcl-expat/distinfo         |  4 ++--
 textproc/tcl-expat/patches/patch-aa | 13 +++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'textproc/tcl-expat')

diff --git a/textproc/tcl-expat/Makefile b/textproc/tcl-expat/Makefile
index 08eb01c40b2..aadc785ce22 100644
--- a/textproc/tcl-expat/Makefile
+++ b/textproc/tcl-expat/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/09 01:16:59 minskim Exp $
 #
 
 DISTNAME=	TclExpat-1.1
 PKGNAME=	tcl-expat-1.1
+PKGREVISION=	1
 CATEGORIES=	textproc www tcl
 MASTER_SITES=	http://www.zveno.com/in-tclxml/
 
@@ -10,7 +11,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.zveno.com/zm.cgi/in-tclxml/
 COMMENT=	XML parser implemented entirely in Tcl
 
-DEPENDS+=       tcl>=8.3.2:../../lang/tcl83
+DEPENDS+=       tcl>=8.4.0:../../lang/tcl
 DEPENDS+=	expat-[0-9]*:../../textproc/expat
 
 pre-install:
diff --git a/textproc/tcl-expat/distinfo b/textproc/tcl-expat/distinfo
index 6d63beb8001..bf9e4a8f8bd 100644
--- a/textproc/tcl-expat/distinfo
+++ b/textproc/tcl-expat/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/09/29 00:18:06 jwise Exp $
+$NetBSD: distinfo,v 1.3 2004/03/09 01:16:59 minskim Exp $
 
 SHA1 (TclExpat-1.1.tar.gz) = 232bb47305a471dc0f8bc52e684a04b7cf703b80
 Size (TclExpat-1.1.tar.gz) = 268538 bytes
-SHA1 (patch-aa) = 52e2f5a33eb8cf8aab9ed602a8a66f9123eba95c
+SHA1 (patch-aa) = c759f71496b4dd923c01d25775000cab35991627
 SHA1 (patch-ab) = 9985adb007741c36182d093a18c210c0230ac566
diff --git a/textproc/tcl-expat/patches/patch-aa b/textproc/tcl-expat/patches/patch-aa
index 0988f6b0f38..19b8b9b3e63 100644
--- a/textproc/tcl-expat/patches/patch-aa
+++ b/textproc/tcl-expat/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/09/29 00:18:06 jwise Exp $
---- Makefile.orig	Tue Aug 25 03:25:20 1998
-+++ Makefile	Fri Sep 28 18:57:36 2001
-@@ -18,12 +18,12 @@
+$NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $
+
+--- Makefile.orig	1998-08-25 02:25:20.000000000 -0500
++++ Makefile
+@@ -18,12 +18,12 @@ TCLEXPAT_VERSION  = 1.1
  
  TCL_SHLIB_SUFFIX  = .so
  TCL_OBJS          = tclexpat.o
@@ -17,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/09/29 00:18:06 jwise Exp $
  
  
  
-@@ -68,35 +68,23 @@
+@@ -68,35 +68,23 @@ CC=  $(TCL_CC)
  LIB= tclexpat$(TCL_SHLIB_SUFFIX)
  
  
@@ -40,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 2001/09/29 00:18:06 jwise Exp $
 -${OBJS}:
 -	cd expat ; make CC=${CC} SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
 +$(LIB):		tclexpat.o
-+	$(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lexpat -ltcl83
++	$(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lexpat -ltcl84
  
  tclexpat.o:	tclexpat.c
 -	$(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c
-- 
cgit v1.2.3