graphics/lensfun: Update to 0.3.2

Approved by:	maintainer timeout (1 month)

4 files changed, 70 insertions, 79 deletions

diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 779f526..9602a2b 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lensfun
-PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTVERSION=	0.3.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -14,7 +13,7 @@ LICENSE=	LGPL3
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		cmake pkgconfig tar:bzip2
+USES=		cmake pathfix pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DBUILD_AUXFUN:BOOL=ON -DINSTALL_HELPER_SCRIPTS:BOOL=OFF
@@ -24,8 +23,4 @@ OPTIONS_DEFAULT=	SIMD
 
 SIMD_CMAKE_OFF=	-DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF
 
-post-patch:
-	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},libdata,' \
-		${WRKSRC}/libs/lensfun/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/graphics/lensfun/distinfo b/graphics/lensfun/distinfo
index daf4ceb..8ad1df0 100644
--- a/graphics/lensfun/distinfo
+++ b/graphics/lensfun/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lensfun-0.3.0.tar.bz2) = c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1
-SIZE (lensfun-0.3.0.tar.bz2) = 636694
+SHA256 (lensfun-0.3.2.tar.gz) = ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331
+SIZE (lensfun-0.3.2.tar.gz) = 784825
diff --git a/graphics/lensfun/files/patch-CMakeLists.txt b/graphics/lensfun/files/patch-CMakeLists.txt
index 9a2b83e..1dd650d 100644
--- a/graphics/lensfun/files/patch-CMakeLists.txt
+++ b/graphics/lensfun/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-09-30 17:37:34 UTC
+--- CMakeLists.txt.orig	2015-11-15 17:07:26 UTC
 +++ CMakeLists.txt
-@@ -28,12 +28,18 @@ IF(NOT HAVE_REGEX_H)
+@@ -31,12 +31,18 @@ IF(NOT HAVE_REGEX_H)
    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex)
  ENDIF()
  
@@ -12,8 +12,8 @@
 +
  # options controlling the build process
  OPTION(BUILD_STATIC "Build static library" OFF)
- OPTION(BUILD_TESTS "Build test programs" OFF)
- OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF)
+ OPTION(BUILD_TESTS "Build test suite" OFF)
+ OPTION(BUILD_LENSTOOL "Build the lenstool (requires libpng)" OFF)
 -OPTION(BUILD_FOR_SSE "Build with support for SSE" ON)
 -OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ON)
 +OPTION(BUILD_FOR_SSE "Build with support for SSE" ${X86_ON})
@@ -21,7 +21,7 @@
  OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
  OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
  
-@@ -46,14 +52,14 @@ ENDIF()
+@@ -62,14 +68,14 @@ ENDIF()
  
  IF(BUILD_FOR_SSE)
    SET(VECTORIZATION_SSE 1)
@@ -40,11 +40,11 @@
    ENDIF()
  ENDIF()
  
-@@ -68,6 +74,7 @@ ENDIF()
- # find dependencies
- FIND_PACKAGE(GLIB2 REQUIRED)
- INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
+@@ -91,6 +97,7 @@ SET(LENSFUN_GLIB_REQUIREMENT_MACRO "GLIB
+ FIND_PACKAGE(GLIB2 REQUIRED 2.40)
+ 
+ INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIRS})
 +LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS})
  
- IF(BUILD_AUXFUN)
-   FIND_PACKAGE(PNG REQUIRED)
+ 
+ IF(BUILD_STATIC)
diff --git a/graphics/lensfun/pkg-plist b/graphics/lensfun/pkg-plist
index 94704bc..0edc431 100644
--- a/graphics/lensfun/pkg-plist
+++ b/graphics/lensfun/pkg-plist
@@ -1,62 +1,58 @@
-include/auxfun/image.h
-include/auxfun/rgbpixel.h
 include/lensfun/lensfun.h
-lib/libauxfun.so
-lib/libauxfun.so.0
-lib/libauxfun.so.0.3.0
 lib/liblensfun.so
-lib/liblensfun.so.0
-lib/liblensfun.so.0.3.0
+lib/liblensfun.so.1
+lib/liblensfun.so.0.3.2
 libdata/pkgconfig/lensfun.pc
-%%DATADIR%%/6x6.xml
-%%DATADIR%%/compact-canon.xml
-%%DATADIR%%/compact-casio.xml
-%%DATADIR%%/compact-fujifilm.xml
-%%DATADIR%%/compact-gopro.xml
-%%DATADIR%%/compact-kodak.xml
-%%DATADIR%%/compact-konica-minolta.xml
-%%DATADIR%%/compact-leica.xml
-%%DATADIR%%/compact-nikon.xml
-%%DATADIR%%/compact-olympus.xml
-%%DATADIR%%/compact-panasonic.xml
-%%DATADIR%%/compact-pentax.xml
-%%DATADIR%%/compact-ricoh.xml
-%%DATADIR%%/compact-samsung.xml
-%%DATADIR%%/compact-sigma.xml
-%%DATADIR%%/compact-sony.xml
-%%DATADIR%%/generic.xml
-%%DATADIR%%/mil-canon.xml
-%%DATADIR%%/mil-fujifilm.xml
-%%DATADIR%%/mil-nikon.xml
-%%DATADIR%%/mil-olympus.xml
-%%DATADIR%%/mil-panasonic.xml
-%%DATADIR%%/mil-pentax.xml
-%%DATADIR%%/mil-samsung.xml
-%%DATADIR%%/mil-samyang.xml
-%%DATADIR%%/mil-sigma.xml
-%%DATADIR%%/mil-sony.xml
-%%DATADIR%%/mil-zeiss.xml
-%%DATADIR%%/misc.xml
-%%DATADIR%%/rf-leica.xml
-%%DATADIR%%/slr-canon.xml
-%%DATADIR%%/slr-contax.xml
-%%DATADIR%%/slr-hasselblad.xml
-%%DATADIR%%/slr-konica-minolta.xml
-%%DATADIR%%/slr-leica.xml
-%%DATADIR%%/slr-nikon.xml
-%%DATADIR%%/slr-olympus.xml
-%%DATADIR%%/slr-panasonic.xml
-%%DATADIR%%/slr-pentax.xml
-%%DATADIR%%/slr-ricoh.xml
-%%DATADIR%%/slr-samsung.xml
-%%DATADIR%%/slr-samyang.xml
-%%DATADIR%%/slr-schneider.xml
-%%DATADIR%%/slr-sigma.xml
-%%DATADIR%%/slr-soligor.xml
-%%DATADIR%%/slr-sony.xml
-%%DATADIR%%/slr-tamron.xml
-%%DATADIR%%/slr-tokina.xml
-%%DATADIR%%/slr-ussr.xml
-%%DATADIR%%/slr-vivitar.xml
-%%DATADIR%%/slr-zeiss.xml
-%%DATADIR%%/timestamp.txt
+%%DATADIR%%/version_1/6x6.xml
+%%DATADIR%%/version_1/actioncams.xml
+%%DATADIR%%/version_1/compact-canon.xml
+%%DATADIR%%/version_1/compact-casio.xml
+%%DATADIR%%/version_1/compact-fujifilm.xml
+%%DATADIR%%/version_1/compact-kodak.xml
+%%DATADIR%%/version_1/compact-konica-minolta.xml
+%%DATADIR%%/version_1/compact-leica.xml
+%%DATADIR%%/version_1/compact-nikon.xml
+%%DATADIR%%/version_1/compact-olympus.xml
+%%DATADIR%%/version_1/compact-panasonic.xml
+%%DATADIR%%/version_1/compact-pentax.xml
+%%DATADIR%%/version_1/compact-ricoh.xml
+%%DATADIR%%/version_1/compact-samsung.xml
+%%DATADIR%%/version_1/compact-sigma.xml
+%%DATADIR%%/version_1/compact-sony.xml
+%%DATADIR%%/version_1/contax.xml
+%%DATADIR%%/version_1/generic.xml
+%%DATADIR%%/version_1/mil-canon.xml
+%%DATADIR%%/version_1/mil-fujifilm.xml
+%%DATADIR%%/version_1/mil-nikon.xml
+%%DATADIR%%/version_1/mil-olympus.xml
+%%DATADIR%%/version_1/mil-panasonic.xml
+%%DATADIR%%/version_1/mil-pentax.xml
+%%DATADIR%%/version_1/mil-samsung.xml
+%%DATADIR%%/version_1/mil-samyang.xml
+%%DATADIR%%/version_1/mil-sigma.xml
+%%DATADIR%%/version_1/mil-sony.xml
+%%DATADIR%%/version_1/mil-tamron.xml
+%%DATADIR%%/version_1/mil-zeiss.xml
+%%DATADIR%%/version_1/misc.xml
+%%DATADIR%%/version_1/rf-leica.xml
+%%DATADIR%%/version_1/slr-canon.xml
+%%DATADIR%%/version_1/slr-hasselblad.xml
+%%DATADIR%%/version_1/slr-konica-minolta.xml
+%%DATADIR%%/version_1/slr-leica.xml
+%%DATADIR%%/version_1/slr-nikon.xml
+%%DATADIR%%/version_1/slr-olympus.xml
+%%DATADIR%%/version_1/slr-panasonic.xml
+%%DATADIR%%/version_1/slr-pentax.xml
+%%DATADIR%%/version_1/slr-ricoh.xml
+%%DATADIR%%/version_1/slr-samsung.xml
+%%DATADIR%%/version_1/slr-samyang.xml
+%%DATADIR%%/version_1/slr-schneider.xml
+%%DATADIR%%/version_1/slr-sigma.xml
+%%DATADIR%%/version_1/slr-soligor.xml
+%%DATADIR%%/version_1/slr-sony.xml
+%%DATADIR%%/version_1/slr-tamron.xml
+%%DATADIR%%/version_1/slr-tokina.xml
+%%DATADIR%%/version_1/slr-ussr.xml
+%%DATADIR%%/version_1/slr-vivitar.xml
+%%DATADIR%%/version_1/slr-zeiss.xml
+%%DATADIR%%/version_1/timestamp.txt