diff options
| author | cokane <cokane@FreeBSD.org> | 2008-05-08 14:01:42 +0000 |
|---|---|---|
| committer | cokane <cokane@FreeBSD.org> | 2008-05-08 14:01:42 +0000 |
| commit | 24e48584df154f3ae44e20f1fd32177f7ad0d22f (patch) | |
| tree | 19b22ae580bd461451275b7f9274ca17474f8d2c /lib/libexpat | |
| parent | 58334d8bd647665532c229aa4edea654cb98eb89 (diff) | |
| download | FreeBSD-src-24e48584df154f3ae44e20f1fd32177f7ad0d22f.zip FreeBSD-src-24e48584df154f3ae44e20f1fd32177f7ad0d22f.tar.gz | |
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
Diffstat (limited to 'lib/libexpat')
| -rw-r--r-- | lib/libexpat/Makefile | 14 | ||||
| -rw-r--r-- | lib/libexpat/libbsdxml.3 | 4 |
2 files changed, 12 insertions, 6 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> diff --git a/lib/libexpat/libbsdxml.3 b/lib/libexpat/libbsdxml.3 index 2d5fc3e..7d7b0e7 100644 --- a/lib/libexpat/libbsdxml.3 +++ b/lib/libexpat/libbsdxml.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd October 4, 2002 +.Dd May 5, 2008 .Dt LIBBSDXML 3 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh DESCRIPTION The .Nm -library is a verbatim copy of the eXpat XML library version 1.95.5. +library is a verbatim copy of the eXpat XML library version 2.0.1. .Pp To avoid version and autoconfiguration issues, the library has been renamed to |
