Ok, concensus was to install libexpat under a "private brandname", and after

some deliberation the name "libbsdxml" was chosen since it conveys the two
most important attributes:  "Private to FreeBSD" and "XML".

Add a skeleton man-page to give the credit and point for further
documentation.  (If somebody wants to write a true mdoc manpage for
this I am sure both the eXpat people and I will be grateful).

(Still not connected to the build)

1 files changed, 19 insertions, 9 deletions

diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 4081aa8..e5254d0 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>
+