Hi
attached is a diff to bring digikam from 4.2.0 to 4.8.0.
I dropped quite a few patches of graphics/digikam-kde4, as they seem to have
made their way upstream.
I added the patch from the open pr 178063 [1] (I was not able to edit a file
without it).
I also added explicit _ON and _OFF to options that were not there, and threw
baloo at the pimlibs dependency.
Please let me know, if there is something to improve.
mfg Tobias
[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=178063
Index: PORTS/astro/libkgeomap/Makefile
===================================================================
--- PORTS/astro/libkgeomap/Makefile (Revision 10610)
+++ PORTS/astro/libkgeomap/Makefile (Arbeitskopie)
@@ -17,6 +17,6 @@
post-patch:
${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
- ${WRKSRC}/CMakeLists.txt
+ ${WRKSRC}/${PORTNAME}/CMakeLists.txt
.include <bsd.port.mk>
Index: PORTS/astro/libkgeomap/pkg-plist
===================================================================
--- PORTS/astro/libkgeomap/pkg-plist (Revision 10610)
+++ PORTS/astro/libkgeomap/pkg-plist (Arbeitskopie)
@@ -13,8 +13,8 @@
include/libkgeomap/tracks.h
include/libkgeomap/version.h
lib/libkgeomap.so
-lib/libkgeomap.so.1
-lib/libkgeomap.so.1.0.0
+lib/libkgeomap.so.2
+lib/libkgeomap.so.2.1.0
libdata/pkgconfig/libkgeomap.pc
share/apps/cmake/modules/FindKGeoMap.cmake
share/apps/libkgeomap/backend-googlemaps-js.js
Index: PORTS/graphics/digikam-kde4/Makefile
===================================================================
--- PORTS/graphics/digikam-kde4/Makefile (Revision 10610)
+++ PORTS/graphics/digikam-kde4/Makefile (Arbeitskopie)
@@ -30,7 +30,7 @@
CMAKE_ARGS+= -DWITH_Sqlite2:BOOL=OFF
WRKSRC= ${WRKDIR}/${DISTNAME}/core
-SHEBANG_FILES= utilities/scripts/digitaglinktree/digitaglinktree
+SHEBANG_FILES= data/scripts/digitaglinktree/digitaglinktree
OPTIONS_DEFINE= DOCS NLS GPHOTO2 PIMLIBS MYSQL
OPTIONS_DEFAULT= GPHOTO2 PIMLIBS
@@ -43,10 +43,11 @@
GPHOTO2_DESC= Gphoto2 camera support
GPHOTO2_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_CMAKE_ON= -DWITH_Gphoto2:BOOL=ON
GPHOTO2_CMAKE_OFF= -DWITH_Gphoto2:BOOL=OFF
PIMLIBS_DESC= Address book support
-PIMLIBS_USE= KDE4=pimlibs
+PIMLIBS_USE= KDE4=pimlibs baloo
PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
@@ -53,7 +54,10 @@
MYSQL_USE= MYSQL=server QT4=sql-mysql_run
MYSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
- -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
-MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF
+ -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin \
+ -DENABLE_INTERNALMYSQL:BOOL=ON \
+ -DENABLE_MYSQLSUPPORT:BOOL=ON
+MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF \
+ -DENABLE_MYSQLSUPPORT:BOOL=OFF
.include <bsd.port.mk>
Index: PORTS/graphics/digikam-kde4/Makefile.common
===================================================================
--- PORTS/graphics/digikam-kde4/Makefile.common (Revision 10610)
+++ PORTS/graphics/digikam-kde4/Makefile.common (Arbeitskopie)
@@ -12,7 +12,7 @@
# net/libkvkontakte
# net/libmediawiki
-DIGIKAM_VER= 4.2.0
+DIGIKAM_VER= 4.8.0
MASTER_SITES= KDE/stable/digikam
KIPI_PLUGINS_ALL= acquireimages \
Index: PORTS/graphics/digikam-kde4/distinfo
===================================================================
--- PORTS/graphics/digikam-kde4/distinfo (Revision 10610)
+++ PORTS/graphics/digikam-kde4/distinfo (Arbeitskopie)
@@ -1,2 +1,2 @@
-SHA256 (digikam-4.2.0.tar.bz2) = e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08
-SIZE (digikam-4.2.0.tar.bz2) = 68849613
+SHA256 (digikam-4.8.0.tar.bz2) = e20f84508f35fddcaec3b931efbc604a95050ec08c6796b6bc60a61cd58fa390
+SIZE (digikam-4.8.0.tar.bz2) = 70258947
Index: PORTS/graphics/digikam-kde4/files/patch-CMakeLists.txt
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-CMakeLists.txt (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-CMakeLists.txt (Arbeitskopie)
@@ -1,27 +0,0 @@
---- ./CMakeLists.txt.orig 2012-06-04 16:38:57.000000000 -0400
-+++ ./CMakeLists.txt 2012-06-24 12:52:32.000000000 -0400
-@@ -203,9 +203,10 @@
- FIND_LIBRARY(MATH_LIBRARY m)
- ENDIF(NOT WIN32)
-
--IF(Boost_FOUND)
-- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
--ENDIF(Boost_FOUND)
-+STRING(TOLOWER ${CMAKE_SYSTEM_NAME} node_platform)
-+IF(${node_platform} MATCHES freebsd)
-+ FIND_LIBRARY(KVM_LIBRARY NAMES kvm)
-+ENDIF(${node_platform} MATCHES freebsd)
-
- #-------------------------------------------------------------------------------------
-
-@@ -595,6 +596,10 @@
- ${CMAKE_CURRENT_BINARY_DIR}/digikam
- )
-
-+ IF(Boost_FOUND)
-+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-+ ENDIF(Boost_FOUND)
-+
- IF(USE_SCRIPT_IFACE)
- INCLUDE_DIRECTORIES(${QT_QTSCRIPT_INCLUDE_DIR})
- ENDIF(USE_SCRIPT_IFACE)
Index: PORTS/graphics/digikam-kde4/files/patch-app_album_albumwatch.cpp
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-app_album_albumwatch.cpp (Revision 0)
+++ PORTS/graphics/digikam-kde4/files/patch-app_album_albumwatch.cpp (Arbeitskopie)
@@ -0,0 +1,11 @@
+--- app/album/albumwatch.cpp.orig 2015-02-26 07:53:00 UTC
++++ app/album/albumwatch.cpp
+@@ -278,7 +278,7 @@ void AlbumWatch::slotAlbumAdded(Album* a
+ // Disable file watch for OS X and Windows and hope for future
+ // improvement (possibly with the improvements planned for
+ // QFileSystemWatcher in Qt 5.1)
+-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
++#if defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_FREEBSD)
+ d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
+ #else
+ d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly);
Index: PORTS/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake (Arbeitskopie)
@@ -1,46 +0,0 @@
---- ./cmake/modules/FindPGF.cmake.orig 2013-10-01 06:23:25.000000000 +0000
-+++ ./cmake/modules/FindPGF.cmake 2014-01-20 22:29:10.782525688 +0000
-@@ -4,24 +4,28 @@
- # PGF_FOUND - system has libgf
- # PGF_INCLUDE_DIRS - the libpgf include directory
- # PGF_LIBRARIES - Link these to use libpgf
--# PGF_CODEC_VERSION_ID - PGF codec version ID.
-
--FIND_PACKAGE(PkgConfig)
-+find_package(PkgConfig)
-
--IF(PKG_CONFIG_FOUND)
-+if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(PC_PGF QUIET libpgf)
-+endif(PKG_CONFIG_FOUND)
-
-- PKG_CHECK_MODULES(PGF libpgf)
-+find_path(PGF_INCLUDE_DIRS NAMES PGFimage.h
-+ PATHS
-+ ${PC_PGF_INCLUDEDIR}
-+ ${PC_PGF_INCLUDE_DIRS}
-+)
-
-- IF(PGF_FOUND)
-- MESSAGE(STATUS "PGF_INCLUDE_DIRS = ${PGF_INCLUDE_DIRS}")
-- MESSAGE(STATUS "PGF_INCLUDEDIR = ${PGF_INCLUDEDIR}")
-- MESSAGE(STATUS "PGF_LIBRARIES = ${PGF_LIBRARIES}")
-- MESSAGE(STATUS "PGF_LDFLAGS = ${PGF_LDFLAGS}")
-- MESSAGE(STATUS "PGF_CFLAGS = ${PGF_CFLAGS}")
-- MESSAGE(STATUS "PGF_VERSION = ${PGF_VERSION}")
-+find_library(PGF_LIBRARIES NAMES pgf
-+ PATHS
-+ ${PC_PGF_LIBDIR}
-+ ${PC_PGF_LIBRARY_DIRS}
-+)
-
-- STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
-- MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
-- ENDIF(PGF_FOUND)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(pgf
-+ REQUIRED_VARS PGF_LIBRARIES PGF_INCLUDE_DIRS
-+)
-
--ENDIF(PKG_CONFIG_FOUND)
-+mark_as_advanced(PGF_INCLUDE_DIRS PGF_LIBRARIES)
Index: PORTS/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake (Arbeitskopie)
@@ -1,11 +0,0 @@
---- cmake/modules/MacroUtils.cmake.orig 2014-09-18 04:17:31 UTC
-+++ cmake/modules/MacroUtils.cmake
-@@ -112,7 +112,7 @@
-
- ENDIF()
-
--ENDMACRO(PRINT_PLUGIN_COMPILE_STATUS)
-+ENDMACRO(PRINT_COMPONENT_COMPILE_STATUS)
-
- # -------------------------------------------------------------------------
-
Index: PORTS/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt (Arbeitskopie)
@@ -1,13 +0,0 @@
---- ./digikam/CMakeLists.txt.orig 2012-01-02 19:32:42.000000000 -0500
-+++ ./digikam/CMakeLists.txt 2012-05-14 20:28:25.000000000 -0400
-@@ -118,6 +118,10 @@
- TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES})
- ENDIF(Q_WS_X11)
-
-+IF(${node_platform} MATCHES freebsd)
-+ TARGET_LINK_LIBRARIES(digikamcore ${KVM_LIBRARY})
-+ENDIF(${node_platform} MATCHES freebsd)
-+
- # For Contents Aware Resizer and Lens auto-correction tools.
- IF(GLIB2_FOUND)
- TARGET_LINK_LIBRARIES(digikamcore ${GLIB2_LIBRARIES} ${liblqr_LIBS} ${liblensfun_LIBS})
Index: PORTS/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp (Arbeitskopie)
@@ -1,11 +0,0 @@
---- ./digikam/album/albumwatch.cpp.orig 2013-04-04 16:03:45.920385000 +0000
-+++ ./digikam/album/albumwatch.cpp 2013-04-04 16:04:05.410385977 +0000
-@@ -278,7 +278,7 @@
- // Disable file watch for OS X and Windows and hope for future
- // improvement (possibly with the improvements planned for
- // QFileSystemWatcher in Qt 5.1)
--#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
-+#if defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_FREEBSD)
- d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
- #else
- d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly);
Index: PORTS/graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h (Arbeitskopie)
@@ -1,6 +1,6 @@
---- libs/3rdparty/cimg/CImg.h.orig 2010-01-31 15:22:15.000000000 +0200
-+++ libs/3rdparty/cimg/CImg.h 2010-03-29 10:42:42.741492686 +0300
-@@ -29449,7 +29449,7 @@
+--- libs/3rdparty/cimg/CImg.h.orig 2015-02-26 07:57:56 UTC
++++ libs/3rdparty/cimg/CImg.h
+@@ -29453,7 +29453,7 @@ namespace cimg_library {
new_bit_depth = 8;
}
if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
Index: PORTS/graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp (Revision 0)
+++ PORTS/graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp (Arbeitskopie)
@@ -0,0 +1,24 @@
+--- libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig 2015-02-26 18:08:01 UTC
++++ libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
+@@ -118,7 +118,7 @@ kvm_t* sg_get_kvm()
+ return kvmd;
+ }
+
+- kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
++ kvmd = kvm_openfiles(NULL, "/dev/null", NULL, O_RDONLY, NULL);
+
+ if (kvmd == NULL)
+ {
+@@ -220,9 +220,9 @@ int get_mem_stats(Digikam::KMemoryInfo::
+ int mib[2];
+ u_long physmem;
+ size_t size;
+- u_long free_count;
+- u_long cache_count;
+- u_long inactive_count;
++ u_int free_count;
++ u_int cache_count;
++ u_int inactive_count;
+ int pagesize;
+ #endif // defined(Q_OS_FREEBSD) || defined(Q_OS_DFBSD)
+
Index: PORTS/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp (Arbeitskopie)
@@ -1,12 +0,0 @@
---- ./libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig 2012-01-02 19:32:23.000000000 -0500
-+++ ./libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp 2012-05-14 20:28:25.000000000 -0400
-@@ -53,6 +53,9 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #include <unistd.h>
-+#include <paths.h>
-+#include <fcntl.h>
-+#include <kvm.h>
- #endif
- #if defined(Q_OS_NETBSD)
- #include <sys/param.h>
Index: PORTS/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp
===================================================================
--- PORTS/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp (Revision 10610)
+++ PORTS/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp (Arbeitskopie)
@@ -1,20 +0,0 @@
---- utilities/fuzzysearch/fuzzysearchview.cpp.orig 2010-03-29 01:20:16.000000000 +0300
-+++ utilities/fuzzysearch/fuzzysearchview.cpp 2010-03-30 10:02:03.000000000 +0300
-@@ -26,7 +26,7 @@
-
- // Qt includes
-
--#include <qevent.h>
-+#include <QEvent>
- #include <QFrame>
- #include <QImage>
- #include <QLabel>
-@@ -36,6 +36,8 @@
- #include <QTime>
- #include <QTimer>
- #include <QToolButton>
-+#include <QDragEnterEvent>
-+#include <QDropEvent>
-
- // KDE includes
-
Index: PORTS/graphics/digikam-kde4/pkg-plist
===================================================================
--- PORTS/graphics/digikam-kde4/pkg-plist (Revision 10610)
+++ PORTS/graphics/digikam-kde4/pkg-plist (Arbeitskopie)
@@ -19,6 +19,13 @@
lib/libdigikamdatabase.so.%%SHLIB_VER%%
man/man1/cleanup_digikamdb.1.gz
man/man1/digitaglinktree.1.gz
+share/appdata/digiKam-ImagePlugin_Color.metainfo.xml
+share/appdata/digiKam-ImagePlugin_Decorate.metainfo.xml
+share/appdata/digiKam-ImagePlugin_Enhance.metainfo.xml
+share/appdata/digiKam-ImagePlugin_FxFilters.metainfo.xml
+share/appdata/digiKam-ImagePlugin_Transform.metainfo.xml
+share/appdata/digikam.appdata.xml
+share/appdata/showfoto.appdata.xml
share/applications/kde4/digikam.desktop
share/applications/kde4/showfoto.desktop
share/apps/digikam/about/digikam.css
Index: PORTS/graphics/digikam-kde4-l10n/pkg-plist
===================================================================
--- PORTS/graphics/digikam-kde4-l10n/pkg-plist (Revision 10610)
+++ PORTS/graphics/digikam-kde4-l10n/pkg-plist (Arbeitskopie)
@@ -2,6 +2,7 @@
share/locale/ar/LC_MESSAGES/kipiplugin_jpeglossless.mo
share/locale/ar/LC_MESSAGES/kipiplugin_timeadjust.mo
share/locale/ar/LC_MESSAGES/kipiplugins.mo
+share/locale/ar/LC_MESSAGES/libkgeomap.mo
share/locale/be/LC_MESSAGES/digikam.mo
share/locale/be/LC_MESSAGES/kipiplugin_acquireimages.mo
share/locale/be/LC_MESSAGES/kipiplugin_advancedslideshow.mo
@@ -336,7 +337,6 @@
share/locale/fi/LC_MESSAGES/kipiplugin_batchprocessimages.mo
share/locale/fi/LC_MESSAGES/kipiplugin_calendar.mo
share/locale/fi/LC_MESSAGES/kipiplugin_dngconverter.mo
-share/locale/fi/LC_MESSAGES/kipiplugin_expoblending.mo
share/locale/fi/LC_MESSAGES/kipiplugin_facebook.mo
share/locale/fi/LC_MESSAGES/kipiplugin_flashexport.mo
share/locale/fi/LC_MESSAGES/kipiplugin_flickrexport.mo
@@ -352,11 +352,7 @@
share/locale/fi/LC_MESSAGES/kipiplugin_piwigoexport.mo
share/locale/fi/LC_MESSAGES/kipiplugin_printimages.mo
share/locale/fi/LC_MESSAGES/kipiplugin_rawconverter.mo
-share/locale/fi/LC_MESSAGES/kipiplugin_removeredeyes.mo
share/locale/fi/LC_MESSAGES/kipiplugin_sendimages.mo
-share/locale/fi/LC_MESSAGES/kipiplugin_shwup.mo
-share/locale/fi/LC_MESSAGES/kipiplugin_smug.mo
-share/locale/fi/LC_MESSAGES/kipiplugin_timeadjust.mo
share/locale/fi/LC_MESSAGES/kipiplugins.mo
share/locale/fi/LC_MESSAGES/libkgeomap.mo
share/locale/fr/LC_MESSAGES/digikam.mo
Index: PORTS/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
===================================================================
--- PORTS/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt (Revision 10610)
+++ PORTS/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt (Arbeitskopie)
@@ -1,15 +1,19 @@
---- ./CMakeLists.txt.orig 2013-03-11 08:24:11.000000000 +0000
-+++ ./CMakeLists.txt 2013-04-05 19:33:30.200669787 +0000
-@@ -410,7 +410,6 @@
+--- ./CMakeLists.txt.orig 2015-02-25 22:15:14.659030000 +0100
++++ ./CMakeLists.txt 2015-02-25 22:17:07.071209000 +0100
+@@ -356,7 +356,6 @@
- # Plugins which will be always compiled
+ # Plugins which will be always compiled
-- ADD_SUBDIRECTORY(common)
- ADD_SUBDIRECTORY(timeadjust)
- ADD_SUBDIRECTORY(jpeglossless)
- ADD_SUBDIRECTORY(rawconverter)
-@@ -515,3 +514,4 @@
- ENDIF(NOT WIN32)
+- add_subdirectory(common)
+ add_subdirectory(timeadjust)
+ add_subdirectory(jpeglossless)
+ add_subdirectory(rawconverter)
+@@ -468,7 +467,7 @@
+ endif()
- ENDIF(KIPIPLUGINS_CAN_BE_COMPILED)
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h)
+ endif()
+-
++ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h)
+ else()
+
+ message(STATUS "")
Index: PORTS/graphics/libkface/Makefile
===================================================================
--- PORTS/graphics/libkface/Makefile (Revision 10610)
+++ PORTS/graphics/libkface/Makefile (Arbeitskopie)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/graphics/libkface/Makefile 378020 2015-01-27 21:04:30Z makc $
PORTNAME= libkface
PORTVERSION= ${DIGIKAM_VER}
@@ -15,6 +15,6 @@
post-patch:
${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
- ${WRKSRC}/CMakeLists.txt
+ ${WRKSRC}/${PORTNAME}/CMakeLists.txt
.include <bsd.port.mk>
Index: PORTS/graphics/libkface/pkg-plist
===================================================================
--- PORTS/graphics/libkface/pkg-plist (Revision 10610)
+++ PORTS/graphics/libkface/pkg-plist (Arbeitskopie)
@@ -4,11 +4,14 @@
include/libkface/libkface_export.h
include/libkface/recognitiondatabase.h
include/libkface/version.h
+lib/cmake/Kface-3.5.0/Kface-export-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Kface-3.5.0/Kface-export.cmake
+lib/cmake/Kface-3.5.0/kface-config-version.cmake
+lib/cmake/Kface-3.5.0/kface-config.cmake
lib/libkface.so
-lib/libkface.so.2
-lib/libkface.so.2.0.0
+lib/libkface.so.3
+lib/libkface.so.3.0.0
libdata/pkgconfig/libkface.pc
-share/apps/cmake/modules/FindKface.cmake
share/apps/libkface/alignment-congealing/face-funnel.data
share/apps/libkface/database/dbconfig.xml
share/apps/libkface/haarcascades/haarcascade_frontalface_alt.xml
Index: PORTS/net/libmediawiki/Makefile
===================================================================
--- PORTS/net/libmediawiki/Makefile (Revision 10610)
+++ PORTS/net/libmediawiki/Makefile (Arbeitskopie)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/net/libmediawiki/Makefile 378020 2015-01-27 21:04:30Z makc $
PORTNAME= libmediawiki
PORTVERSION= ${DIGIKAM_VER}
@@ -13,6 +13,6 @@
post-patch:
${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
- ${WRKSRC}/CMakeLists.txt
+ ${WRKSRC}/${PORTNAME}/CMakeLists.txt
.include <bsd.port.mk>
_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
