Initial import of tcl-expat, a drop-in replacement for tcl-xml (OK, OK, actually

it came first) which uses the expat library for speedy and precise xml parsing.

2 files changed, 198 insertions, 0 deletions

diff --git a/textproc/tcl-expat/patches/patch-aa b/textproc/tcl-expat/patches/patch-aa
new file mode 100644
index 00000000000..7c93a7918b9
--- /dev/null
+++ b/textproc/tcl-expat/patches/patch-aa
@@ -0,0 +1,60 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
+--- Makefile.orig	Tue Aug 25 03:25:20 1998
++++ Makefile	Fri Sep 28 18:57:36 2001
+@@ -18,12 +18,12 @@
+ 
+ TCL_SHLIB_SUFFIX  = .so
+ TCL_OBJS          = tclexpat.o
+-TCL_PREFIX        = /usr/local/tcl/8.0
+-TCL_EXEC_PREFIX   = /usr/local/tcl/8.0
++TCL_PREFIX        = ${LOCALBASE}
++TCL_EXEC_PREFIX   = ${LOCALBASE}
+ TCL_SHLIB_CFLAGS  = -fPIC
+ TCL_SHLIB_LD      = gcc -shared
+ TCL_CC            = gcc
+-TCL_PACKAGE_PATH  = /usr/local/tcl/8.0/lib
++TCL_PACKAGE_PATH  = ${PREFIX}/lib/tcl
+ 
+ 
+ 
+@@ -68,35 +68,23 @@
+ LIB= tclexpat$(TCL_SHLIB_SUFFIX)
+ 
+ 
+-OBJS=expat/xmltok/xmltok.o \
+-  expat/xmltok/xmlrole.o \
+-  expat/xmlwf/xmlwf.o \
+-  expat/xmlwf/codepage.o \
+-  expat/xmlparse/xmlparse.o \
+-  expat/xmlparse/hashtable.o \
+-  $(FILEMAP_OBJ)
+-
++OBJS=
+ 
+ all:		$(LIB)
+ 
+-
+-$(LIB):		tclexpat.o ${OBJS}
+-	$(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o
+-
+-${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
+ 
+ tclexpat.o:	tclexpat.c
+-	$(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c
++	$(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include tclexpat.c
+ 
+ install:	$(LIB)
+ 	instdir=`echo $(TCL_PACKAGE_PATH) | cut -f 1 -d :` ; \
+ 	mkdir $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \
+-	cp $(LIB) pkgIndex.tcl $$instdir
++	cp $(LIB) pkgIndex.tcl $$instdir/TclExpat-${TCLEXPAT_VERSION}
+ 	
+ 
+ clean:
+-	@cd expat; make clean
+ 	rm -f *~ *.o 
+ 	@if [ ! -z $(TCL_SHLIB_SUFFIX) ] ; then \
+ 	    echo "rm -f *$(TCL_SHLIB_SUFFIX)" ;\
diff --git a/textproc/tcl-expat/patches/patch-ab b/textproc/tcl-expat/patches/patch-ab
new file mode 100644
index 00000000000..78e4d323fcf
--- /dev/null
+++ b/textproc/tcl-expat/patches/patch-ab
@@ -0,0 +1,138 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
+--- tclexpat.c.orig	Sat Aug 22 03:35:44 1998
++++ tclexpat.c	Fri Sep 28 18:52:35 2001
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <tcl.h>
+-#include "xmlparse.h"
++#include <expat.h>
+ 
+ /*
+  * The structure below is used to refer to an expat parser object.
+@@ -847,11 +847,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -917,11 +917,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -976,11 +976,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -1036,11 +1036,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -1095,11 +1095,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -1169,11 +1169,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -1241,11 +1241,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -1306,11 +1306,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);
+@@ -1370,11 +1370,11 @@
+    * It would be desirable to be able to terminate parsing
+    * if the return result is TCL_ERROR or TCL_BREAK.
+    */
+-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
++#if (TCL_MAJOR_VERSION == 8)
+   result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
+ #else
+   result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
+-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
++#endif /* if TCL_MAJOR_VERSION == 8 */
+ 
+   Tcl_DecrRefCount(cmdPtr);
+   Tcl_Release((ClientData) expat->interp);