Update the lib/expat tree for the new v2.0.1 expat import. The bsdxml.h

header is now in two parts: bsdxml.h and bsdxml_external.h, representing
the expat.h and expat_external.h headers. Updated the info on the man
page as well. Also, fixed a type-error in a printf in
sbin/ifconfig/regdomain.c that would cause a compiler warning.

Approved by:	sam, phk

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 41142ec..1096187 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -6,22 +6,28 @@ LIB=		bsdxml
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	3
 SRCS=		xmlparse.c xmlrole.c xmltok.c
-INCS=		bsdxml.h
+INCS=		bsdxml.h bsdxml_external.h
 MAN=		libbsdxml.3
 
 .PATH:		${EXPAT}/lib
 
-CFLAGS+= 	-I${.CURDIR}
-CLEANFILES=	bsdxml.h
+CFLAGS+= 	-I${.CURDIR} -DHAVE_EXPAT_CONFIG_H
+CLEANFILES=	bsdxml.h bsdxml_external.h
 
 # OK, so it is not entirely unadultered: we ammend the COPYING
 # to point people to the right place, get rid of some VMS stuff
-# and use FreeBSD style indempotency #ifndefs.
+# and use FreeBSD style indempotency #ifndefs. We also want to
+# point it at the new bsdxml_external.h rather than the old
+# expat_external.h file.
 #
 bsdxml.h: expat.h
 	unifdef -U__VMS < ${.ALLSRC} | \
 	sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \
 	    -e 's/COPYING/src\/contrib\/expat\/COPYING/' \
+	    -e 's/expat_external/bsdxml_external/' \
 		> ${.TARGET}
 
+bsdxml_external.h: expat_external.h
+	cp ${.ALLSRC} ${.TARGET}
+
 .include <bsd.lib.mk>