5 files changed, 67 insertions, 116 deletions

diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 2ef56d7ac9f6..4d112606bc5e 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lensfun
-PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTVERSION=	0.3.95
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -19,7 +18,8 @@ LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/docs/cc-by-sa-3.0.txt
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake gettext-runtime gnome pathfix pkgconfig shebangfix
-SHEBANG_FILES=	apps/lensfun-update-data apps/lensfun-add-adapter
+SHEBANG_FILES=	apps/lensfun-add-adapter apps/lensfun-convert-lcp \
+		apps/lensfun-update-data
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DBUILD_AUXFUN:BOOL=ON
@@ -37,8 +37,4 @@ PYHELPERS_CMAKE_ON=	-DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD}
 PYHELPERS_CMAKE_OFF=	-DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE
 PYHELPERS_USES=		python:3.4+
 
-post-patch:
-# Fix the build against Clang 6.0.0
-	@${REINPLACE_CMD} -e '/%%/s,R_BX, & ,' ${WRKSRC}/libs/lensfun/cpuid.cpp
-
 .include <bsd.port.mk>
diff --git a/graphics/lensfun/distinfo b/graphics/lensfun/distinfo
index 8ad1df085e5b..49ef635fc4fa 100644
--- a/graphics/lensfun/distinfo
+++ b/graphics/lensfun/distinfo
@@ -1,2 +1,3 @@
-SHA256 (lensfun-0.3.2.tar.gz) = ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331
-SIZE (lensfun-0.3.2.tar.gz) = 784825
+TIMESTAMP = 1530269580
+SHA256 (lensfun-0.3.95.tar.gz) = 82c29c833c1604c48ca3ab8a35e86b7189b8effac1b1476095c0529afb702808
+SIZE (lensfun-0.3.95.tar.gz) = 2731561
diff --git a/graphics/lensfun/files/patch-CMakeLists.txt b/graphics/lensfun/files/patch-CMakeLists.txt
deleted file mode 100644
index 1dd650d04fc9..000000000000
--- a/graphics/lensfun/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
---- CMakeLists.txt.orig	2015-11-15 17:07:26 UTC
-+++ CMakeLists.txt
-@@ -31,12 +31,18 @@ IF(NOT HAVE_REGEX_H)
-   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex)
- ENDIF()
- 
-+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[XxIi][0-9]?86|[Aa][Mm][Dd]64")
-+  SET(X86_ON ON)
-+else()
-+  SET(X86_ON OFF)
-+ENDIF()
-+
- # options controlling the build process
- OPTION(BUILD_STATIC "Build static library" 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})
-+OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ${X86_ON})
- OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
- OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
- 
-@@ -62,14 +68,14 @@ ENDIF()
- 
- IF(BUILD_FOR_SSE)
-   SET(VECTORIZATION_SSE 1)
--  IF(CMAKE_COMPILER_IS_GNUCXX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+    SET(VECTORIZATION_SSE_FLAGS "-msse")
-   ENDIF()
- ENDIF()
- IF(BUILD_FOR_SSE2)
-   SET(VECTORIZATION_SSE2 1)
--  IF(CMAKE_COMPILER_IS_GNUCXX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
-+  IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+    SET(VECTORIZATION_SSE2_FLAGS "-msse2")
-   ENDIF()
- ENDIF()
- 
-@@ -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_STATIC)
diff --git a/graphics/lensfun/pkg-descr b/graphics/lensfun/pkg-descr
index 435c44c4c363..cf26677ec0ab 100644
--- a/graphics/lensfun/pkg-descr
+++ b/graphics/lensfun/pkg-descr
@@ -15,4 +15,4 @@ transversal (also known as lateral) chromatic aberrations, vignetting, and
 colour contribution of the lens (e.g. when sometimes people says one lens
 gives "yellowish" images and another, say, "bluish").
 
-WWW: http://lensfun.sourceforge.net/
+WWW: https://lensfun.github.io/
diff --git a/graphics/lensfun/pkg-plist b/graphics/lensfun/pkg-plist
index c68b645613db..eed26801d239 100644
--- a/graphics/lensfun/pkg-plist
+++ b/graphics/lensfun/pkg-plist
@@ -1,64 +1,68 @@
 %%PYHELPERS%%bin/g-lensfun-update-data
 %%PYHELPERS%%bin/lensfun-add-adapter
+%%PYHELPERS%%bin/lensfun-convert-lcp
 %%PYHELPERS%%bin/lensfun-update-data
 include/lensfun/lensfun.h
 lib/liblensfun.so
-lib/liblensfun.so.1
-lib/liblensfun.so.0.3.2
+lib/liblensfun.so.2
+lib/liblensfun.so.0.3.95
 libdata/pkgconfig/lensfun.pc
-%%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
-%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.2-py%%PYTHON_VER%%.egg-info
+%%DATADIR%%/version_2/6x6.xml
+%%DATADIR%%/version_2/actioncams.xml
+%%DATADIR%%/version_2/compact-canon.xml
+%%DATADIR%%/version_2/compact-casio.xml
+%%DATADIR%%/version_2/compact-fujifilm.xml
+%%DATADIR%%/version_2/compact-kodak.xml
+%%DATADIR%%/version_2/compact-konica-minolta.xml
+%%DATADIR%%/version_2/compact-leica.xml
+%%DATADIR%%/version_2/compact-nikon.xml
+%%DATADIR%%/version_2/compact-olympus.xml
+%%DATADIR%%/version_2/compact-panasonic.xml
+%%DATADIR%%/version_2/compact-pentax.xml
+%%DATADIR%%/version_2/compact-ricoh.xml
+%%DATADIR%%/version_2/compact-samsung.xml
+%%DATADIR%%/version_2/compact-sigma.xml
+%%DATADIR%%/version_2/compact-sony.xml
+%%DATADIR%%/version_2/contax.xml
+%%DATADIR%%/version_2/generic.xml
+%%DATADIR%%/version_2/lensfun-database.dtd
+%%DATADIR%%/version_2/lensfun-database.xsd
+%%DATADIR%%/version_2/mil-canon.xml
+%%DATADIR%%/version_2/mil-fujifilm.xml
+%%DATADIR%%/version_2/mil-nikon.xml
+%%DATADIR%%/version_2/mil-olympus.xml
+%%DATADIR%%/version_2/mil-panasonic.xml
+%%DATADIR%%/version_2/mil-pentax.xml
+%%DATADIR%%/version_2/mil-samsung.xml
+%%DATADIR%%/version_2/mil-samyang.xml
+%%DATADIR%%/version_2/mil-sigma.xml
+%%DATADIR%%/version_2/mil-sony.xml
+%%DATADIR%%/version_2/mil-tamron.xml
+%%DATADIR%%/version_2/mil-tokina.xml
+%%DATADIR%%/version_2/mil-zeiss.xml
+%%DATADIR%%/version_2/misc.xml
+%%DATADIR%%/version_2/rf-leica.xml
+%%DATADIR%%/version_2/slr-canon.xml
+%%DATADIR%%/version_2/slr-hasselblad.xml
+%%DATADIR%%/version_2/slr-konica-minolta.xml
+%%DATADIR%%/version_2/slr-leica.xml
+%%DATADIR%%/version_2/slr-nikon.xml
+%%DATADIR%%/version_2/slr-olympus.xml
+%%DATADIR%%/version_2/slr-panasonic.xml
+%%DATADIR%%/version_2/slr-pentax.xml
+%%DATADIR%%/version_2/slr-ricoh.xml
+%%DATADIR%%/version_2/slr-samsung.xml
+%%DATADIR%%/version_2/slr-samyang.xml
+%%DATADIR%%/version_2/slr-schneider.xml
+%%DATADIR%%/version_2/slr-sigma.xml
+%%DATADIR%%/version_2/slr-soligor.xml
+%%DATADIR%%/version_2/slr-sony.xml
+%%DATADIR%%/version_2/slr-tamron.xml
+%%DATADIR%%/version_2/slr-tokina.xml
+%%DATADIR%%/version_2/slr-ussr.xml
+%%DATADIR%%/version_2/slr-vivitar.xml
+%%DATADIR%%/version_2/slr-zeiss.xml
+%%DATADIR%%/version_2/timestamp.txt
+%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun-0.3.95-py%%PYTHON_VER%%.egg-info
 %%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__init__.py
 %%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc