From bc0a22e485380746630b6de1aed978469ad64048 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 15 Jan 2017 13:36:16 +0000 Subject: [PATCH] Install lensfun-update-database and l.-add-adapter. This is masked by a default-enabled PYHELPERS option. While here, add gettext-runtime to USES to appease stage-qa. Approved by: danfe@ Differential Revision: D8993 --- graphics/lensfun/Makefile | 17 +++++++++++++---- .../lensfun/files/patch-apps_CMakeLists.txt | 9 +++++++++ graphics/lensfun/pkg-plist | 6 ++++++ 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 graphics/lensfun/files/patch-apps_CMakeLists.txt diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index fc167bb10deb..977ee6949718 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -3,6 +3,7 @@ PORTNAME= lensfun PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -13,14 +14,22 @@ LICENSE= LGPL3 LIB_DEPENDS= libpng.so:graphics/png -USES= cmake pathfix pkgconfig +USES= cmake gettext-runtime pathfix pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON -DINSTALL_HELPER_SCRIPTS:BOOL=OFF +CMAKE_ARGS= -DBUILD_AUXFUN:BOOL=ON +MAKE_ENV+= PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= +PLIST_SUB+= PYTHON_SUFFIX=${PYTHON_SUFFIX} -OPTIONS_DEFINE= SIMD -OPTIONS_DEFAULT= SIMD +OPTIONS_DEFINE= SIMD PYHELPERS +OPTIONS_DEFAULT= SIMD PYHELPERS +OPTIONS_SUB= yes +PYHELPERS_DESC= Install database helper scripts (need Python 3) SIMD_CMAKE_OFF= -DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF +PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} +PYHELPERS_CMAKE_OFF= -DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE +PYHELPERS_USES= python:3 + .include diff --git a/graphics/lensfun/files/patch-apps_CMakeLists.txt b/graphics/lensfun/files/patch-apps_CMakeLists.txt new file mode 100644 index 000000000000..98ff37ce7a4d --- /dev/null +++ b/graphics/lensfun/files/patch-apps_CMakeLists.txt @@ -0,0 +1,9 @@ +--- apps/CMakeLists.txt.orig 2016-12-30 11:49:15 UTC ++++ apps/CMakeLists.txt +@@ -42,5 +42,5 @@ IF(PYTHON) + IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX) + SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + ENDIF() +- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})") ++ INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX} --root=${STAGEDIR})") + ENDIF(PYTHON) diff --git a/graphics/lensfun/pkg-plist b/graphics/lensfun/pkg-plist index 0edc4315906c..c68b645613db 100644 --- a/graphics/lensfun/pkg-plist +++ b/graphics/lensfun/pkg-plist @@ -1,3 +1,6 @@ +%%PYHELPERS%%bin/g-lensfun-update-data +%%PYHELPERS%%bin/lensfun-add-adapter +%%PYHELPERS%%bin/lensfun-update-data include/lensfun/lensfun.h lib/liblensfun.so lib/liblensfun.so.1 @@ -56,3 +59,6 @@ libdata/pkgconfig/lensfun.pc %%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 +%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__init__.py +%%PYHELPERS%%%%PYTHON_SITELIBDIR%%/lensfun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc