diff options
author | wiz <wiz@pkgsrc.org> | 2020-10-08 16:55:04 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2020-10-08 16:55:04 +0000 |
commit | adc6da946720c3d01815aa3bd51d796e6eefcf82 (patch) | |
tree | faeadba08bd50e8853effaca6f307ac471916b74 /textproc/expat | |
parent | 0a95961cc11c468cbf41d74d759b9c55b36d258a (diff) | |
download | pkgsrc-adc6da946720c3d01815aa3bd51d796e6eefcf82.tar.gz |
expat: switch back to building with autoconf
Manually install xmlwf.1.
Fixes cyclic dependency between cmake and expat (on Solaris).
Bump PKGREVISION.
Diffstat (limited to 'textproc/expat')
-rw-r--r-- | textproc/expat/Makefile | 25 | ||||
-rw-r--r-- | textproc/expat/PLIST | 10 |
2 files changed, 20 insertions, 15 deletions
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index 3061bb2903e..d971e80432a 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -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 @@ HOMEPAGE= https://libexpat.github.io/ 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" diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST index 4180e346a8f..5c5558ce791 100644 --- a/textproc/expat/PLIST +++ b/textproc/expat/PLIST @@ -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 |