Thu Oct 8 16:55:05 2020 UTC ()
expat: switch back to building with autoconf

Manually install xmlwf.1.

Fixes cyclic dependency between cmake and expat (on Solaris).

Bump PKGREVISION.


(wiz)
diff -r1.43 -r1.44 pkgsrc/textproc/expat/Makefile
diff -r1.14 -r1.15 pkgsrc/textproc/expat/PLIST
cvs diff -r1.43 -r1.44 pkgsrc/textproc/expat/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/expat/Makefile 2020/10/07 19:53:02 1.43
+++ pkgsrc/textproc/expat/Makefile 2020/10/08 16:55:04 1.44
@@ -1,31 +1,42 @@ @@ -1,31 +1,42 @@
1# $NetBSD: Makefile,v 1.43 2020/10/07 19:53:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2020/10/08 16:55:04 wiz Exp $
2 2
3DISTNAME= expat-2.2.10 3DISTNAME= expat-2.2.10
 4PKGREVISION= 1
4CATEGORIES= textproc 5CATEGORIES= textproc
5MASTER_SITES= ${MASTER_SITE_GITHUB:=libexpat/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=libexpat/}
6GITHUB_PROJECT= libexpat 7GITHUB_PROJECT= libexpat
7GITHUB_RELEASE= R_${PKGVERSION_NOREV:S/./_/g} 8GITHUB_RELEASE= R_${PKGVERSION_NOREV:S/./_/g}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://libexpat.github.io/ 11HOMEPAGE= https://libexpat.github.io/
11COMMENT= XML parser library written in C 12COMMENT= XML parser library written in C
12LICENSE= mit 13LICENSE= mit
13 14
14USE_CMAKE= yes 15GNU_CONFIGURE= yes
 16USE_LIBTOOL= yes
15 17
16USE_LANGUAGES= c c++ 18CONFIGURE_ARGS+= --without-examples
17TEST_TARGET= test 19CONFIGURE_ARGS+= --without-tests
18USE_TOOLS+= bash:test 20CONFIGURE_ARGS+= --without-docbook
19REPLACE_BASH= test-driver-wrapper.sh 21
20TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC} 22USE_LANGUAGES= c c++
 23TEST_TARGET= test
 24USE_TOOLS+= bash:test
 25REPLACE_BASH= test-driver-wrapper.sh
 26# we can't use cmake due to a cyclic dependency
 27#USE_CMAKE= yes
 28#TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
21 29
22PKGCONFIG_OVERRIDE+= expat.pc.in 30PKGCONFIG_OVERRIDE+= expat.pc.in
23 31
24DOCDIR= ${PREFIX}/share/doc/expat 32DOCDIR= ${PREFIX}/share/doc/expat
25 33
 34INSTALLATION_DIRS+= ${PKGMANDIR}/man1
 35
26post-install: 36post-install:
27 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 37 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
28 ${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR} 38 ${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DESTDIR}${DOCDIR}
29 ${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR} 39 ${INSTALL_DATA} ${WRKSRC}/doc/style.css ${DESTDIR}${DOCDIR}
 40 ${INSTALL_DATA} ${WRKSRC}/doc/xmlwf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
30 41
31.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/textproc/expat/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/expat/PLIST 2020/10/07 19:53:02 1.14
+++ pkgsrc/textproc/expat/PLIST 2020/10/08 16:55:04 1.15
@@ -1,18 +1,12 @@ @@ -1,18 +1,12 @@
1@comment $NetBSD: PLIST,v 1.14 2020/10/07 19:53:02 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.15 2020/10/08 16:55:04 wiz Exp $
2bin/xmlwf 2bin/xmlwf
3include/expat.h 3include/expat.h
4include/expat_config.h 4include/expat_config.h
5include/expat_external.h 5include/expat_external.h
6lib/cmake/${PKGNAME}/expat-config-version.cmake 6lib/libexpat.la
7lib/cmake/${PKGNAME}/expat-config.cmake 
8lib/cmake/${PKGNAME}/expat-noconfig.cmake 
9lib/cmake/${PKGNAME}/expat.cmake 
10lib/libexpat.so 
11lib/libexpat.so.1 
12lib/libexpat.so.1.6.12 
13lib/pkgconfig/expat.pc 7lib/pkgconfig/expat.pc
14man/man1/xmlwf.1 8man/man1/xmlwf.1
15share/doc/expat/AUTHORS 9share/doc/expat/AUTHORS
16share/doc/expat/changelog 10share/doc/expat/changelog
17share/doc/expat/reference.html 11share/doc/expat/reference.html
18share/doc/expat/style.css 12share/doc/expat/style.css