svn commit: r451713 - in head/textproc/pugixml: . files

Steve Wills swills at FreeBSD.org
Tue Oct 10 18:28:27 UTC 2017 

Author: swills
Date: Tue Oct 10 18:28:26 2017
New Revision: 451713
URL: https://svnweb.freebsd.org/changeset/ports/451713

Log:
  textproc/pugixml: update to 1.8.1
  
  PR:		222348
  Approved by:	Yakov Galka <ybungalobill at gmail.com> (maintainer)

Added:
  head/textproc/pugixml/files/patch-CMakeLists.txt   (contents, props changed)
  head/textproc/pugixml/files/patch-scripts_pugixml.pc.in   (contents, props changed)
Deleted:
  head/textproc/pugixml/files/patch-scripts_CMakeLists.txt
Modified:
  head/textproc/pugixml/Makefile
  head/textproc/pugixml/distinfo
  head/textproc/pugixml/pkg-plist

Modified: head/textproc/pugixml/Makefile
==============================================================================
--- head/textproc/pugixml/Makefile	Tue Oct 10 18:03:40 2017	(r451712)
+++ head/textproc/pugixml/Makefile	Tue Oct 10 18:28:26 2017	(r451713)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pugixml
-PORTVERSION=	1.7
-PORTREVISION=	3
+PORTVERSION=	1.8.1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
 
@@ -12,8 +11,9 @@ COMMENT=	Light-weight, simple and fast XML parser for 
 LICENSE=	MIT
 
 USES=		cmake compiler:c++11-lang
-CMAKE_SOURCE_PATH=	${WRKSRC}/scripts
 
 CXXFLAGS+=	-std=c++11
+WRKSRC=		${WRKDIR}/${PORTNAME}-1.8
+CMAKE_ARGS=	-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=OFF -DBUILD_PKGCONFIG=ON
 
 .include <bsd.port.mk>

Modified: head/textproc/pugixml/distinfo
==============================================================================
--- head/textproc/pugixml/distinfo	Tue Oct 10 18:03:40 2017	(r451712)
+++ head/textproc/pugixml/distinfo	Tue Oct 10 18:28:26 2017	(r451713)
@@ -1,2 +1,3 @@
-SHA256 (pugixml-1.7.tar.gz) = fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca
-SIZE (pugixml-1.7.tar.gz) = 354472
+TIMESTAMP = 1505424287
+SHA256 (pugixml-1.8.1.tar.gz) = 00d974a1308e85ca0677a981adc1b2855cb060923181053fb0abf4e2f37b8f39
+SIZE (pugixml-1.8.1.tar.gz) = 357846

Added: head/textproc/pugixml/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/pugixml/files/patch-CMakeLists.txt	Tue Oct 10 18:28:26 2017	(r451713)
@@ -0,0 +1,62 @@
+--- CMakeLists.txt.orig	2016-11-27 15:48:03.000000000 -0500
++++ CMakeLists.txt	2017-09-14 18:31:07.892853000 -0400
+@@ -2,7 +2,8 @@
+ 
+ cmake_minimum_required(VERSION 2.6)
+ 
+-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,28 +39,27 @@
+ 
+ if(BUILD_SHARED_LIBS)
+ 	add_library(pugixml SHARED ${SOURCES})
+-else()
+-	add_library(pugixml STATIC ${SOURCES})
++        set_target_properties(pugixml PROPERTIES VERSION 1.8 SOVERSION 1)
++        install(TARGETS pugixml EXPORT pugixml-config
++        	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 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()
+ 
+ # Enable C++11 long long for compilers that are capable of it
+ if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;")
+ 	target_compile_features(pugixml PUBLIC cxx_long_long_type)
+ endif()
+ 
+-set_target_properties(pugixml PROPERTIES VERSION 1.8 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()
+-
+-install(TARGETS pugixml EXPORT pugixml-config
+-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
+-	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
+-	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
++install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+ 
+ if(BUILD_PKGCONFIG)
+@@ -75,4 +75,4 @@
+ 	add_executable(check ${TEST_SOURCES})
+ 	target_link_libraries(check pugixml)
+ 	add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+-endif()
+\ No newline at end of file
++endif()

Added: head/textproc/pugixml/files/patch-scripts_pugixml.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/pugixml/files/patch-scripts_pugixml.pc.in	Tue Oct 10 18:28:26 2017	(r451713)
@@ -0,0 +1,18 @@
+--- scripts/pugixml.pc.in.orig	2017-09-14 18:05:00.281262000 -0400
++++ scripts/pugixml.pc.in	2017-09-14 18:05:14.312398000 -0400
+@@ -1,11 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/include/pugixml- at PUGIXML_VERSION_STRING@
+-libdir=${exec_prefix}/lib/pugixml- at 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

Modified: head/textproc/pugixml/pkg-plist
==============================================================================
--- head/textproc/pugixml/pkg-plist	Tue Oct 10 18:03:40 2017	(r451712)
+++ head/textproc/pugixml/pkg-plist	Tue Oct 10 18:28:26 2017	(r451713)
@@ -1,6 +1,9 @@
 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.7
+lib/libpugixml.so.1.8
+libdata/pkgconfig/pugixml.pc

More information about the svn-ports-head mailing list