From d06d7188f31e5df646b41f7a8abf9a9cfd74578b Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Wed, 14 Apr 2021 19:36:21 +0200 Subject: [PATCH] textproc/expat: update to 2.3.0 - Move static libraries behind an option STATIC. This will likely be dropped completely in the next update. PR: 254543 Exp-run by: antoine --- textproc/expat2/Makefile | 11 +++++++---- textproc/expat2/distinfo | 6 +++--- textproc/expat2/pkg-plist | 8 ++++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile index 5006d8b6c6f8..69d0c38f232c 100644 --- a/textproc/expat2/Makefile +++ b/textproc/expat2/Makefile @@ -1,9 +1,9 @@ # Created by: Dirk Froemberg PORTNAME= expat -PORTVERSION= 2.2.10 +DISTVERSION= 2.3.0 CATEGORIES= textproc -MASTER_SITES= https://github.com/libexpat/libexpat/releases/download/R_${PORTVERSION:S|.|_|g}/ +MASTER_SITES= https://github.com/libexpat/libexpat/releases/download/R_${DISTVERSION:S|.|_|g}/ MAINTAINER= desktop@FreeBSD.org COMMENT= XML 1.0 parser written in C @@ -13,15 +13,18 @@ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= bash:shells/bash -GNU_CONFIGURE= yes USES= libtool pathfix python:test tar:xz USE_LDCONFIG= yes +GNU_CONFIGURE= yes + CONFIGURE_ARGS= --without-docbook --without-examples INSTALL_TARGET= install-strip -OPTIONS_DEFINE= DOCS TEST +OPTIONS_DEFINE= DOCS STATIC TEST OPTIONS_SUB= yes +STATIC_CONFIGURE_ENABLE= static + TEST_USES= shebangfix SHEBANG_FILES= test-driver-wrapper.sh tests/udiffer.py tests/xmltest.sh TEST_CONFIGURE_WITH= tests diff --git a/textproc/expat2/distinfo b/textproc/expat2/distinfo index 236e97e3d074..96d40c66930f 100644 --- a/textproc/expat2/distinfo +++ b/textproc/expat2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601788459 -SHA256 (expat-2.2.10.tar.xz) = 5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2 -SIZE (expat-2.2.10.tar.xz) = 425432 +TIMESTAMP = 1616672812 +SHA256 (expat-2.3.0.tar.xz) = caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9 +SIZE (expat-2.3.0.tar.xz) = 433508 diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist index a3b033281188..23469f8fae33 100644 --- a/textproc/expat2/pkg-plist +++ b/textproc/expat2/pkg-plist @@ -2,10 +2,14 @@ bin/xmlwf include/expat.h include/expat_config.h include/expat_external.h -lib/libexpat.a +lib/cmake/expat-2.3.0/expat-config-version.cmake +lib/cmake/expat-2.3.0/expat-config.cmake +lib/cmake/expat-2.3.0/expat-noconfig.cmake +lib/cmake/expat-2.3.0/expat.cmake +%%STATIC%%lib/libexpat.a lib/libexpat.so lib/libexpat.so.1 -lib/libexpat.so.1.6.12 +lib/libexpat.so.1.7.0 libdata/pkgconfig/expat.pc man/man1/xmlwf.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS