Index: head/textproc/pugixml/Makefile =================================================================== --- head/textproc/pugixml/Makefile (revision 512174) +++ head/textproc/pugixml/Makefile (revision 512175) @@ -1,19 +1,21 @@ # $FreeBSD$ PORTNAME= pugixml -PORTVERSION= 1.9 -PORTREVISION= 1 +PORTVERSION= 1.10 CATEGORIES= textproc MASTER_SITES= https://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/ MAINTAINER= tobik@FreeBSD.org COMMENT= Light-weight, simple and fast XML parser for C++ with XPath support LICENSE= MIT USES= cmake compiler:c++11-lang +USE_LDCONFIG= yes -CMAKE_OFF= BUILD_TESTS -CMAKE_ON= BUILD_SHARED_LIBS BUILD_STATIC_LIBS BUILD_PKGCONFIG +CMAKE_OFF= BUILD_TESTS USE_VERSIONED_LIBDIR +CMAKE_ON= BUILD_SHARED_LIBS + +PLIST_SUB= SOVERSION=${PORTVERSION} .include Index: head/textproc/pugixml/distinfo =================================================================== --- head/textproc/pugixml/distinfo (revision 512174) +++ head/textproc/pugixml/distinfo (revision 512175) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547027330 -SHA256 (pugixml-1.9.tar.gz) = d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6 -SIZE (pugixml-1.9.tar.gz) = 377369 +TIMESTAMP = 1568636430 +SHA256 (pugixml-1.10.tar.gz) = 55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a +SIZE (pugixml-1.10.tar.gz) = 381990 Index: head/textproc/pugixml/files/patch-CMakeLists.txt =================================================================== --- head/textproc/pugixml/files/patch-CMakeLists.txt (revision 512174) +++ head/textproc/pugixml/files/patch-CMakeLists.txt (nonexistent) @@ -1,42 +0,0 @@ ---- CMakeLists.txt.orig 2018-04-04 14:53:16 UTC -+++ CMakeLists.txt -@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 2.8.12) - - project(pugixml) - --option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) -+option(BUILD_SHARED_LIBS "Build shared library" OFF) -+option(BUILD_STATIC_LIBS "Build static library" OFF) - option(BUILD_TESTS "Build tests" OFF) - option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF) - -@@ -38,9 +39,15 @@ endif() - - if(BUILD_SHARED_LIBS) - add_library(pugixml SHARED ${HEADERS} ${SOURCES}) --else() -- add_library(pugixml STATIC ${HEADERS} ${SOURCES}) - endif() -+if(BUILD_STATIC_LIBS) -+ add_library(pugixml_static STATIC ${SOURCES}) -+ set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) -+ install(TARGETS pugixml_static -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+endif() - - # Export symbols for shared library builds - if(BUILD_SHARED_LIBS AND MSVC) -@@ -54,11 +61,6 @@ endif() - - set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1) - get_target_property(PUGIXML_VERSION_STRING pugixml VERSION) -- --if(BUILD_PKGCONFIG) -- # Install library into its own directory under LIBDIR -- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) --endif() - - target_include_directories(pugixml PUBLIC - $ Property changes on: head/textproc/pugixml/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/pugixml/files/patch-scripts_pugixml.pc.in =================================================================== --- head/textproc/pugixml/files/patch-scripts_pugixml.pc.in (revision 512174) +++ head/textproc/pugixml/files/patch-scripts_pugixml.pc.in (nonexistent) @@ -1,18 +0,0 @@ ---- scripts/pugixml.pc.in.orig 2019-01-09 09:56:58 UTC -+++ scripts/pugixml.pc.in -@@ -1,11 +1,11 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@ --libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@ -+includedir=${prefix}/include -+libdir=${exec_prefix}/lib - - Name: pugixml - Description: Light-weight, simple and fast XML parser for C++ with XPath support. - URL: http://pugixml.org/ - Version: @PUGIXML_VERSION_STRING@ - Cflags: -I${includedir} --Libs: -L${libdir} -lpugixml -\ No newline at end of file -+Libs: -L${libdir} -lpugixml Property changes on: head/textproc/pugixml/files/patch-scripts_pugixml.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/pugixml/pkg-plist =================================================================== --- head/textproc/pugixml/pkg-plist (revision 512174) +++ head/textproc/pugixml/pkg-plist (revision 512175) @@ -1,9 +1,8 @@ include/pugiconfig.hpp include/pugixml.hpp lib/cmake/pugixml/pugixml-config-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/pugixml/pugixml-config.cmake -lib/libpugixml.a lib/libpugixml.so lib/libpugixml.so.1 -lib/libpugixml.so.1.9 +lib/libpugixml.so.%%SOVERSION%% libdata/pkgconfig/pugixml.pc