From c96657e54ebdebdcda0e6603330a2bba0bd3859a Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 15 Sep 2004 17:09:37 +0000
Subject: Don't have a comma end an enumeration list, which is apparently not
 allowed by GCC with -pedantic -ansi.  Bump the PKGREVISION.

---
 textproc/expat/Makefile         |  3 ++-
 textproc/expat/buildlink3.mk    |  3 ++-
 textproc/expat/distinfo         |  3 ++-
 textproc/expat/patches/patch-aa | 13 +++++++++++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 textproc/expat/patches/patch-aa

(limited to 'textproc')

diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index abbeee324e2..11bc418597d 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/08/05 22:16:59 recht Exp $
+# $NetBSD: Makefile,v 1.16 2004/09/15 17:09:37 jlam Exp $
 #
 
 DISTNAME=	expat-1.95.8
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
 
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 8ad5b66f508..c64749061cf 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/04/08 16:35:22 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/09/15 17:09:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXPAT_BUILDLINK3_MK:=	${EXPAT_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	expat
 
 .if !empty(EXPAT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.expat+=	expat>=1.95.7
+BUILDLINK_RECOMMENDED.expat+=	expat>=1.95.8nb1
 BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 .endif	# EXPAT_BUILDLINK3_MK
 
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index 786a42918bc..222069e09ba 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.12 2004/08/05 22:16:59 recht Exp $
+$NetBSD: distinfo,v 1.13 2004/09/15 17:09:37 jlam Exp $
 
 SHA1 (expat-1.95.8.tar.gz) = 73cb8fc326d04c44ae0e3b3f797f0e6ba9c4121f
 Size (expat-1.95.8.tar.gz) = 318349 bytes
+SHA1 (patch-aa) = d7b41c263c8a0406733821db4e4ebcb4d474ed6f
diff --git a/textproc/expat/patches/patch-aa b/textproc/expat/patches/patch-aa
new file mode 100644
index 00000000000..5d3664b091d
--- /dev/null
+++ b/textproc/expat/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2004/09/15 17:09:37 jlam Exp $
+
+--- lib/expat.h.orig	Thu Jul 15 20:54:57 2004
++++ lib/expat.h
+@@ -43,7 +43,7 @@ enum XML_Status {
+ #define XML_STATUS_ERROR XML_STATUS_ERROR
+   XML_STATUS_OK = 1,
+ #define XML_STATUS_OK XML_STATUS_OK
+-  XML_STATUS_SUSPENDED = 2,
++  XML_STATUS_SUSPENDED = 2
+ #define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
+ };
+ 
-- 
cgit v1.2.3