Date: Thu, 5 Sep 2024 06:20:06 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 60892b88546d - main - textproc/libwbxml: Update to 0.11.10 Message-ID: <202409050620.4856K6ed095853@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=60892b88546d5b7ff981d3a1a2d95a55beb09822 commit 60892b88546d5b7ff981d3a1a2d95a55beb09822 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-09-05 05:57:56 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-09-05 06:17:47 +0000 textproc/libwbxml: Update to 0.11.10 - Remove unnecessary USES=pathfix - Remove unnecessary USES=tar:bzip2 - Use complete arguments/options - Remove DOCS option - Add make test Changes: https://github.com/libwbxml/libwbxml/releases --- textproc/libwbxml/Makefile | 38 ++++++++++++++++------- textproc/libwbxml/distinfo | 6 ++-- textproc/libwbxml/files/patch-CMakeLists.txt | 27 ---------------- textproc/libwbxml/files/patch-src__CMakeLists.txt | 20 ------------ textproc/libwbxml/pkg-plist | 22 ++++++------- 5 files changed, 38 insertions(+), 75 deletions(-) diff --git a/textproc/libwbxml/Makefile b/textproc/libwbxml/Makefile index 6806ac36ff1a..8d1a60ea035f 100644 --- a/textproc/libwbxml/Makefile +++ b/textproc/libwbxml/Makefile @@ -1,5 +1,5 @@ PORTNAME= libwbxml -PORTVERSION= 0.11.8 +PORTVERSION= 0.11.10 DISTVERSIONPREFIX= libwbxml- CATEGORIES= textproc devel @@ -13,19 +13,33 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= cmake iconv tar:bzip2 +USES= cmake iconv pkgconfig + +CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib \ + -DLIBDATA_INSTALL_DIR=${PREFIX}/libdata +CMAKE_OFF= ENABLE_INSTALL_DOC \ + ENABLE_UNIT_TEST \ + WBXML_INSTALL_FULL_HEADERS \ + WBXML_LIB_VERBOSE +CMAKE_ON= BUILD_SHARED_LIBS \ + BUILD_STATIC_LIBS \ + FOUND_POSIX_GETOPT \ + WBXML_ENCODER_USE_STRTBL \ + WBXML_SUPPORT_AIRSYNC \ + WBXML_SUPPORT_CO \ + WBXML_SUPPORT_CONML \ + WBXML_SUPPORT_DRMREL \ + WBXML_SUPPORT_EMN \ + WBXML_SUPPORT_OTA_SETTINGS \ + WBXML_SUPPORT_PROV \ + WBXML_SUPPORT_SI \ + WBXML_SUPPORT_SL \ + WBXML_SUPPORT_SYNCML \ + WBXML_SUPPORT_WML \ + WBXML_SUPPORT_WTA \ + WBXML_SUPPORT_WV USE_LDCONFIG= yes USE_GITHUB= yes -DOCSDIR= ${PREFIX}/share/doc/libwbxml - -OPTIONS_DEFINE= DOCS - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for file in BUGS ChangeLog README References THANKS TODO - ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} -.endfor - .include <bsd.port.mk> diff --git a/textproc/libwbxml/distinfo b/textproc/libwbxml/distinfo index 91056625460d..5c67136c9166 100644 --- a/textproc/libwbxml/distinfo +++ b/textproc/libwbxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652907927 -SHA256 (libwbxml-libwbxml-libwbxml-0.11.8_GH0.tar.gz) = a6fe0e55369280c1a7698859a5c2bb37c8615c57a919b574cd8c16458279db66 -SIZE (libwbxml-libwbxml-libwbxml-0.11.8_GH0.tar.gz) = 362833 +TIMESTAMP = 1724084534 +SHA256 (libwbxml-libwbxml-libwbxml-0.11.10_GH0.tar.gz) = 027b77ab7c06458b73cbcf1f06f9cf73b65acdbb2ac170b234c1d736069acae4 +SIZE (libwbxml-libwbxml-libwbxml-0.11.10_GH0.tar.gz) = 320686 diff --git a/textproc/libwbxml/files/patch-CMakeLists.txt b/textproc/libwbxml/files/patch-CMakeLists.txt deleted file mode 100644 index f9e1d29f15d8..000000000000 --- a/textproc/libwbxml/files/patch-CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- CMakeLists.txt.orig 2015-04-08 16:34:34 UTC -+++ CMakeLists.txt -@@ -44,7 +44,7 @@ SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_D - - SET( LIB_SUFFIX "" CACHE STRING "The library directory suffix. 32bit empty string, 64 for 64bit." ) - SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE INTERNAL "libary location" ) --SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The library data directory" ) -+SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata" CACHE PATH "The library data directory" ) - SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE INTERNAL "binary location" ) - SET( SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE INTERNAL "data location" ) - SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE INTERNAL "headers location" ) -@@ -191,7 +191,7 @@ MARK_AS_ADVANCED( CLEAR BUILD_DOCUMENTAT - # ADD_CUSTOM_TARGET( DoxygenDoc ) - # ADD_DEPENDENCIES( DoxygenDoc DoxygenDocLibrary DoxygenDocTools ) - #ENDIF ( BUILD_DOCUMENTATION ) --OPTION( ENABLE_INSTALL_DOC "install documentation" ON ) -+OPTION( ENABLE_INSTALL_DOC "install documentation" OFF ) - IF( ENABLE_INSTALL_DOC ) - ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/BUGS ) - ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/ChangeLog ) -@@ -260,6 +260,3 @@ INCLUDE( CPack ) - ### CTest ######################################## - - ADD_SUBDIRECTORY( test/tools ) --IF(CHECK_FOUND) -- ADD_SUBDIRECTORY( test/api ) --ENDIF(CHECK_FOUND) diff --git a/textproc/libwbxml/files/patch-src__CMakeLists.txt b/textproc/libwbxml/files/patch-src__CMakeLists.txt deleted file mode 100644 index a6995bbf85e0..000000000000 --- a/textproc/libwbxml/files/patch-src__CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- src/CMakeLists.txt.orig 2017-02-12 14:08:00.000000000 +0100 -+++ src/CMakeLists.txt 2017-06-27 01:06:36.975987000 +0200 -@@ -30,7 +30,7 @@ - - SET_TARGET_PROPERTIES( wbxml2 PROPERTIES SOVERSION ${LIBWBXML_LIBVERSION_SOVERSION} ) - SET_TARGET_PROPERTIES( wbxml2 PROPERTIES VERSION ${LIBWBXML_LIBVERSION_VERSION} ) -- TARGET_LINK_LIBRARIES( wbxml2 PRIVATE ${EXPAT_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( wbxml2 PRIVATE ${EXPAT_LIBRARIES} ${ICONV_LIBRARIES} ) - - INSTALL( TARGETS wbxml2 - RUNTIME DESTINATION ${LIBWBXML_BIN_DIR} -@@ -44,7 +44,7 @@ - - SET_TARGET_PROPERTIES( wbxml2_static PROPERTIES SOVERSION ${LIBWBXML_LIBVERSION_SOVERSION} ) - SET_TARGET_PROPERTIES( wbxml2_static PROPERTIES VERSION ${LIBWBXML_LIBVERSION_VERSION} ) -- TARGET_LINK_LIBRARIES( wbxml2_static PRIVATE ${EXPAT_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( wbxml2_static PRIVATE ${EXPAT_LIBRARIES} ${ICONV_LIBRARIES} ) - SET_TARGET_PROPERTIES( wbxml2_static PROPERTIES OUTPUT_NAME wbxml2 ) - - INSTALL( TARGETS wbxml2_static diff --git a/textproc/libwbxml/pkg-plist b/textproc/libwbxml/pkg-plist index a638255ac286..1feadab43754 100644 --- a/textproc/libwbxml/pkg-plist +++ b/textproc/libwbxml/pkg-plist @@ -1,18 +1,14 @@ bin/wbxml2xml bin/xml2wbxml -include/libwbxml-1.0/wbxml/wbxml.h -include/libwbxml-1.0/wbxml/wbxml_config.h -include/libwbxml-1.0/wbxml/wbxml_conv.h -include/libwbxml-1.0/wbxml/wbxml_defines.h -include/libwbxml-1.0/wbxml/wbxml_errors.h +include/libwbxml-1.1/wbxml/wbxml.h +include/libwbxml-1.1/wbxml/wbxml_config.h +include/libwbxml-1.1/wbxml/wbxml_conv.h +include/libwbxml-1.1/wbxml/wbxml_defines.h +include/libwbxml-1.1/wbxml/wbxml_errors.h +lib/cmake/libwbxml2/libwbxml2-config-version.cmake +lib/cmake/libwbxml2/libwbxml2-config.cmake +lib/libwbxml2.a lib/libwbxml2.so lib/libwbxml2.so.1 -lib/libwbxml2.so.1.0.8 +lib/libwbxml2.so.1.1.1 libdata/pkgconfig/libwbxml2.pc -share/cmake/Modules/FindLibWbxml2.cmake -%%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/References -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/TODO
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409050620.4856K6ed095853>