4 files changed, 8 insertions, 80 deletions
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 9de4cb1ae11..b670953a2c1 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/02 18:13:58 drochner Exp $
 #
 
-DISTNAME=	expat-1.95.6
-PKGREVISION=	1
+DISTNAME=	expat-1.95.7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
 
diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST
index f338873ee27..bbb1aa067fd 100644
--- a/textproc/expat/PLIST
+++ b/textproc/expat/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2002/09/18 05:46:35 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/02 18:13:58 drochner Exp $
 bin/xmlwf
 include/expat.h
 lib/libexpat.a
 lib/libexpat.la
 lib/libexpat.so
-lib/libexpat.so.4
-lib/libexpat.so.4.0
+lib/libexpat.so.5
+lib/libexpat.so.5.0
 man/man1/xmlwf.1
 share/doc/html/expat/reference.html
 share/doc/html/expat/style.css
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index 3e02d7cd24c..211a5f2fa24 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/02/05 03:57:13 jlam Exp $
+$NetBSD: distinfo,v 1.11 2004/03/02 18:13:58 drochner Exp $
 
-SHA1 (expat-1.95.6.tar.gz) = 1f062c91c6e51d3a91f9fdeacf202bb5b2b53d27
-Size (expat-1.95.6.tar.gz) = 291876 bytes
-SHA1 (patch-aa) = ece8cc6856144c27e680822f3c419a449dabbefc
+SHA1 (expat-1.95.7.tar.gz) = 70f0658463484a43768a8f3168b707e0ff053e1e
+Size (expat-1.95.7.tar.gz) = 296718 bytes
diff --git a/textproc/expat/patches/patch-aa b/textproc/expat/patches/patch-aa
deleted file mode 100644
index e585da54a61..00000000000
--- a/textproc/expat/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/02/05 03:57:14 jlam Exp $
-
---- lib/expat.h.orig	Thu Jan 16 14:03:42 2003
-+++ lib/expat.h
-@@ -57,6 +57,32 @@ typedef unsigned char XML_Bool;
- #define XML_TRUE   ((XML_Bool) 1)
- #define XML_FALSE  ((XML_Bool) 0)
- 
-+/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
-+   detected.  The last call to XML_Parse must have isFinal true; len
-+   may be zero for this call (or any other).
-+
-+   The XML_Status enum gives the possible return values for the
-+   XML_Parse and XML_ParseBuffer functions.  Though the return values
-+   for these functions has always been described as a Boolean value,
-+   the implementation, at least for the 1.95.x series, has always
-+   returned exactly one of these values.  The preprocessor #defines
-+   are included so this stanza can be added to code that still needs
-+   to support older versions of Expat 1.95.x:
-+
-+   #ifndef XML_STATUS_OK
-+   #define XML_STATUS_OK    1
-+   #define XML_STATUS_ERROR 0
-+   #endif
-+
-+   Otherwise, the #define hackery is quite ugly and would have been dropped.
-+*/
-+enum XML_Status {
-+  XML_STATUS_ERROR = 0,
-+#define XML_STATUS_ERROR XML_STATUS_ERROR
-+  XML_STATUS_OK = 1
-+#define XML_STATUS_OK XML_STATUS_OK
-+};
-+
- enum XML_Error {
-   XML_ERROR_NONE,
-   XML_ERROR_NO_MEMORY,
-@@ -712,32 +738,6 @@ XML_GetSpecifiedAttributeCount(XML_Parse
- */
- XMLPARSEAPI(int)
- XML_GetIdAttributeIndex(XML_Parser parser);
--
--/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
--   detected.  The last call to XML_Parse must have isFinal true; len
--   may be zero for this call (or any other).
--
--   The XML_Status enum gives the possible return values for the
--   XML_Parse and XML_ParseBuffer functions.  Though the return values
--   for these functions has always been described as a Boolean value,
--   the implementation, at least for the 1.95.x series, has always
--   returned exactly one of these values.  The preprocessor #defines
--   are included so this stanza can be added to code that still needs
--   to support older versions of Expat 1.95.x:
--
--   #ifndef XML_STATUS_OK
--   #define XML_STATUS_OK    1
--   #define XML_STATUS_ERROR 0
--   #endif
--
--   Otherwise, the #define hackery is quite ugly and would have been dropped.
--*/
--enum XML_Status {
--  XML_STATUS_ERROR = 0,
--#define XML_STATUS_ERROR XML_STATUS_ERROR
--  XML_STATUS_OK = 1
--#define XML_STATUS_OK XML_STATUS_OK
--};
- 
- XMLPARSEAPI(enum XML_Status)
- XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);