View | Details | Raw Unified | Return to bug 210006 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	pugixml
3
PORTNAME=	pugixml
4
PORTVERSION=	1.6
4
PORTVERSION=	1.7
5
PORTREVISION=	1
5
PORTREVISION=	1
6
CATEGORIES=	textproc
6
CATEGORIES=	textproc
7
MASTER_SITES=	http://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
7
MASTER_SITES=	http://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pugixml-1.6.tar.gz) = 473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de
1
SHA256 (pugixml-1.7.tar.gz) = fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca
2
SIZE (pugixml-1.6.tar.gz) = 346616
2
SIZE (pugixml-1.7.tar.gz) = 354472
(-)files/patch-scripts_CMakeLists.txt (-7 / +15 lines)
Lines 1-18 Link Here
1
--- scripts/CMakeLists.txt.orig	2015-03-25 03:19:09 UTC
1
--- scripts/CMakeLists.txt.orig	2015-10-19 06:15:50.000000000 +0300
2
+++ scripts/CMakeLists.txt
2
+++ scripts/CMakeLists.txt	2016-06-04 00:25:19.436479000 +0300
3
@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES)
3
@@ -19,11 +19,8 @@
4
 	add_definitions(${BUILD_DEFINES})
4
 	endforeach()
5
 endif()
5
 endif()
6
 
6
 
7
-if(BUILD_SHARED_LIBS)
7
-if(BUILD_SHARED_LIBS)
8
-    add_library(pugixml SHARED ${SOURCES})
8
-	add_library(pugixml SHARED ${SOURCES})
9
-else()
9
-else()
10
-    add_library(pugixml STATIC ${SOURCES})
10
-	add_library(pugixml STATIC ${SOURCES})
11
-endif()
11
-endif()
12
+add_library(pugixml SHARED ${SOURCES})
12
+add_library(pugixml SHARED ${SOURCES})
13
+add_library(pugixml_static STATIC ${SOURCES})
13
+add_library(pugixml_static STATIC ${SOURCES})
14
 
14
 
15
 set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1)
15
 # Enable C++11 long long for compilers that are capable of it
16
 if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
17
@@ -31,15 +28,15 @@
18
 endif()
19
 
20
 set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
16
+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
21
+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
17
 
22
 
18
-install(TARGETS pugixml EXPORT pugixml-config 
23
-install(TARGETS pugixml EXPORT pugixml-config 
Lines 24-26 Link Here
24
 
29
 
25
 install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
30
 install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
26
-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
31
-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
32
 
33
 if(BUILD_TESTS)
34
 	file(GLOB TEST_SOURCES ../tests/*.cpp)
(-)files/patch-src_pugiconfig.hpp (-11 lines)
Lines 1-11 Link Here
1
--- src/pugiconfig.hpp.orig	2015-08-18 17:07:06 UTC
2
+++ src/pugiconfig.hpp
3
@@ -41,7 +41,7 @@
4
 // #define PUGIXML_HEADER_ONLY
5
 
6
 // Uncomment this to enable long long support
7
-// #define PUGIXML_HAS_LONG_LONG
8
+#define PUGIXML_HAS_LONG_LONG
9
 
10
 #endif
11
 
(-)pkg-plist (-1 / +1 lines)
Lines 3-6 Link Here
3
lib/libpugixml.a
3
lib/libpugixml.a
4
lib/libpugixml.so
4
lib/libpugixml.so
5
lib/libpugixml.so.1
5
lib/libpugixml.so.1
6
lib/libpugixml.so.1.6
6
lib/libpugixml.so.1.7

Return to bug 210006