6 files changed, 31 insertions, 25 deletions

diff --git a/textproc/pugixml/Makefile b/textproc/pugixml/Makefile
index 3113c0e93a18..bfdb72ba6715 100644
--- a/textproc/pugixml/Makefile
+++ b/textproc/pugixml/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pugixml
-PORTVERSION=	1.4
+PORTVERSION=	1.6
 CATEGORIES=	textproc
 MASTER_SITES=	http://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
 
diff --git a/textproc/pugixml/distinfo b/textproc/pugixml/distinfo
index 14db7d1673ba..be3ad6cc0668 100644
--- a/textproc/pugixml/distinfo
+++ b/textproc/pugixml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pugixml-1.4.tar.gz) = 9c8802269cee1a48ab269d4055b910216bdf878cccde286dcae9c25813e6fa87
-SIZE (pugixml-1.4.tar.gz) = 369290
+SHA256 (pugixml-1.6.tar.gz) = 473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de
+SIZE (pugixml-1.6.tar.gz) = 346616
diff --git a/textproc/pugixml/files/patch-scripts_CMakeLists.txt b/textproc/pugixml/files/patch-scripts_CMakeLists.txt
new file mode 100644
index 000000000000..9d1f7d2a3db7
--- /dev/null
+++ b/textproc/pugixml/files/patch-scripts_CMakeLists.txt
@@ -0,0 +1,26 @@
+--- scripts/CMakeLists.txt.orig	2015-03-25 03:19:09 UTC
++++ scripts/CMakeLists.txt
+@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES)
+ 	add_definitions(${BUILD_DEFINES})
+ endif()
+ 
+-if(BUILD_SHARED_LIBS)
+-    add_library(pugixml SHARED ${SOURCES})
+-else()
+-    add_library(pugixml STATIC ${SOURCES})
+-endif()
++add_library(pugixml SHARED ${SOURCES})
++add_library(pugixml_static STATIC ${SOURCES})
+ 
+ set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1)
++set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
+ 
+-install(TARGETS pugixml EXPORT pugixml-config 
++install(TARGETS pugixml pugixml_static
+ 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
+ 
+ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
diff --git a/textproc/pugixml/files/patch-scripts__CMakeLists.txt b/textproc/pugixml/files/patch-scripts__CMakeLists.txt
deleted file mode 100644
index a56e6981ee5e..000000000000
--- a/textproc/pugixml/files/patch-scripts__CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./scripts/CMakeLists.txt.orig	2014-08-23 08:28:21.562183999 -0400
-+++ ./scripts/CMakeLists.txt	2014-08-23 08:41:29.301439998 -0400
-@@ -10,13 +10,11 @@
- set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp)
- set(SOURCES ${HEADERS} ../src/pugixml.cpp)
- 
--if(BUILD_SHARED_LIBS)
--    add_library(pugixml SHARED ${SOURCES})
--else()
--    add_library(pugixml STATIC ${SOURCES})
--endif()
-+add_library(pugixml SHARED ${SOURCES})
-+add_library(pugixml_static STATIC ${SOURCES})
- 
- set_target_properties(pugixml PROPERTIES VERSION 1.4 SOVERSION 1)
-+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
- 
--install(TARGETS pugixml LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS pugixml pugixml_static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(FILES ${HEADERS} DESTINATION include)
diff --git a/textproc/pugixml/pkg-descr b/textproc/pugixml/pkg-descr
index e01de5a7ef2f..f3be8554cc35 100644
--- a/textproc/pugixml/pkg-descr
+++ b/textproc/pugixml/pkg-descr
@@ -7,4 +7,4 @@ pugixml is a light-weight C++ XML processing library. It features:
 * Full Unicode support with Unicode interface variants and automatic encoding
   conversions
 
-WWW: http://pugixml.com/
+WWW: http://pugixml.org/
diff --git a/textproc/pugixml/pkg-plist b/textproc/pugixml/pkg-plist
index f759640837f6..0e0cfa9d452d 100644
--- a/textproc/pugixml/pkg-plist
+++ b/textproc/pugixml/pkg-plist
@@ -3,4 +3,4 @@ include/pugixml.hpp
 lib/libpugixml.a
 lib/libpugixml.so
 lib/libpugixml.so.1
-lib/libpugixml.so.1.4
+lib/libpugixml.so.1.6