expat: update to 2.2.10.

Use cmake for building.

Release 2.2.10 Sat October 3 2020
        Bug fixes:
  #390 #395 #398  Fix undefined behavior during parsing caused by
                    pointer arithmetic with NULL pointers
       #404 #405  Fix reading uninitialized variable during parsing
            #406  xmlwf: Add missing check for malloc NULL return

        Other changes:
            #396  Windows: Drop support for Visual Studio <=8.0/2005
            #409  Windows: Add missing file "Changes" to the installer
                    to fix compilation with CMake from installed sources
            #403  xmlwf: Document exit codes in xmlwf manpage and
                    exit with code 3 (rather than code 1) for output errors
                    when used with "-d DIRECTORY"
       #356 #359  MinGW: Provide declaration of rand_s for mingwrt <5.3.0
       #383 #392  Autotools: Use -Werror while configure tests the compiler
                    for supported compile flags to avoid false positives
  #383 #393 #394  Autotools: Improve handling of user (C|CPP|CXX|LD)FLAGS,
                    e.g. ensure that they have the last word over flags added
                    while running ./configure
            #360  CMake: Create libexpatw.{dll,so} and expatw.pc (with emphasis
                    on suffix "w") with -DEXPAT_CHAR_TYPE=(ushort|wchar_t)
            #360  CMake: Detect and deny unsupported build combinations
                    involving -DEXPAT_CHAR_TYPE=(ushort|wchar_t)
            #360  CMake: Install pre-compiled shipped xmlwf.1 manpage in case
                    of -DEXPAT_BUILD_DOCS=OFF
  #375 #380 #419  CMake: Fix use of Expat by means of add_subdirectory
       #407 #408  CMake: Keep expat target name constant at "expat"
                    (i.e. refrain from using the target name to control
                    build artifact filenames)
            #385  CMake: Fix compilation with -DEXPAT_SHARED_LIBS=OFF for
                    Windows
                  CMake: Expose man page compilation as target "xmlwf-manpage"
       #413 #414  CMake: Introduce option EXPAT_BUILD_PKGCONFIG
                    to control generation of pkg-config file "expat.pc"
            #424  CMake: Add minimalistic support for building binary packages
                    with CMake target "package"; based on CPack
            #366  CMake: Add option -DEXPAT_OSSFUZZ_BUILD=(ON|OFF) with
                    default OFF to build fuzzer code against OSS-Fuzz and
                    related environment variable LIB_FUZZING_ENGINE
            #354  Fix testsuite for -DEXPAT_DTD=OFF and -DEXPAT_NS=OFF, each
    #354 #355 ..
       #356 #412  Address compiler warnings
       #368 #369  Address pngcheck warnings with doc/*.png images
                  Version info bumped from 7:11:6 to 7:12:6

        Special thanks to:
            asavah
            Ben Wagner
            Bhargava Shastry
            Frank Landgraf
            Jeffrey Walton
            Joe Orton
            Kleber Tarcísio
            Ma Lin
            Maciej Sroczyński
            Mohammed Khajapasha
            Vadim Zeitlin
                 and
            Cppcheck 2.0 and the Cppcheck team

3 files changed, 22 insertions, 20 deletions

diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 059341215af..3061bb2903e 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2020/03/26 11:57:10 nia Exp $
+# $NetBSD: Makefile,v 1.43 2020/10/07 19:53:02 wiz Exp $
 
-DISTNAME=	expat-2.2.9
+DISTNAME=	expat-2.2.10
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libexpat/}
 GITHUB_PROJECT=	libexpat
@@ -11,18 +11,13 @@ HOMEPAGE=	https://libexpat.github.io/
 COMMENT=	XML parser library written in C
 LICENSE=	mit
 
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
+USE_CMAKE=	yes
 
-# C++ is needed for tests only
-#USE_LANGUAGES=		c c++
-#TEST_TARGET=		check
-#USE_TOOLS+=		bash
-#REPLACE_BASH=		test-driver-wrapper.sh
-
-CONFIGURE_ARGS+=	--without-examples
-CONFIGURE_ARGS+=	--without-tests
-CONFIGURE_ARGS+=	--without-docbook
+USE_LANGUAGES=		c c++
+TEST_TARGET=		test
+USE_TOOLS+=		bash:test
+REPLACE_BASH=		test-driver-wrapper.sh
+TEST_ENV+=		LD_LIBRARY_PATH=${WRKSRC}
 
 PKGCONFIG_OVERRIDE+=	expat.pc.in
 
diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST
index 1e3b71d3ed0..4180e346a8f 100644
--- a/textproc/expat/PLIST
+++ b/textproc/expat/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.13 2019/06/29 22:36:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/10/07 19:53:02 wiz Exp $
 bin/xmlwf
 include/expat.h
 include/expat_config.h
 include/expat_external.h
-lib/libexpat.la
+lib/cmake/${PKGNAME}/expat-config-version.cmake
+lib/cmake/${PKGNAME}/expat-config.cmake
+lib/cmake/${PKGNAME}/expat-noconfig.cmake
+lib/cmake/${PKGNAME}/expat.cmake
+lib/libexpat.so
+lib/libexpat.so.1
+lib/libexpat.so.1.6.12
 lib/pkgconfig/expat.pc
+man/man1/xmlwf.1
 share/doc/expat/AUTHORS
 share/doc/expat/changelog
 share/doc/expat/reference.html
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index eb8565d35f1..a644f76caa2 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2020/03/23 18:39:03 nia Exp $
+$NetBSD: distinfo,v 1.35 2020/10/07 19:53:02 wiz Exp $
 
-SHA1 (expat-2.2.9.tar.gz) = 3739fa85b056150fa2b2d57ad290d5cb39c97053
-RMD160 (expat-2.2.9.tar.gz) = 2cf5caef9778bc26f4c51e8d738cf53f75e302a4
-SHA512 (expat-2.2.9.tar.gz) = 69dc2af49910b18708084bfd78ed422d973bc2d8f76c46320581436a8bb7f47e32322c4526d92ca763aec4b5596ba8c8fc663c486258e47fbaeaeeed6efebd91
-Size (expat-2.2.9.tar.gz) = 661213 bytes
+SHA1 (expat-2.2.10.tar.gz) = 042cd99f79d7141e9eec12cc215646aac3f307db
+RMD160 (expat-2.2.10.tar.gz) = 6b62f98ef8bf05cccf2c375f132589e336ddef19
+SHA512 (expat-2.2.10.tar.gz) = b22019832fe1be1ddfea5e5e14f3079ac77803096fbd464699a245d51a4a610d1c9657ad4353868a545290df37ad2a796882922da2a77314b6b34edab67506a7
+Size (expat-2.2.10.tar.gz) = 665590 bytes