From 1b8cb240d32362c005ec906c1f67f89e743f139a Mon Sep 17 00:00:00 2001 From: jwise Date: Fri, 28 Sep 2001 23:37:09 +0000 Subject: 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. --- textproc/tcl-expat/Makefile | 20 ++++++ textproc/tcl-expat/distinfo | 6 ++ textproc/tcl-expat/patches/patch-aa | 60 ++++++++++++++++ textproc/tcl-expat/patches/patch-ab | 138 ++++++++++++++++++++++++++++++++++++ textproc/tcl-expat/pkg/DESCR | 2 + textproc/tcl-expat/pkg/PLIST | 6 ++ 6 files changed, 232 insertions(+) create mode 100644 textproc/tcl-expat/Makefile create mode 100644 textproc/tcl-expat/distinfo create mode 100644 textproc/tcl-expat/patches/patch-aa create mode 100644 textproc/tcl-expat/patches/patch-ab create mode 100644 textproc/tcl-expat/pkg/DESCR create mode 100644 textproc/tcl-expat/pkg/PLIST (limited to 'textproc/tcl-expat') diff --git a/textproc/tcl-expat/Makefile b/textproc/tcl-expat/Makefile new file mode 100644 index 00000000000..cc8fd54182c --- /dev/null +++ b/textproc/tcl-expat/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $ +# + +DISTNAME= TclExpat-1.1 +PKGNAME= tcl-expat-1.1 +CATEGORIES= textproc www tcl +MASTER_SITES= http://www.zveno.com/in-tclxml/ + +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/tcl +DEPENDS+= expat-[0-9]*:../../textproc/expat + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcl/TclExpat + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tcl/TclExpat + +.include "../../mk/bsd.pkg.mk" diff --git a/textproc/tcl-expat/distinfo b/textproc/tcl-expat/distinfo new file mode 100644 index 00000000000..4ea6ea1d681 --- /dev/null +++ b/textproc/tcl-expat/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $ + +SHA1 (TclExpat-1.1.tar.gz) = 232bb47305a471dc0f8bc52e684a04b7cf703b80 +Size (TclExpat-1.1.tar.gz) = 268538 bytes +SHA1 (patch-aa) = ac3d8fbafb957449e389833c3600471fc44e696d +SHA1 (patch-ab) = 9985adb007741c36182d093a18c210c0230ac566 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 +-#include "xmlparse.h" ++#include + + /* + * 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); diff --git a/textproc/tcl-expat/pkg/DESCR b/textproc/tcl-expat/pkg/DESCR new file mode 100644 index 00000000000..80b706f6b4e --- /dev/null +++ b/textproc/tcl-expat/pkg/DESCR @@ -0,0 +1,2 @@ +TclExpat is a tcl XML parser based on expat. The goal of this parser +is to be "plug-compatible" with TclXML. diff --git a/textproc/tcl-expat/pkg/PLIST b/textproc/tcl-expat/pkg/PLIST new file mode 100644 index 00000000000..d7cb22202f0 --- /dev/null +++ b/textproc/tcl-expat/pkg/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $ +lib/tcl/TclExpat-1.1/tclexpat.so +lib/tcl/TclExpat-1.1/pkgIndex.tcl +share/doc/tcl/TclExpat/README +@dirrm lib/tcl/TclExpat-1.1 +@dirrm share/doc/tcl/TclExpat -- cgit v1.2.3