Attachment #200950 for bug #234779

View | Details | Raw Unified | Return to bug 234779
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	pugixml
PORTVERSION=	1.9
PORTREVISION=	2
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

CMAKE_OFF=	BUILD_TESTS
CMAKE_ON=	BUILD_SHARED_LIBS BUILD_STATIC_LIBS BUILD_PKGCONFIG
CMAKE_ARGS=	-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=OFF -DBUILD_PKGCONFIG=ON

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1505424287	1	TIMESTAMP = 1547027330
2	SHA256 (pugixml-1.8.1.tar.gz) = 00d974a1308e85ca0677a981adc1b2855cb060923181053fb0abf4e2f37b8f39	2	SHA256 (pugixml-1.9.tar.gz) = d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
3	SIZE (pugixml-1.8.1.tar.gz) = 357846	3	SIZE (pugixml-1.9.tar.gz) = 377369




--- 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_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})
+        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})

+        	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 # Export symbols for shared library builds
 if(BUILD_SHARED_LIBS AND MSVC)
@@ -54,11 +61,6 @@ endif()
 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()
-
-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)
 
 target_include_directories(pugixml PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
 	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()

Lines 1-5 Link Here

(-)files/patch-scripts_pugixml.pc.in (-2 / +2 lines)
1	--- scripts/pugixml.pc.in.orig 2017-09-14 18:05:00.281262000 -0400	1	--- scripts/pugixml.pc.in.orig 2019-01-09 09:56:58 UTC
2	+++ scripts/pugixml.pc.in 2017-09-14 18:05:14.312398000 -0400	2	+++ scripts/pugixml.pc.in
3	@@ -1,11 +1,11 @@	3	@@ -1,11 +1,11 @@
4	prefix=@CMAKE_INSTALL_PREFIX@	4	prefix=@CMAKE_INSTALL_PREFIX@
5	exec_prefix=${prefix}	5	exec_prefix=${prefix}

Lines 1-6 Link Here

(-)files/patch-src_pugiconfig.hpp (-2 / +2 lines)
1	--- src/pugiconfig.hpp.orig 2015-08-18 17:07:06 UTC	1	--- src/pugiconfig.hpp.orig 2018-04-04 14:53:16 UTC
2	+++ src/pugiconfig.hpp	2	+++ src/pugiconfig.hpp
3	@@ -41,7 +41,7 @@	3	@@ -44,7 +44,7 @@
4	// #define PUGIXML_HEADER_ONLY	4	// #define PUGIXML_HEADER_ONLY
5		5
6	// Uncomment this to enable long long support	6	// Uncomment this to enable long long support

Lines 5-9 Link Here

(-)pkg-plist (-1 / +1 lines)
5	lib/libpugixml.a	5	lib/libpugixml.a
6	lib/libpugixml.so	6	lib/libpugixml.so
7	lib/libpugixml.so.1	7	lib/libpugixml.so.1
8	lib/libpugixml.so.1.8	8	lib/libpugixml.so.1.9
9	libdata/pkgconfig/pugixml.pc	9	libdata/pkgconfig/pugixml.pc

Return to bug 234779

Lines 1-12 Link Here

(-)Makefile (-6 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pugixml	3	PORTNAME= pugixml
4	PORTVERSION= 1.8.1	4	PORTVERSION= 1.9
5	PORTREVISION= 2
6	CATEGORIES= textproc	5	CATEGORIES= textproc
7	MASTER_SITES= https://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/	6	MASTER_SITES= https://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
8		7
9	MAINTAINER= ybungalobill@gmail.com	8	MAINTAINER= tobik@FreeBSD.org
10	COMMENT= Light-weight, simple and fast XML parser for C++ with XPath support	9	COMMENT= Light-weight, simple and fast XML parser for C++ with XPath support
11		10
12	LICENSE= MIT	11	LICENSE= MIT
Lines 13-20 Link Here
13		12
14	USES= cmake compiler:c++11-lang	13	USES= cmake compiler:c++11-lang
15		14
16	CXXFLAGS+= -std=c++11	15	CMAKE_OFF= BUILD_TESTS
17	WRKSRC= ${WRKDIR}/${PORTNAME}-1.8	16	CMAKE_ON= BUILD_SHARED_LIBS BUILD_STATIC_LIBS BUILD_PKGCONFIG
18	CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=OFF -DBUILD_PKGCONFIG=ON
19		17
20	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)files/patch-CMakeLists.txt (-34 / +14 lines)
1	--- CMakeLists.txt.orig 2016-11-27 15:48:03.000000000 -0500	1	--- CMakeLists.txt.orig 2018-04-04 14:53:16 UTC
2	+++ CMakeLists.txt 2017-09-14 18:31:07.892853000 -0400	2	+++ CMakeLists.txt
3	@@ -2,7 +2,8 @@	3	@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 2.8.12)
4		4
5	cmake_minimum_required(VERSION 2.6)	5	project(pugixml)
6		6
7	-option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)	7	-option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
8	+option(BUILD_SHARED_LIBS "Build shared library" OFF)	8	+option(BUILD_SHARED_LIBS "Build shared library" OFF)
Lines 10-26 Link Here
10	option(BUILD_TESTS "Build tests" OFF)	10	option(BUILD_TESTS "Build tests" OFF)
11	option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)	11	option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
12		12
13	@@ -38,28 +39,27 @@	13	@@ -38,9 +39,15 @@ endif()
14		14
15	if(BUILD_SHARED_LIBS)	15	if(BUILD_SHARED_LIBS)
16	add_library(pugixml SHARED ${SOURCES})	16	add_library(pugixml SHARED ${HEADERS} ${SOURCES})
17	-else()	17	-else()
18	- add_library(pugixml STATIC ${SOURCES})	18	- add_library(pugixml STATIC ${HEADERS} ${SOURCES})
19	+ set_target_properties(pugixml PROPERTIES VERSION 1.8 SOVERSION 1)
20	+ install(TARGETS pugixml EXPORT pugixml-config
21	+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
22	+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
23	+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
24	endif()	19	endif()
25	+if(BUILD_STATIC_LIBS)	20	+if(BUILD_STATIC_LIBS)
26	+ add_library(pugixml_static STATIC ${SOURCES})	21	+ add_library(pugixml_static STATIC ${SOURCES})
Lines 31-62 Link Here
31	+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})	26	+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
32	+endif()	27	+endif()
33		28
34	# Enable C++11 long long for compilers that are capable of it	29	# Export symbols for shared library builds
35	if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;")	30	if(BUILD_SHARED_LIBS AND MSVC)
36	target_compile_features(pugixml PUBLIC cxx_long_long_type)	31	@@ -54,11 +61,6 @@ endif()
37	endif()
38		32
39	-set_target_properties(pugixml PROPERTIES VERSION 1.8 SOVERSION 1)	33	set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
40	-get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)	34	get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
41	-	35	-
42	-if(BUILD_PKGCONFIG)	36	-if(BUILD_PKGCONFIG)
43	- # Install library into its own directory under LIBDIR	37	- # Install library into its own directory under LIBDIR
44	- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})	38	- set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
45	-endif()	39	-endif()
46	-
47	-install(TARGETS pugixml EXPORT pugixml-config
48	- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
49	- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
50	- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
51	-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
52	+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
53	install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
54		40
55	if(BUILD_PKGCONFIG)	41	target_include_directories(pugixml PUBLIC
56	@@ -75,4 +75,4 @@	42	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
57	add_executable(check ${TEST_SOURCES})
58	target_link_libraries(check pugixml)
59	add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
60	-endif()
61	\ No newline at end of file
62	+endif()