2 files changed, 78 insertions, 9 deletions

diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 4081aa88280a..e5254d0f4e33 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -2,19 +2,29 @@
 
 EXPAT=	${.CURDIR}/../../contrib/expat
 
-# Please use the same SHLIB_MAJOR as for the corresponding expat
-# version in ports, as long as this is applicable.
+SHLIB_MAJOR=	1
 
-SHLIB_MAJOR=	4
+LIB=		bsdxml
 
-LIB=	expat
+SRCS=		xmlparse.c xmlrole.c xmltok.c
+INCS=		bsdxml.h
+MAN=		libbsdxml.3
 
-.PATH:	${EXPAT}/lib
+.PATH:		${EXPAT}/lib
 
-CFLAGS += -I${EXPAT}/lib -I${EXPAT} -I${.CURDIR}
+CFLAGS += 	-I${EXPAT}/lib -I${EXPAT} -I${.CURDIR}
+CLEANFILES+=	bsdxml.h
 
-SRCS=	xmlparse.c xmlrole.c xmltok.c
-
-INCS=	expat.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.
+#
+bsdxml.h:	expat.h
+	unifdef -U__VMS < ${.ALLSRC} | \
+	sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \
+	    -e 's/COPYING/src\/contrib\/expat\/COPYING/' \
+		> ${.TARGET}
 
 .include <bsd.lib.mk>
+
diff --git a/lib/libexpat/libbsdxml.3 b/lib/libexpat/libbsdxml.3
new file mode 100644
index 000000000000..e39f926384ad
--- /dev/null
+++ b/lib/libexpat/libbsdxml.3
@@ -0,0 +1,59 @@
+.\"-
+.\" Copyright (c) 2002 Poul-Henning Kamp
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"/
+.Dd October 4, 2002
+.Dt LIBBSDXML 3
+.Os
+.Sh Name
+.Nm libbsdxml
+.Nd eXpat XML parser library
+.Sh SYNOPSIS
+.In bsdxml.h
+.Sh DESCRIPTION
+The
+.Nm
+library is a verbatim copy of the eXpat XML library version 1.95.5.
+.Pp
+To avoid version and autoconfiguration issues, the library has been
+renamed to
+.Nm
+rather than retain the original eXpat library and include file names
+to prevent confusion and autoconfiguation issues for 3rd party
+software.
+.Sh "SEE ALSO"
+For full documentation, please see the eXpat webpage at
+http://www.libexpat.org/
+.Sh AUTHORS
+The original eXpat was written by
+.An James Clark Aq jjc@jclark.com .
+.Pp
+Subsequently eXpat maintenance and development been taken up by a group
+of people under the leadership of
+.An Fred Drake Aq fdrake@acm.com ,
+.An Paul Prescod ,
+and
+.An Clark Cooper