@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2020/10/07 19:53:02 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2020/10/08 16:55:04 wiz Exp $
 
 DISTNAME=	expat-2.2.10
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libexpat/}
 GITHUB_PROJECT=	libexpat
@@ -11,21 +12,31 @@
 COMMENT=	XML parser library written in C
 LICENSE=	mit
 
-USE_CMAKE=	yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 
-USE_LANGUAGES=		c c++
-TEST_TARGET=		test
-USE_TOOLS+=		bash:test
-REPLACE_BASH=		test-driver-wrapper.sh
-TEST_ENV+=		LD_LIBRARY_PATH=${WRKSRC}
+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
+# we can't use cmake due to a cyclic dependency
+#USE_CMAKE=	yes
+#TEST_ENV+=	LD_LIBRARY_PATH=${WRKSRC}
+
 PKGCONFIG_OVERRIDE+=	expat.pc.in
 
 DOCDIR=	${PREFIX}/share/doc/expat
 
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/xmlwf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"

@@ -1,15 +1,9 @@
-@comment $NetBSD: PLIST,v 1.14 2020/10/07 19:53:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/10/08 16:55:04 wiz Exp $
 bin/xmlwf
 include/expat.h
 include/expat_config.h
 include/expat_external.h
-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/libexpat.la
 lib/pkgconfig/expat.pc
 man/man1/xmlwf.1
 share/doc/expat/AUTHORS