6 files changed, 25 insertions, 39 deletions
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 55475d943b9..a453602039f 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/25 23:17:26 jwise Exp $
 
-DISTNAME=		Sablot-0.71
-PKGNAME=		sablotron-0.71
-PKGREVISION=		1
+DISTNAME=		Sablot-0.96
+PKGNAME=		sablotron-0.96
 CATEGORIES=		textproc
 MASTER_SITES=		http://download-2.gingerall.cz/download/sablot/
 
@@ -14,7 +13,6 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=  	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/tools/ltconfig
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
diff --git a/textproc/sablotron/PLIST b/textproc/sablotron/PLIST
index d6d2fca5397..5ad0ba38c04 100644
--- a/textproc/sablotron/PLIST
+++ b/textproc/sablotron/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/01 03:11:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/25 23:17:26 jwise Exp $
 bin/sabcmd
+include/sabcfg.h
+include/sabdbg.h
 include/sablot.h
 include/sdom.h
 include/shandler.h
@@ -7,5 +9,6 @@ include/sxpath.h
 lib/libsablot.a
 lib/libsablot.la
 lib/libsablot.so
-lib/libsablot.so.71
-lib/libsablot.so.71.0
+lib/libsablot.so.96
+lib/libsablot.so.96.0
+man/man1/sabcmd.1
diff --git a/textproc/sablotron/distinfo b/textproc/sablotron/distinfo
index edb7c6afc85..9525a87de2d 100644
--- a/textproc/sablotron/distinfo
+++ b/textproc/sablotron/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 18:40:14 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/09/25 23:17:26 jwise Exp $
 
-SHA1 (Sablot-0.71.tar.gz) = 8da42bba936832941d4f077551d47c1d3393e6c4
-Size (Sablot-0.71.tar.gz) = 274268 bytes
-SHA1 (patch-aa) = d93a35316ecf728175b64dae57200b588f24c36a
-SHA1 (patch-ab) = bb70e1ffeab86ac2485f3a0bda6634d538567a16
+SHA1 (Sablot-0.96.tar.gz) = 0b9e8a913c66332f54a919e7a555df824a0b56f5
+Size (Sablot-0.96.tar.gz) = 399961 bytes
+SHA1 (patch-ac) = 4637c2b23ed6a445e4e70976c56fb6bd37ce7a1c
diff --git a/textproc/sablotron/patches/patch-aa b/textproc/sablotron/patches/patch-aa
deleted file mode 100644
index 048265e5255..00000000000
--- a/textproc/sablotron/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:15 jlam Exp $
-
---- src/engine/Makefile.in	2002/07/24 11:00:26	1.1
-+++ src/engine/Makefile.in	2002/07/24 11:01:31
-@@ -97,7 +97,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../../autocfg
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libsablot_la_LIBADD = 
-+libsablot_la_LIBADD = @ICONV_LIB@ @EXPAT_LIBS@
- libsablot_la_OBJECTS =  arena.lo base.lo context.lo datastr.lo \
- decimal.lo domprovider.lo encoding.lo error.lo expr.lo hash.lo key.lo \
- numbering.lo output.lo parser.lo platform.lo proc.lo sablot.lo sdom.lo \
diff --git a/textproc/sablotron/patches/patch-ab b/textproc/sablotron/patches/patch-ab
deleted file mode 100644
index 0b43597ea6d..00000000000
--- a/textproc/sablotron/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:15 jlam Exp $
-
---- src/engine/Makefile.am	2002/07/24 12:13:41	1.1
-+++ src/engine/Makefile.am	2002/07/24 12:14:28
-@@ -8,6 +8,8 @@
- 
- lib_LTLIBRARIES = libsablot.la
- 
-+libsablot_la_LIBADD = @ICONV_LIB@ @EXPAT_LIBS@
-+
- libsablot_la_SOURCES = \
-         arena.h \
-         base.h \
diff --git a/textproc/sablotron/patches/patch-ac b/textproc/sablotron/patches/patch-ac
new file mode 100644
index 00000000000..fb4b2b6e068
--- /dev/null
+++ b/textproc/sablotron/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2002/09/25 23:17:29 jwise Exp $
+--- src/engine/parser.cpp.orig	Wed Sep 25 18:55:34 2002
++++ src/engine/parser.cpp	Wed Sep 25 18:53:36 2002
+@@ -428,7 +428,7 @@
+         if (!(firstTime && rawBuffer[0] == (char) 0xEF && 
+             rawBuffer[1] == (char) 0xBB && rawBuffer[2] == (char) 0xBF))
+             S.setCurrLine(XML_GetCurrentLineNumber(parser));
+-        int code = XML_GetErrorCode(parser); 
++        enum XML_Error code = XML_GetErrorCode(parser); 
+         Str eCodeStr, eNameStr;
+         eCodeStr = code;
+         eNameStr = (char*) XML_ErrorString(code);