aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/digikam-kde4-doc/Makefile2
-rw-r--r--graphics/digikam-kde4-l10n/Makefile2
-rw-r--r--graphics/digikam-kde4-l10n/pkg-plist17
-rw-r--r--graphics/digikam-kde4/Makefile63
-rw-r--r--graphics/digikam-kde4/Makefile.common10
-rw-r--r--graphics/digikam-kde4/distinfo4
-rw-r--r--graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake46
-rw-r--r--graphics/digikam-kde4/pkg-plist9
-rw-r--r--graphics/kipi-plugin-acquireimages/Makefile1
-rw-r--r--graphics/kipi-plugin-advancedslideshow/Makefile1
-rw-r--r--graphics/kipi-plugin-advancedslideshow/pkg-plist2
-rw-r--r--graphics/kipi-plugin-batchprocess/Makefile1
-rw-r--r--graphics/kipi-plugin-calendar/Makefile1
-rw-r--r--graphics/kipi-plugin-debianscreenshots/Makefile3
-rw-r--r--graphics/kipi-plugin-debianscreenshots/pkg-plist10
-rw-r--r--graphics/kipi-plugin-dngconverter/Makefile3
-rw-r--r--graphics/kipi-plugin-dngconverter/pkg-plist14
-rw-r--r--graphics/kipi-plugin-expoblending/Makefile1
-rw-r--r--graphics/kipi-plugin-expoblending/pkg-plist8
-rw-r--r--graphics/kipi-plugin-facebook/Makefile3
-rw-r--r--graphics/kipi-plugin-facebook/pkg-plist10
-rw-r--r--graphics/kipi-plugin-flashexport/Makefile1
-rw-r--r--graphics/kipi-plugin-flashexport/pkg-plist12
-rw-r--r--graphics/kipi-plugin-flickrexport/Makefile1
-rw-r--r--graphics/kipi-plugin-flickrexport/pkg-plist30
-rw-r--r--graphics/kipi-plugin-galleryexport/Makefile1
-rw-r--r--graphics/kipi-plugin-galleryexport/pkg-plist10
-rw-r--r--graphics/kipi-plugin-gpssync/Makefile3
-rw-r--r--graphics/kipi-plugin-gpssync/pkg-plist4
-rw-r--r--graphics/kipi-plugin-htmlexport/Makefile1
-rw-r--r--graphics/kipi-plugin-imageshackexport/Makefile1
-rw-r--r--graphics/kipi-plugin-imageshackexport/pkg-plist6
-rw-r--r--graphics/kipi-plugin-imageviewer/Makefile1
-rw-r--r--graphics/kipi-plugin-imageviewer/pkg-plist4
-rw-r--r--graphics/kipi-plugin-imgurexport/Makefile3
-rw-r--r--graphics/kipi-plugin-imgurexport/pkg-plist10
-rw-r--r--graphics/kipi-plugin-ipodexport/Makefile3
-rw-r--r--graphics/kipi-plugin-jalbumexport/Makefile12
-rw-r--r--graphics/kipi-plugin-jalbumexport/pkg-plist6
-rw-r--r--graphics/kipi-plugin-jpeglossless/Makefile1
-rw-r--r--graphics/kipi-plugin-kioexport/Makefile1
-rw-r--r--graphics/kipi-plugin-kmlexport/Makefile1
-rw-r--r--graphics/kipi-plugin-kopete/Makefile1
-rw-r--r--graphics/kipi-plugin-mediawiki/Makefile3
-rw-r--r--graphics/kipi-plugin-mediawiki/pkg-plist10
-rw-r--r--graphics/kipi-plugin-metadataedit/Makefile1
-rw-r--r--graphics/kipi-plugin-metadataedit/pkg-plist2
-rw-r--r--graphics/kipi-plugin-panorama/Makefile1
-rw-r--r--graphics/kipi-plugin-panorama/pkg-plist10
-rw-r--r--graphics/kipi-plugin-photolayoutseditor/Makefile1
-rw-r--r--graphics/kipi-plugin-photolayoutseditor/pkg-plist2
-rw-r--r--graphics/kipi-plugin-picasawebexport/Makefile1
-rw-r--r--graphics/kipi-plugin-picasawebexport/pkg-plist10
-rw-r--r--graphics/kipi-plugin-piwigoexport/Makefile1
-rw-r--r--graphics/kipi-plugin-piwigoexport/pkg-plist10
-rw-r--r--graphics/kipi-plugin-printimages/Makefile1
-rw-r--r--graphics/kipi-plugin-rajceexport/Makefile1
-rw-r--r--graphics/kipi-plugin-rajceexport/pkg-plist8
-rw-r--r--graphics/kipi-plugin-rawconverter/Makefile1
-rw-r--r--graphics/kipi-plugin-removeredeyes/Makefile2
-rw-r--r--graphics/kipi-plugin-sendimages/Makefile1
-rw-r--r--graphics/kipi-plugin-shwup/Makefile3
-rw-r--r--graphics/kipi-plugin-shwup/pkg-plist8
-rw-r--r--graphics/kipi-plugin-smug/Makefile1
-rw-r--r--graphics/kipi-plugin-smug/pkg-plist10
-rw-r--r--graphics/kipi-plugin-timeadjust/Makefile1
-rw-r--r--graphics/kipi-plugin-timeadjust/pkg-plist2
-rw-r--r--graphics/kipi-plugin-videoslideshow/Makefile5
-rw-r--r--graphics/kipi-plugin-vkontakte/Makefile3
-rw-r--r--graphics/kipi-plugin-yandexfotki/Makefile3
-rw-r--r--graphics/kipi-plugins-kde4/Makefile17
-rw-r--r--graphics/libkface/Makefile2
-rw-r--r--graphics/libkface/pkg-plist13
-rw-r--r--graphics/libkipiplugins/Makefile1
75 files changed, 231 insertions, 229 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index 3a06d8677f3d..514286c56dc4 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -440,6 +440,7 @@
SUBDIR += kipi-plugin-imageviewer
SUBDIR += kipi-plugin-imgurexport
SUBDIR += kipi-plugin-ipodexport
+ SUBDIR += kipi-plugin-jalbumexport
SUBDIR += kipi-plugin-jpeglossless
SUBDIR += kipi-plugin-kioexport
SUBDIR += kipi-plugin-kmlexport
diff --git a/graphics/digikam-kde4-doc/Makefile b/graphics/digikam-kde4-doc/Makefile
index 91a5f19d6b87..91ec9ca4f2d5 100644
--- a/graphics/digikam-kde4-doc/Makefile
+++ b/graphics/digikam-kde4-doc/Makefile
@@ -7,11 +7,9 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Documentation for digiKam, showFoto, and Kipi-plugins
-LATEST_LINK= digikam-kde4-doc
CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.*
WRKSRC= ${WRKDIR}/${DISTNAME}/doc
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/digikam-kde4-l10n/Makefile b/graphics/digikam-kde4-l10n/Makefile
index cb24e602e291..4486fb162fc8 100644
--- a/graphics/digikam-kde4-l10n/Makefile
+++ b/graphics/digikam-kde4-l10n/Makefile
@@ -7,13 +7,11 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= l10n for digiKam, showFoto, and Kipi-plugins
-LATEST_LINK= digikam-kde4-l10n
CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.* libkgeomap-2.*
USES= gettext:build
WRKSRC= ${WRKDIR}/${DISTNAME}/po
-NO_STAGE= yes
pre-configure:
# avoid conflicts with kde4-l10n ports:
${RM} ${WRKSRC}/*/libkipi.po
diff --git a/graphics/digikam-kde4-l10n/pkg-plist b/graphics/digikam-kde4-l10n/pkg-plist
index de30d7c311da..36f04116f6bc 100644
--- a/graphics/digikam-kde4-l10n/pkg-plist
+++ b/graphics/digikam-kde4-l10n/pkg-plist
@@ -491,12 +491,27 @@ share/locale/hu/LC_MESSAGES/kipiplugin_acquireimages.mo
share/locale/hu/LC_MESSAGES/kipiplugin_advancedslideshow.mo
share/locale/hu/LC_MESSAGES/kipiplugin_batchprocessimages.mo
share/locale/hu/LC_MESSAGES/kipiplugin_calendar.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_dngconverter.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_expoblending.mo
share/locale/hu/LC_MESSAGES/kipiplugin_facebook.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_flashexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_flickrexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_galleryexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_gpssync.mo
share/locale/hu/LC_MESSAGES/kipiplugin_htmlexport.mo
share/locale/hu/LC_MESSAGES/kipiplugin_imageviewer.mo
share/locale/hu/LC_MESSAGES/kipiplugin_ipodexport.mo
share/locale/hu/LC_MESSAGES/kipiplugin_jpeglossless.mo
share/locale/hu/LC_MESSAGES/kipiplugin_kioexportimport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_metadataedit.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_picasawebexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_piwigoexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_printimages.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_rawconverter.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_removeredeyes.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_sendimages.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_shwup.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_smug.mo
share/locale/hu/LC_MESSAGES/kipiplugin_timeadjust.mo
share/locale/hu/LC_MESSAGES/kipiplugins.mo
share/locale/hu/LC_MESSAGES/libkgeomap.mo
@@ -586,6 +601,7 @@ share/locale/ja/LC_MESSAGES/kipiplugin_smug.mo
share/locale/ja/LC_MESSAGES/kipiplugin_timeadjust.mo
share/locale/ja/LC_MESSAGES/kipiplugins.mo
share/locale/ja/LC_MESSAGES/libkgeomap.mo
+share/locale/kk/LC_MESSAGES/libkgeomap.mo
share/locale/km/LC_MESSAGES/digikam.mo
share/locale/km/LC_MESSAGES/kipiplugin_acquireimages.mo
share/locale/km/LC_MESSAGES/kipiplugin_advancedslideshow.mo
@@ -945,6 +961,7 @@ share/locale/ru/LC_MESSAGES/kipiplugin_shwup.mo
share/locale/ru/LC_MESSAGES/kipiplugin_smug.mo
share/locale/ru/LC_MESSAGES/kipiplugin_timeadjust.mo
share/locale/ru/LC_MESSAGES/kipiplugins.mo
+share/locale/ru/LC_MESSAGES/libkgeomap.mo
share/locale/se/LC_MESSAGES/digikam.mo
share/locale/se/LC_MESSAGES/kipiplugin_jpeglossless.mo
share/locale/se/LC_MESSAGES/kipiplugin_timeadjust.mo
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 2997fa4a8229..4bb7ea3c74d5 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -3,14 +3,12 @@
PORTNAME= digikam
PORTVERSION= ${DIGIKAM_VER}
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE4 digital photo management application
-NO_STAGE= yes
.include "${.CURDIR}/Makefile.common"
BUILD_DEPENDS= ${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3
@@ -25,57 +23,36 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \
libkgeomap.so:${PORTSDIR}/astro/libkgeomap \
libboost_graph.so:${PORTSDIR}/devel/boost-libs
-LATEST_LINK= ${PORTNAME}-kde4
-
-OPTIONS_DEFINE= DOCS NLS GPHOTO2 PIMLIBS MYSQL
-OPTIONS_DEFAULT= GPHOTO2 PIMLIBS
-NO_OPTIONS_SORT= yes
-
-GPHOTO2_DESC= Enable gphoto2 camera support
-PIMLIBS_DESC= Enable address book support
-
-USES+= pkgconfig
+USES+= pkgconfig shebangfix
USE_KDE4+= libkdcraw libkexiv2 libkipi
USE_QT4+= sql-sqlite3_run
USE_LDCONFIG= yes
CMAKE_ARGS+= -DWITH_Sqlite2=off
-MAN1= digitaglinktree.1 \
- cleanup_digikamdb.1
-
WRKSRC= ${WRKDIR}/${DISTNAME}/core
+SHEBANG_FILES= utilities/scripts/digitaglinktree/digitaglinktree
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-RUN_DEPENDS+= digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
-.endif
+OPTIONS_DEFINE= DOCS NLS GPHOTO2 PIMLIBS MYSQL
+OPTIONS_DEFAULT= GPHOTO2 PIMLIBS
+NO_OPTIONS_SORT= yes
+OPTIONS_SUB= yes # MYSQL
-.if ${PORT_OPTIONS:MDOCS}
-RUN_DEPENDS+= digikam-doc>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-doc
-.endif
+DOCS_RUN_DEPENDS= digikam-doc>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-doc
-.if ${PORT_OPTIONS:MGPHOTO2}
-LIB_DEPENDS+= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-.else
-CMAKE_ARGS+= -DWITH_Gphoto2:BOOL=OFF
-.endif
+NLS_RUN_DEPENDS= digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
-.if ${PORT_OPTIONS:MPIMLIBS}
-USE_KDE4+= pimlibs
-.else
-CMAKE_ARGS+= -DWITH_KdepimLibs:BOOL=OFF
-.endif
+GPHOTO2_DESC= Enable gphoto2 camera support
+GPHOTO2_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_CMAKE_OFF= -DWITH_Gphoto2:BOOL=OFF
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL= server
-USE_QT4+= sql-mysql_run
-CMAKE_ARGS+= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
- -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
-PLIST_SUB+= MYSQL=""
-.else
-CMAKE_ARGS+= -DENABLE_INTERNALMYSQL:BOOL=OFF
-PLIST_SUB+= MYSQL="@comment "
-.endif
+PIMLIBS_DESC= Enable address book support
+PIMLIBS_USE= KDE4=pimlibs
+PIMLIBS_CMAKE_OFF= -DWITH_KdepimLibs:BOOL=OFF
+
+MYSQL_USE= MYSQL=server
+MYSQL_USE= QT4=sql-mysql_run
+MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
+ -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
+MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF
.include <bsd.port.mk>
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index f0f5807407f6..de8a4048d2e5 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -12,7 +12,7 @@
# net/libkvkontakte
# net/libmediawiki
-DIGIKAM_VER= 3.2.0
+DIGIKAM_VER= 3.5.0
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/digikam
@@ -33,6 +33,7 @@ KIPI_PLUGINS_ALL= acquireimages \
imageviewer \
imgurexport \
ipodexport \
+ jalbumexport \
jpeglossless \
kioexport \
kmlexport \
@@ -75,13 +76,14 @@ expoblending_DESC= Create pseudo HDR image with a stack of bracketed images
facebook_DESC= Import/export images to/from a remote Facebook web service
flashexport_DESC= Export images to Flash using SimpleViewer
flickrexport_DESC= Export images to a remote Flickr based web service
-gpssync_DESC= Geolocalize pictures
+gpssync_DESC= Geolocalize images
galleryexport_DESC= Export images to a remote Gallery
htmlexport_DESC= Export images collections into a static XHTML page
imageshackexport_DESC= Export images to ImageShack web service
imageviewer_DESC= Preview images using OpenGL
imgurexport_DESC= Export images to ImgUr web service
-ipodexport_DESC= Export pictures to an Ipod device
+ipodexport_DESC= Export images to an Ipod device
+jalbumexport_DESC= Export images to jAlbum
jpeglossless_DESC= Rotate/flip images without losing quality
kioexport_DESC= Export images to remote computer using network protocol
kmlexport_DESC= Create KML files to present images with coordinates
@@ -130,7 +132,7 @@ USES+= pkgconfig
.if ${KIPI_PLUGIN} != "libkipiplugins"
EXTRA_PATCHES= ${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
-LIB_DEPENDS+= kipiplugins:${PORTSDIR}/graphics/libkipiplugins
+LIB_DEPENDS+= libkipiplugins.so:${PORTSDIR}/graphics/libkipiplugins
.endif
WRKSRC= ${WRKDIR}/${DISTNAME}/extra/kipi-plugins
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index 2c60fc998164..3792348eb3ce 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (digikam-3.2.0.tar.bz2) = bd7204d42c4ef73f22e757ba5daa334073bd02ccc054c31780786d2b1a2a481a
-SIZE (digikam-3.2.0.tar.bz2) = 58449068
+SHA256 (digikam-3.5.0.tar.bz2) = 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a
+SIZE (digikam-3.5.0.tar.bz2) = 65698806
diff --git a/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake b/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
new file mode 100644
index 000000000000..b030ad48f34f
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
@@ -0,0 +1,46 @@
+--- ./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)
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index 1b61616334aa..139652a99280 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -19,18 +19,13 @@ lib/libdigikamcore.so.3.0.0
lib/libdigikamdatabase.so
lib/libdigikamdatabase.so.3
lib/libdigikamdatabase.so.3.0.0
+man/man1/cleanup_digikamdb.1.gz
+man/man1/digitaglinktree.1.gz
share/applications/kde4/digikam.desktop
share/applications/kde4/showfoto.desktop
share/apps/digikam/about/digikam.css
share/apps/digikam/about/main.html
share/apps/digikam/about/top-left-digikam.png
-share/apps/digikam/data/assistant-collection.png
-share/apps/digikam/data/assistant-metadata.png
-share/apps/digikam/data/assistant-openfile.png
-share/apps/digikam/data/assistant-preview.png
-share/apps/digikam/data/assistant-rawimport.png
-share/apps/digikam/data/assistant-scancollection.png
-share/apps/digikam/data/assistant-tooltips.png
share/apps/digikam/data/banner-digikam.png
share/apps/digikam/data/bluejean-texture.png
share/apps/digikam/data/bothhorz.png
diff --git a/graphics/kipi-plugin-acquireimages/Makefile b/graphics/kipi-plugin-acquireimages/Makefile
index 74233c76d9d9..d43605985be1 100644
--- a/graphics/kipi-plugin-acquireimages/Makefile
+++ b/graphics/kipi-plugin-acquireimages/Makefile
@@ -10,6 +10,5 @@ COMMENT= ${${KIPI_PLUGIN}_DESC}
USE_KDE4= libksane
KIPI_PLUGIN= acquireimages
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-advancedslideshow/Makefile b/graphics/kipi-plugin-advancedslideshow/Makefile
index 8a1823806e07..b06522148367 100644
--- a/graphics/kipi-plugin-advancedslideshow/Makefile
+++ b/graphics/kipi-plugin-advancedslideshow/Makefile
@@ -11,6 +11,5 @@ USE_GL= glu
USE_XORG= xrandr
KIPI_PLUGIN= advancedslideshow
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-advancedslideshow/pkg-plist b/graphics/kipi-plugin-advancedslideshow/pkg-plist
index 19719f058b51..a3a7a6171074 100644
--- a/graphics/kipi-plugin-advancedslideshow/pkg-plist
+++ b/graphics/kipi-plugin-advancedslideshow/pkg-plist
@@ -1,4 +1,4 @@
lib/kde4/kipiplugin_advancedslideshow.so
share/apps/kipi/kipiplugin_advancedslideshowui.rc
-share/icons/hicolor/32x32/actions/slideshow.png
+share/icons/hicolor/32x32/apps/kipi-slideshow.png
share/kde4/services/kipiplugin_advancedslideshow.desktop
diff --git a/graphics/kipi-plugin-batchprocess/Makefile b/graphics/kipi-plugin-batchprocess/Makefile
index 3309b830e7e8..12d2c94b5c0c 100644
--- a/graphics/kipi-plugin-batchprocess/Makefile
+++ b/graphics/kipi-plugin-batchprocess/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= batchprocess
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-calendar/Makefile b/graphics/kipi-plugin-calendar/Makefile
index 937ab668318b..4d12d6637e43 100644
--- a/graphics/kipi-plugin-calendar/Makefile
+++ b/graphics/kipi-plugin-calendar/Makefile
@@ -10,6 +10,5 @@ COMMENT= ${${KIPI_PLUGIN}_DESC}
USE_KDE4= pimlibs
KIPI_PLUGIN= calendar
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-debianscreenshots/Makefile b/graphics/kipi-plugin-debianscreenshots/Makefile
index 6f00c6468ebb..208bd70119a2 100644
--- a/graphics/kipi-plugin-debianscreenshots/Makefile
+++ b/graphics/kipi-plugin-debianscreenshots/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= qjson:${PORTSDIR}/devel/qjson
+LIB_DEPENDS= libqjson.so:${PORTSDIR}/devel/qjson
KIPI_PLUGIN= debianscreenshots
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-debianscreenshots/pkg-plist b/graphics/kipi-plugin-debianscreenshots/pkg-plist
index 0f5932fcee77..1f5b508c8188 100644
--- a/graphics/kipi-plugin-debianscreenshots/pkg-plist
+++ b/graphics/kipi-plugin-debianscreenshots/pkg-plist
@@ -1,8 +1,8 @@
lib/kde4/kipiplugin_debianscreenshots.so
share/apps/kipi/kipiplugin_debianscreenshotsui.rc
-share/icons/hicolor/16x16/actions/debianscreenshots.png
-share/icons/hicolor/22x22/actions/debianscreenshots.png
-share/icons/hicolor/32x32/actions/debianscreenshots.png
-share/icons/hicolor/48x48/actions/debianscreenshots.png
-share/icons/hicolor/scalable/actions/debianscreenshots.svgz
+share/icons/hicolor/16x16/apps/kipi-debianscreenshots.png
+share/icons/hicolor/22x22/apps/kipi-debianscreenshots.png
+share/icons/hicolor/32x32/apps/kipi-debianscreenshots.png
+share/icons/hicolor/48x48/apps/kipi-debianscreenshots.png
+share/icons/hicolor/scalable/apps/kipi-debianscreenshots.svgz
share/kde4/services/kipiplugin_debianscreenshots.desktop
diff --git a/graphics/kipi-plugin-dngconverter/Makefile b/graphics/kipi-plugin-dngconverter/Makefile
index dac91c909e07..5d4a98c3db14 100644
--- a/graphics/kipi-plugin-dngconverter/Makefile
+++ b/graphics/kipi-plugin-dngconverter/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
KIPI_PLUGIN= dngconverter
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-dngconverter/pkg-plist b/graphics/kipi-plugin-dngconverter/pkg-plist
index ba19caf807c9..a9999f2e6306 100644
--- a/graphics/kipi-plugin-dngconverter/pkg-plist
+++ b/graphics/kipi-plugin-dngconverter/pkg-plist
@@ -3,11 +3,11 @@ bin/dnginfo
lib/kde4/kipiplugin_dngconverter.so
share/applications/kde4/dngconverter.desktop
share/apps/kipi/kipiplugin_dngconverterui.rc
-share/icons/hicolor/128x128/apps/dngconverter.png
-share/icons/hicolor/16x16/apps/dngconverter.png
-share/icons/hicolor/22x22/apps/dngconverter.png
-share/icons/hicolor/32x32/apps/dngconverter.png
-share/icons/hicolor/48x48/apps/dngconverter.png
-share/icons/hicolor/64x64/apps/dngconverter.png
-share/icons/hicolor/scalable/apps/dngconverter.svgz
+share/icons/hicolor/128x128/apps/kipi-dngconverter.png
+share/icons/hicolor/16x16/apps/kipi-dngconverter.png
+share/icons/hicolor/22x22/apps/kipi-dngconverter.png
+share/icons/hicolor/32x32/apps/kipi-dngconverter.png
+share/icons/hicolor/48x48/apps/kipi-dngconverter.png
+share/icons/hicolor/64x64/apps/kipi-dngconverter.png
+share/icons/hicolor/scalable/apps/kipi-dngconverter.svgz
share/kde4/services/kipiplugin_dngconverter.desktop
diff --git a/graphics/kipi-plugin-expoblending/Makefile b/graphics/kipi-plugin-expoblending/Makefile
index 3b07694de27b..01b41e06af99 100644
--- a/graphics/kipi-plugin-expoblending/Makefile
+++ b/graphics/kipi-plugin-expoblending/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= expoblending
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-expoblending/pkg-plist b/graphics/kipi-plugin-expoblending/pkg-plist
index 32b4d7ca6753..3bcc3b5c7f41 100644
--- a/graphics/kipi-plugin-expoblending/pkg-plist
+++ b/graphics/kipi-plugin-expoblending/pkg-plist
@@ -6,10 +6,10 @@ share/apps/kipiplugin_expoblending/pics/assistant-enfuse.png
share/apps/kipiplugin_expoblending/pics/assistant-preprocessing.png
share/apps/kipiplugin_expoblending/pics/assistant-stack.png
share/apps/kipiplugin_expoblending/pics/assistant-tripod.png
-share/icons/hicolor/16x16/actions/expoblending.png
-share/icons/hicolor/22x22/actions/expoblending.png
-share/icons/hicolor/32x32/actions/expoblending.png
-share/icons/hicolor/48x48/actions/expoblending.png
+share/icons/hicolor/16x16/apps/kipi-expoblending.png
+share/icons/hicolor/22x22/apps/kipi-expoblending.png
+share/icons/hicolor/32x32/apps/kipi-expoblending.png
+share/icons/hicolor/48x48/apps/kipi-expoblending.png
share/kde4/services/kipiplugin_expoblending.desktop
@dirrm share/apps/kipiplugin_expoblending/pics
@dirrm share/apps/kipiplugin_expoblending
diff --git a/graphics/kipi-plugin-facebook/Makefile b/graphics/kipi-plugin-facebook/Makefile
index 48ebc4519332..350b2ed9b01f 100644
--- a/graphics/kipi-plugin-facebook/Makefile
+++ b/graphics/kipi-plugin-facebook/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= qjson:${PORTSDIR}/devel/qjson
+LIB_DEPENDS= libqjson.so:${PORTSDIR}/devel/qjson
KIPI_PLUGIN= facebook
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-facebook/pkg-plist b/graphics/kipi-plugin-facebook/pkg-plist
index a0a95c84d400..a7a1cd0bd38e 100644
--- a/graphics/kipi-plugin-facebook/pkg-plist
+++ b/graphics/kipi-plugin-facebook/pkg-plist
@@ -1,8 +1,8 @@
lib/kde4/kipiplugin_facebook.so
share/apps/kipi/kipiplugin_facebookui.rc
-share/icons/hicolor/16x16/actions/facebook.png
-share/icons/hicolor/22x22/actions/facebook.png
-share/icons/hicolor/32x32/actions/facebook.png
-share/icons/hicolor/48x48/actions/facebook.png
-share/icons/hicolor/scalable/actions/facebook.svgz
+share/icons/hicolor/16x16/apps/kipi-facebook.png
+share/icons/hicolor/22x22/apps/kipi-facebook.png
+share/icons/hicolor/32x32/apps/kipi-facebook.png
+share/icons/hicolor/48x48/apps/kipi-facebook.png
+share/icons/hicolor/scalable/apps/kipi-facebook.svgz
share/kde4/services/kipiplugin_facebook.desktop
diff --git a/graphics/kipi-plugin-flashexport/Makefile b/graphics/kipi-plugin-flashexport/Makefile
index 9fca9edfd5be..ac4f94fbdb4b 100644
--- a/graphics/kipi-plugin-flashexport/Makefile
+++ b/graphics/kipi-plugin-flashexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= flashexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-flashexport/pkg-plist b/graphics/kipi-plugin-flashexport/pkg-plist
index 32731898f7ba..849be076919d 100644
--- a/graphics/kipi-plugin-flashexport/pkg-plist
+++ b/graphics/kipi-plugin-flashexport/pkg-plist
@@ -5,12 +5,12 @@ share/apps/kipiplugin_flashexport/index2.template
share/apps/kipiplugin_flashexport/index3.template
share/apps/kipiplugin_flashexport/index4.template
share/apps/kipiplugin_flashexport/simpleviewer_html/space.png
-share/icons/hicolor/128x128/actions/flash.png
-share/icons/hicolor/16x16/actions/flash.png
-share/icons/hicolor/22x22/actions/flash.png
-share/icons/hicolor/32x32/actions/flash.png
-share/icons/hicolor/48x48/actions/flash.png
-share/icons/hicolor/scalable/actions/flash.svgz
+share/icons/hicolor/128x128/apps/kipi-flash.png
+share/icons/hicolor/16x16/apps/kipi-flash.png
+share/icons/hicolor/22x22/apps/kipi-flash.png
+share/icons/hicolor/32x32/apps/kipi-flash.png
+share/icons/hicolor/48x48/apps/kipi-flash.png
+share/icons/hicolor/scalable/apps/kipi-flash.svgz
share/kde4/services/kipiplugin_flashexport.desktop
@dirrm share/apps/kipiplugin_flashexport/simpleviewer_html
@dirrm share/apps/kipiplugin_flashexport
diff --git a/graphics/kipi-plugin-flickrexport/Makefile b/graphics/kipi-plugin-flickrexport/Makefile
index 5b50a9fa407c..cb36104f0188 100644
--- a/graphics/kipi-plugin-flickrexport/Makefile
+++ b/graphics/kipi-plugin-flickrexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= flickrexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-flickrexport/pkg-plist b/graphics/kipi-plugin-flickrexport/pkg-plist
index 99f6a2c0185f..d16d674e4dee 100644
--- a/graphics/kipi-plugin-flickrexport/pkg-plist
+++ b/graphics/kipi-plugin-flickrexport/pkg-plist
@@ -1,18 +1,18 @@
lib/kde4/kipiplugin_flickrexport.so
share/apps/kipi/kipiplugin_flickrexportui.rc
-share/icons/hicolor/16x16/actions/flickr.png
-share/icons/hicolor/16x16/actions/hq.png
-share/icons/hicolor/16x16/actions/zooomr.png
-share/icons/hicolor/22x22/actions/flickr.png
-share/icons/hicolor/22x22/actions/hq.png
-share/icons/hicolor/22x22/actions/zooomr.png
-share/icons/hicolor/32x32/actions/flickr.png
-share/icons/hicolor/32x32/actions/hq.png
-share/icons/hicolor/32x32/actions/zooomr.png
-share/icons/hicolor/48x48/actions/flickr.png
-share/icons/hicolor/48x48/actions/hq.png
-share/icons/hicolor/48x48/actions/zooomr.png
-share/icons/hicolor/scalable/actions/flickr.svgz
-share/icons/hicolor/scalable/actions/hq.svgz
-share/icons/hicolor/scalable/actions/zooomr.svgz
+share/icons/hicolor/16x16/apps/kipi-flickr.png
+share/icons/hicolor/16x16/apps/kipi-hq.png
+share/icons/hicolor/16x16/apps/kipi-zooomr.png
+share/icons/hicolor/22x22/apps/kipi-flickr.png
+share/icons/hicolor/22x22/apps/kipi-hq.png
+share/icons/hicolor/22x22/apps/kipi-zooomr.png
+share/icons/hicolor/32x32/apps/kipi-flickr.png
+share/icons/hicolor/32x32/apps/kipi-hq.png
+share/icons/hicolor/32x32/apps/kipi-zooomr.png
+share/icons/hicolor/48x48/apps/kipi-flickr.png
+share/icons/hicolor/48x48/apps/kipi-hq.png
+share/icons/hicolor/48x48/apps/kipi-zooomr.png
+share/icons/hicolor/scalable/apps/kipi-flickr.svgz
+share/icons/hicolor/scalable/apps/kipi-hq.svgz
+share/icons/hicolor/scalable/apps/kipi-zooomr.svgz
share/kde4/services/kipiplugin_flickrexport.desktop
diff --git a/graphics/kipi-plugin-galleryexport/Makefile b/graphics/kipi-plugin-galleryexport/Makefile
index 158d6db31f4b..d3e92e41d3e3 100644
--- a/graphics/kipi-plugin-galleryexport/Makefile
+++ b/graphics/kipi-plugin-galleryexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= galleryexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-galleryexport/pkg-plist b/graphics/kipi-plugin-galleryexport/pkg-plist
index b579e9821ecb..a0bd5609d25d 100644
--- a/graphics/kipi-plugin-galleryexport/pkg-plist
+++ b/graphics/kipi-plugin-galleryexport/pkg-plist
@@ -1,11 +1,11 @@
lib/kde4/kipiplugin_galleryexport.so
share/apps/kipi/kipiplugin_galleryexportui.rc
share/apps/kipiplugin_galleryexport/pics/gallery_logo.png
-share/icons/hicolor/16x16/actions/gallery.png
-share/icons/hicolor/22x22/actions/gallery.png
-share/icons/hicolor/32x32/actions/gallery.png
-share/icons/hicolor/48x48/actions/gallery.png
-share/icons/hicolor/scalable/actions/gallery.svgz
+share/icons/hicolor/16x16/apps/kipi-gallery.png
+share/icons/hicolor/22x22/apps/kipi-gallery.png
+share/icons/hicolor/32x32/apps/kipi-gallery.png
+share/icons/hicolor/48x48/apps/kipi-gallery.png
+share/icons/hicolor/scalable/apps/kipi-gallery.svgz
share/kde4/services/kipiplugin_galleryexport.desktop
@dirrm share/apps/kipiplugin_galleryexport/pics
@dirrm share/apps/kipiplugin_galleryexport
diff --git a/graphics/kipi-plugin-gpssync/Makefile b/graphics/kipi-plugin-gpssync/Makefile
index 9e4a402dd747..f92d99fe616b 100644
--- a/graphics/kipi-plugin-gpssync/Makefile
+++ b/graphics/kipi-plugin-gpssync/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= kgeomap:${PORTSDIR}/astro/libkgeomap
+LIB_DEPENDS= libkgeomap.so:${PORTSDIR}/astro/libkgeomap
KIPI_PLUGIN= gpssync
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-gpssync/pkg-plist b/graphics/kipi-plugin-gpssync/pkg-plist
index 4299f63add12..55ec29064460 100644
--- a/graphics/kipi-plugin-gpssync/pkg-plist
+++ b/graphics/kipi-plugin-gpssync/pkg-plist
@@ -3,7 +3,7 @@ share/apps/gpssync/bookmarks-marker.png
share/apps/gpssync/searchmarker-normal.png
share/apps/gpssync/searchmarker-selected.png
share/apps/kipi/kipiplugin_gpssyncui.rc
-share/icons/hicolor/16x16/actions/gpsimagetag.png
-share/icons/hicolor/32x32/actions/gpsimagetag.png
+share/icons/hicolor/16x16/apps/kipi-gpsimagetag.png
+share/icons/hicolor/32x32/apps/kipi-gpsimagetag.png
share/kde4/services/kipiplugin_gpssync.desktop
@dirrm share/apps/gpssync
diff --git a/graphics/kipi-plugin-htmlexport/Makefile b/graphics/kipi-plugin-htmlexport/Makefile
index 11801ec45a4a..8320ed5e9370 100644
--- a/graphics/kipi-plugin-htmlexport/Makefile
+++ b/graphics/kipi-plugin-htmlexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= htmlexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-imageshackexport/Makefile b/graphics/kipi-plugin-imageshackexport/Makefile
index ae1f62a708b3..c1ebb6a94826 100644
--- a/graphics/kipi-plugin-imageshackexport/Makefile
+++ b/graphics/kipi-plugin-imageshackexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= imageshackexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-imageshackexport/pkg-plist b/graphics/kipi-plugin-imageshackexport/pkg-plist
index b7f929b4c59e..77bcedf3aba4 100644
--- a/graphics/kipi-plugin-imageshackexport/pkg-plist
+++ b/graphics/kipi-plugin-imageshackexport/pkg-plist
@@ -1,6 +1,6 @@
lib/kde4/kipiplugin_imageshackexport.so
share/apps/kipi/kipiplugin_imageshackexportui.rc
-share/icons/hicolor/32x32/actions/imageshack.png
-share/icons/hicolor/48x48/actions/imageshack.png
-share/icons/hicolor/64x64/actions/imageshack.png
+share/icons/hicolor/32x32/apps/kipi-imageshack.png
+share/icons/hicolor/48x48/apps/kipi-imageshack.png
+share/icons/hicolor/64x64/apps/kipi-imageshack.png
share/kde4/services/kipiplugin_imageshackexport.desktop
diff --git a/graphics/kipi-plugin-imageviewer/Makefile b/graphics/kipi-plugin-imageviewer/Makefile
index 0ab343a4894c..39e3fb396646 100644
--- a/graphics/kipi-plugin-imageviewer/Makefile
+++ b/graphics/kipi-plugin-imageviewer/Makefile
@@ -11,6 +11,5 @@ USE_GL= glu
USE_XORG= xrandr
KIPI_PLUGIN= imageviewer
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-imageviewer/pkg-plist b/graphics/kipi-plugin-imageviewer/pkg-plist
index 62ce35e353b2..ac517c8a393b 100644
--- a/graphics/kipi-plugin-imageviewer/pkg-plist
+++ b/graphics/kipi-plugin-imageviewer/pkg-plist
@@ -3,8 +3,8 @@ share/apps/kipi/kipiplugin_imageviewerui.rc
share/apps/kipiplugin_imageviewer/pics/hand.png
share/apps/kipiplugin_imageviewer/pics/nullImage.png
share/apps/kipiplugin_imageviewer/pics/zoom.png
-share/icons/hicolor/16x16/actions/ogl.png
-share/icons/hicolor/32x32/actions/ogl.png
+share/icons/hicolor/16x16/apps/kipi-ogl.png
+share/icons/hicolor/32x32/apps/kipi-ogl.png
share/kde4/services/kipiplugin_imageviewer.desktop
@dirrm share/apps/kipiplugin_imageviewer/pics
@dirrm share/apps/kipiplugin_imageviewer
diff --git a/graphics/kipi-plugin-imgurexport/Makefile b/graphics/kipi-plugin-imgurexport/Makefile
index 6f034a3823c6..13590ff074fa 100644
--- a/graphics/kipi-plugin-imgurexport/Makefile
+++ b/graphics/kipi-plugin-imgurexport/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= qjson:${PORTSDIR}/devel/qjson
+LIB_DEPENDS= libqjson.so:${PORTSDIR}/devel/qjson
KIPI_PLUGIN= imgurexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-imgurexport/pkg-plist b/graphics/kipi-plugin-imgurexport/pkg-plist
index 65a5f4ccbdc8..01eb9a5dbce5 100644
--- a/graphics/kipi-plugin-imgurexport/pkg-plist
+++ b/graphics/kipi-plugin-imgurexport/pkg-plist
@@ -1,8 +1,8 @@
lib/kde4/kipiplugin_imgurexport.so
share/apps/kipi/kipiplugin_imgurexportui.rc
-share/icons/hicolor/16x16/actions/imgur.png
-share/icons/hicolor/22x22/actions/imgur.png
-share/icons/hicolor/32x32/actions/imgur.png
-share/icons/hicolor/48x48/actions/imgur.png
-share/icons/hicolor/scalable/actions/imgur.svgz
+share/icons/hicolor/16x16/apps/kipi-imgur.png
+share/icons/hicolor/22x22/apps/kipi-imgur.png
+share/icons/hicolor/32x32/apps/kipi-imgur.png
+share/icons/hicolor/48x48/apps/kipi-imgur.png
+share/icons/hicolor/scalable/apps/kipi-imgur.svgz
share/kde4/services/kipiplugin_imgurexport.desktop
diff --git a/graphics/kipi-plugin-ipodexport/Makefile b/graphics/kipi-plugin-ipodexport/Makefile
index a6c2e8cafff1..3fa3e1d5e19b 100644
--- a/graphics/kipi-plugin-ipodexport/Makefile
+++ b/graphics/kipi-plugin-ipodexport/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= gpod:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS= libgpod.so:${PORTSDIR}/audio/libgpod
KIPI_PLUGIN= ipodexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-jalbumexport/Makefile b/graphics/kipi-plugin-jalbumexport/Makefile
new file mode 100644
index 000000000000..a8138880a6ff
--- /dev/null
+++ b/graphics/kipi-plugin-jalbumexport/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME= kipi-plugin-${KIPI_PLUGIN}
+PORTVERSION= ${DIGIKAM_VER}
+CATEGORIES= graphics kde
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= ${${KIPI_PLUGIN}_DESC}
+
+KIPI_PLUGIN= jalbumexport
+.include "${.CURDIR}/../digikam-kde4/Makefile.common"
+.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-jalbumexport/pkg-plist b/graphics/kipi-plugin-jalbumexport/pkg-plist
new file mode 100644
index 000000000000..ae5bd044ad95
--- /dev/null
+++ b/graphics/kipi-plugin-jalbumexport/pkg-plist
@@ -0,0 +1,6 @@
+lib/kde4/kipiplugin_jalbumexport.so
+share/apps/kipi/kipiplugin_jalbumexportui.rc
+share/icons/hicolor/16x16/apps/kipi-jalbum.png
+share/icons/hicolor/24x24/apps/kipi-jalbum.png
+share/icons/hicolor/32x32/apps/kipi-jalbum.png
+share/kde4/services/kipiplugin_jalbumexport.desktop
diff --git a/graphics/kipi-plugin-jpeglossless/Makefile b/graphics/kipi-plugin-jpeglossless/Makefile
index 05f474000f48..6de963ef8d81 100644
--- a/graphics/kipi-plugin-jpeglossless/Makefile
+++ b/graphics/kipi-plugin-jpeglossless/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= jpeglossless
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-kioexport/Makefile b/graphics/kipi-plugin-kioexport/Makefile
index cf8975c8fefe..fdfd4262aaba 100644
--- a/graphics/kipi-plugin-kioexport/Makefile
+++ b/graphics/kipi-plugin-kioexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= kioexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-kmlexport/Makefile b/graphics/kipi-plugin-kmlexport/Makefile
index 130d4161cce7..98feb178caa4 100644
--- a/graphics/kipi-plugin-kmlexport/Makefile
+++ b/graphics/kipi-plugin-kmlexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= kmlexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-kopete/Makefile b/graphics/kipi-plugin-kopete/Makefile
index cd16db580861..1fcb8ff49fb3 100644
--- a/graphics/kipi-plugin-kopete/Makefile
+++ b/graphics/kipi-plugin-kopete/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= kopete
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-mediawiki/Makefile b/graphics/kipi-plugin-mediawiki/Makefile
index 358fac4d6081..aa24aa9313fa 100644
--- a/graphics/kipi-plugin-mediawiki/Makefile
+++ b/graphics/kipi-plugin-mediawiki/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= mediawiki:${PORTSDIR}/net/libmediawiki
+LIB_DEPENDS= libmediawiki.so:${PORTSDIR}/net/libmediawiki
KIPI_PLUGIN= mediawiki
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-mediawiki/pkg-plist b/graphics/kipi-plugin-mediawiki/pkg-plist
index 486e07e2abd7..0b0dadc48152 100644
--- a/graphics/kipi-plugin-mediawiki/pkg-plist
+++ b/graphics/kipi-plugin-mediawiki/pkg-plist
@@ -1,8 +1,8 @@
lib/kde4/kipiplugin_wikimedia.so
share/apps/kipi/kipiplugin_wikimediaui.rc
-share/icons/hicolor/16x16/actions/wikimedia.png
-share/icons/hicolor/22x22/actions/wikimedia.png
-share/icons/hicolor/32x32/actions/wikimedia.png
-share/icons/hicolor/48x48/actions/wikimedia.png
-share/icons/hicolor/scalable/actions/wikimedia.svgz
+share/icons/hicolor/16x16/apps/kipi-wikimedia.png
+share/icons/hicolor/22x22/apps/kipi-wikimedia.png
+share/icons/hicolor/32x32/apps/kipi-wikimedia.png
+share/icons/hicolor/48x48/apps/kipi-wikimedia.png
+share/icons/hicolor/scalable/apps/kipi-wikimedia.svgz
share/kde4/services/kipiplugin_wikimedia.desktop
diff --git a/graphics/kipi-plugin-metadataedit/Makefile b/graphics/kipi-plugin-metadataedit/Makefile
index af71c2363b96..b07e4547dd21 100644
--- a/graphics/kipi-plugin-metadataedit/Makefile
+++ b/graphics/kipi-plugin-metadataedit/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= metadataedit
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-metadataedit/pkg-plist b/graphics/kipi-plugin-metadataedit/pkg-plist
index 157849c340b1..76adae5aafbd 100644
--- a/graphics/kipi-plugin-metadataedit/pkg-plist
+++ b/graphics/kipi-plugin-metadataedit/pkg-plist
@@ -1,4 +1,4 @@
lib/kde4/kipiplugin_metadataedit.so
share/apps/kipi/kipiplugin_metadataeditui.rc
-share/icons/hicolor/64x64/actions/metadataedit.png
+share/icons/hicolor/64x64/apps/kipi-metadataedit.png
share/kde4/services/kipiplugin_metadataedit.desktop
diff --git a/graphics/kipi-plugin-panorama/Makefile b/graphics/kipi-plugin-panorama/Makefile
index fe6af5efb728..5b1f78177416 100644
--- a/graphics/kipi-plugin-panorama/Makefile
+++ b/graphics/kipi-plugin-panorama/Makefile
@@ -10,6 +10,5 @@ COMMENT= ${${KIPI_PLUGIN}_DESC}
USES= bison:build
KIPI_PLUGIN= panorama
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-panorama/pkg-plist b/graphics/kipi-plugin-panorama/pkg-plist
index 18aad53cac64..9af9d7602457 100644
--- a/graphics/kipi-plugin-panorama/pkg-plist
+++ b/graphics/kipi-plugin-panorama/pkg-plist
@@ -6,11 +6,11 @@ share/apps/kipiplugin_panorama/pics/assistant-hugin.png
share/apps/kipiplugin_panorama/pics/assistant-preprocessing.png
share/apps/kipiplugin_panorama/pics/assistant-stack.png
share/apps/kipiplugin_panorama/pics/assistant-tripod.png
-share/icons/hicolor/16x16/actions/panorama.png
-share/icons/hicolor/22x22/actions/panorama.png
-share/icons/hicolor/32x32/actions/panorama.png
-share/icons/hicolor/48x48/actions/panorama.png
-share/icons/hicolor/scalable/actions/panorama.svgz
+share/icons/hicolor/16x16/apps/kipi-panorama.png
+share/icons/hicolor/22x22/apps/kipi-panorama.png
+share/icons/hicolor/32x32/apps/kipi-panorama.png
+share/icons/hicolor/48x48/apps/kipi-panorama.png
+share/icons/hicolor/scalable/apps/kipi-panorama.svgz
share/kde4/services/kipiplugin_panorama.desktop
@dirrm share/apps/kipiplugin_panorama/pics
@dirrm share/apps/kipiplugin_panorama
diff --git a/graphics/kipi-plugin-photolayoutseditor/Makefile b/graphics/kipi-plugin-photolayoutseditor/Makefile
index 9d421d554794..0dc5080b04ba 100644
--- a/graphics/kipi-plugin-photolayoutseditor/Makefile
+++ b/graphics/kipi-plugin-photolayoutseditor/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= photolayoutseditor
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-photolayoutseditor/pkg-plist b/graphics/kipi-plugin-photolayoutseditor/pkg-plist
index 364e9cddfc8f..68cc6ef73848 100644
--- a/graphics/kipi-plugin-photolayoutseditor/pkg-plist
+++ b/graphics/kipi-plugin-photolayoutseditor/pkg-plist
@@ -4,7 +4,7 @@ lib/libPropertyBrowser.a
share/applications/kde4/photolayoutseditor.desktop
share/apps/kipi/kipiplugin_photolayoutseditorui.rc
share/apps/photolayoutseditor/photolayoutseditorui.rc
-share/config.kcfg/PLEConfigSkeleton.kcfgc
+share/config.kcfg/photolayoutseditor.kcfg
share/icons/hicolor/128x128/apps/photolayoutseditor.png
share/icons/hicolor/16x16/apps/photolayoutseditor.png
share/icons/hicolor/22x22/apps/photolayoutseditor.png
diff --git a/graphics/kipi-plugin-picasawebexport/Makefile b/graphics/kipi-plugin-picasawebexport/Makefile
index c9083f0e2ee5..92fa9354806a 100644
--- a/graphics/kipi-plugin-picasawebexport/Makefile
+++ b/graphics/kipi-plugin-picasawebexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= picasawebexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-picasawebexport/pkg-plist b/graphics/kipi-plugin-picasawebexport/pkg-plist
index df3f8529c565..c4a40f57d521 100644
--- a/graphics/kipi-plugin-picasawebexport/pkg-plist
+++ b/graphics/kipi-plugin-picasawebexport/pkg-plist
@@ -1,8 +1,8 @@
lib/kde4/kipiplugin_picasawebexport.so
share/apps/kipi/kipiplugin_picasawebexportui.rc
-share/icons/hicolor/16x16/actions/picasa.png
-share/icons/hicolor/22x22/actions/picasa.png
-share/icons/hicolor/32x32/actions/picasa.png
-share/icons/hicolor/48x48/actions/picasa.png
-share/icons/hicolor/scalable/actions/picasa.svgz
+share/icons/hicolor/16x16/apps/kipi-picasa.png
+share/icons/hicolor/22x22/apps/kipi-picasa.png
+share/icons/hicolor/32x32/apps/kipi-picasa.png
+share/icons/hicolor/48x48/apps/kipi-picasa.png
+share/icons/hicolor/scalable/apps/kipi-picasa.svgz
share/kde4/services/kipiplugin_picasawebexport.desktop
diff --git a/graphics/kipi-plugin-piwigoexport/Makefile b/graphics/kipi-plugin-piwigoexport/Makefile
index 439d87f96431..f80d0fe5ee92 100644
--- a/graphics/kipi-plugin-piwigoexport/Makefile
+++ b/graphics/kipi-plugin-piwigoexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= piwigoexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-piwigoexport/pkg-plist b/graphics/kipi-plugin-piwigoexport/pkg-plist
index 3377c8963205..0166039b098c 100644
--- a/graphics/kipi-plugin-piwigoexport/pkg-plist
+++ b/graphics/kipi-plugin-piwigoexport/pkg-plist
@@ -1,11 +1,11 @@
lib/kde4/kipiplugin_piwigoexport.so
share/apps/kipi/kipiplugin_piwigoexportui.rc
share/apps/kipiplugin_piwigoexport/pics/piwigo_logo.png
-share/icons/hicolor/16x16/actions/piwigo.png
-share/icons/hicolor/22x22/actions/piwigo.png
-share/icons/hicolor/32x32/actions/piwigo.png
-share/icons/hicolor/48x48/actions/piwigo.png
-share/icons/hicolor/scalable/actions/piwigo.svgz
+share/icons/hicolor/16x16/apps/kipi-piwigo.png
+share/icons/hicolor/22x22/apps/kipi-piwigo.png
+share/icons/hicolor/32x32/apps/kipi-piwigo.png
+share/icons/hicolor/48x48/apps/kipi-piwigo.png
+share/icons/hicolor/scalable/apps/kipi-piwigo.svgz
share/kde4/services/kipiplugin_piwigoexport.desktop
@dirrm share/apps/kipiplugin_piwigoexport/pics
@dirrm share/apps/kipiplugin_piwigoexport
diff --git a/graphics/kipi-plugin-printimages/Makefile b/graphics/kipi-plugin-printimages/Makefile
index 67a9eb57d61c..73dc838725fa 100644
--- a/graphics/kipi-plugin-printimages/Makefile
+++ b/graphics/kipi-plugin-printimages/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= printimages
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-rajceexport/Makefile b/graphics/kipi-plugin-rajceexport/Makefile
index 6b69f687bfcb..dc17558cbf6a 100644
--- a/graphics/kipi-plugin-rajceexport/Makefile
+++ b/graphics/kipi-plugin-rajceexport/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= rajceexport
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-rajceexport/pkg-plist b/graphics/kipi-plugin-rajceexport/pkg-plist
index f846f4e6912e..9fdb383a2b08 100644
--- a/graphics/kipi-plugin-rajceexport/pkg-plist
+++ b/graphics/kipi-plugin-rajceexport/pkg-plist
@@ -1,7 +1,7 @@
lib/kde4/kipiplugin_rajceexport.so
share/apps/kipi/kipiplugin_rajceexportui.rc
-share/icons/hicolor/16x16/actions/rajce.png
-share/icons/hicolor/32x32/actions/rajce.png
-share/icons/hicolor/48x48/actions/rajce.png
-share/icons/hicolor/64x64/actions/rajce.png
+share/icons/hicolor/16x16/apps/kipi-rajce.png
+share/icons/hicolor/32x32/apps/kipi-rajce.png
+share/icons/hicolor/48x48/apps/kipi-rajce.png
+share/icons/hicolor/64x64/apps/kipi-rajce.png
share/kde4/services/kipiplugin_rajceexport.desktop
diff --git a/graphics/kipi-plugin-rawconverter/Makefile b/graphics/kipi-plugin-rawconverter/Makefile
index e1d78bb0203b..2f6e57581883 100644
--- a/graphics/kipi-plugin-rawconverter/Makefile
+++ b/graphics/kipi-plugin-rawconverter/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= rawconverter
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-removeredeyes/Makefile b/graphics/kipi-plugin-removeredeyes/Makefile
index 99b670acc792..5780be4482e8 100644
--- a/graphics/kipi-plugin-removeredeyes/Makefile
+++ b/graphics/kipi-plugin-removeredeyes/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kipi-plugin-${KIPI_PLUGIN}
PORTVERSION= ${DIGIKAM_VER}
-PORTREVISION= 1
CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
@@ -11,6 +10,5 @@ COMMENT= ${${KIPI_PLUGIN}_DESC}
LIB_DEPENDS= libopencv_legacy.so:${PORTSDIR}/graphics/opencv
KIPI_PLUGIN= removeredeyes
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-sendimages/Makefile b/graphics/kipi-plugin-sendimages/Makefile
index d94df3f4efdc..dc58e70b44fa 100644
--- a/graphics/kipi-plugin-sendimages/Makefile
+++ b/graphics/kipi-plugin-sendimages/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= sendimages
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-shwup/Makefile b/graphics/kipi-plugin-shwup/Makefile
index 1dcbc54370f8..64419345d2d3 100644
--- a/graphics/kipi-plugin-shwup/Makefile
+++ b/graphics/kipi-plugin-shwup/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= qca:${PORTSDIR}/devel/qca
+LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca
KIPI_PLUGIN= shwup
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-shwup/pkg-plist b/graphics/kipi-plugin-shwup/pkg-plist
index d5930b1def95..2404fa1a00f8 100644
--- a/graphics/kipi-plugin-shwup/pkg-plist
+++ b/graphics/kipi-plugin-shwup/pkg-plist
@@ -1,7 +1,7 @@
lib/kde4/kipiplugin_shwup.so
share/apps/kipi/kipiplugin_shwupui.rc
-share/icons/hicolor/16x16/actions/shwup.png
-share/icons/hicolor/22x22/actions/shwup.png
-share/icons/hicolor/32x32/actions/shwup.png
-share/icons/hicolor/48x48/actions/shwup.png
+share/icons/hicolor/16x16/apps/kipi-shwup.png
+share/icons/hicolor/22x22/apps/kipi-shwup.png
+share/icons/hicolor/32x32/apps/kipi-shwup.png
+share/icons/hicolor/48x48/apps/kipi-shwup.png
share/kde4/services/kipiplugin_shwup.desktop
diff --git a/graphics/kipi-plugin-smug/Makefile b/graphics/kipi-plugin-smug/Makefile
index 210bab281c35..26a895540ee3 100644
--- a/graphics/kipi-plugin-smug/Makefile
+++ b/graphics/kipi-plugin-smug/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= smug
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-smug/pkg-plist b/graphics/kipi-plugin-smug/pkg-plist
index 0ffc84252161..6b8da7aaa23e 100644
--- a/graphics/kipi-plugin-smug/pkg-plist
+++ b/graphics/kipi-plugin-smug/pkg-plist
@@ -1,8 +1,8 @@
lib/kde4/kipiplugin_smug.so
share/apps/kipi/kipiplugin_smugui.rc
-share/icons/hicolor/16x16/actions/smugmug.png
-share/icons/hicolor/22x22/actions/smugmug.png
-share/icons/hicolor/32x32/actions/smugmug.png
-share/icons/hicolor/48x48/actions/smugmug.png
-share/icons/hicolor/scalable/actions/smugmug.svgz
+share/icons/hicolor/16x16/apps/kipi-smugmug.png
+share/icons/hicolor/22x22/apps/kipi-smugmug.png
+share/icons/hicolor/32x32/apps/kipi-smugmug.png
+share/icons/hicolor/48x48/apps/kipi-smugmug.png
+share/icons/hicolor/scalable/apps/kipi-smugmug.svgz
share/kde4/services/kipiplugin_smug.desktop
diff --git a/graphics/kipi-plugin-timeadjust/Makefile b/graphics/kipi-plugin-timeadjust/Makefile
index fd2272694478..0667bca931b8 100644
--- a/graphics/kipi-plugin-timeadjust/Makefile
+++ b/graphics/kipi-plugin-timeadjust/Makefile
@@ -8,6 +8,5 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= timeadjust
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-timeadjust/pkg-plist b/graphics/kipi-plugin-timeadjust/pkg-plist
index 3dbf9b90a741..a67373e0aca0 100644
--- a/graphics/kipi-plugin-timeadjust/pkg-plist
+++ b/graphics/kipi-plugin-timeadjust/pkg-plist
@@ -1,4 +1,4 @@
lib/kde4/kipiplugin_timeadjust.so
share/apps/kipi/kipiplugin_timeadjustui.rc
-share/icons/hicolor/32x32/actions/timeadjust.png
+share/icons/hicolor/32x32/apps/kipi-timeadjust.png
share/kde4/services/kipiplugin_timeadjust.desktop
diff --git a/graphics/kipi-plugin-videoslideshow/Makefile b/graphics/kipi-plugin-videoslideshow/Makefile
index 77e5a1861cc8..c1ab9668372e 100644
--- a/graphics/kipi-plugin-videoslideshow/Makefile
+++ b/graphics/kipi-plugin-videoslideshow/Makefile
@@ -7,10 +7,9 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= MagickCore:${PORTSDIR}/graphics/ImageMagick \
- QtGStreamer-0.10:${PORTSDIR}/multimedia/gstreamer-qt4
+LIB_DEPENDS= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick \
+ libQtGStreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer-qt4
KIPI_PLUGIN= videoslideshow
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-vkontakte/Makefile b/graphics/kipi-plugin-vkontakte/Makefile
index d348394f88b4..32e1d0bc7645 100644
--- a/graphics/kipi-plugin-vkontakte/Makefile
+++ b/graphics/kipi-plugin-vkontakte/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= kvkontakte:${PORTSDIR}/net/libkvkontakte
+LIB_DEPENDS= libkvkontakte.so:${PORTSDIR}/net/libkvkontakte
KIPI_PLUGIN= vkontakte
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugin-yandexfotki/Makefile b/graphics/kipi-plugin-yandexfotki/Makefile
index 794420546e1c..3deaf6f38448 100644
--- a/graphics/kipi-plugin-yandexfotki/Makefile
+++ b/graphics/kipi-plugin-yandexfotki/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
-LIB_DEPENDS= qca:${PORTSDIR}/devel/qca
+LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca
KIPI_PLUGIN= yandexfotki
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
.include <bsd.port.mk>
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 14dd19f12b2f..51fcda787b29 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -10,11 +10,11 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 kipi graphics plugins (meta port)
.MAKE.FreeBSD_UL= yes
-LATEST_LINK= ${PORTNAME}-kde4
NO_BUILD= yes
+NO_INSTALL= yes
+NO_MTREE= yes
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
OPTIONS_DEFINE= DOCS NLS
@@ -26,21 +26,10 @@ NO_OPTIONS_SORT= yes
.for plugin in ${KIPI_PLUGINS_ALL}
OPTIONS_DEFINE+= ${plugin:U}
${plugin:U}_DESC= ${${plugin}_DESC}
-${plugin:U}_DEP= kipi-plugin-${plugin}>=${DIGIKAM_VER}:${PORTSDIR}/graphics/kipi-plugin-${plugin}
+${plugin:U}_RUN_DEPENDS= kipi-plugin-${plugin}>=${DIGIKAM_VER}:${PORTSDIR}/graphics/kipi-plugin-${plugin}
.endfor
NLS_DEP= digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
DOCS_DEP= digikam-doc>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-doc
-.include <bsd.port.options.mk>
-
-.for opt in ${OPTIONS_DEFINE}
-. if ${PORT_OPTIONS:M${opt}}
-RUN_DEPENDS+= ${${opt}_DEP}
-. endif
-.endfor
-
-do-install:
- ${DO_NADA}
-
.include <bsd.port.mk>
diff --git a/graphics/libkface/Makefile b/graphics/libkface/Makefile
index 04721b05cc34..fee641a26715 100644
--- a/graphics/libkface/Makefile
+++ b/graphics/libkface/Makefile
@@ -2,13 +2,11 @@
PORTNAME= libkface
PORTVERSION= ${DIGIKAM_VER}
-PORTREVISION= 1
CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE4 library for face recognition
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
USES+= pkgconfig
diff --git a/graphics/libkface/pkg-plist b/graphics/libkface/pkg-plist
index 755046849a54..1fe3b8c08fce 100644
--- a/graphics/libkface/pkg-plist
+++ b/graphics/libkface/pkg-plist
@@ -1,15 +1,16 @@
-include/libkface/database.h
-include/libkface/face.h
+include/libkface/dataproviders.h
include/libkface/facedetector.h
-include/libkface/image.h
+include/libkface/identity.h
include/libkface/libkface_export.h
include/libkface/recognitiondatabase.h
include/libkface/version.h
lib/libkface.so
-lib/libkface.so.1
-lib/libkface.so.1.0.0
+lib/libkface.so.2
+lib/libkface.so.2.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
share/apps/libkface/haarcascades/haarcascade_frontalface_alt2.xml
share/apps/libkface/haarcascades/haarcascade_frontalface_alt_tree.xml
@@ -20,5 +21,7 @@ share/apps/libkface/haarcascades/haarcascade_mcs_nose.xml
share/apps/libkface/haarcascades/haarcascade_mcs_righteye.xml
share/apps/libkface/haarcascades/haarcascade_profileface.xml
@dirrm share/apps/libkface/haarcascades
+@dirrm share/apps/libkface/database
+@dirrm share/apps/libkface/alignment-congealing
@dirrm share/apps/libkface
@dirrm include/libkface
diff --git a/graphics/libkipiplugins/Makefile b/graphics/libkipiplugins/Makefile
index c6a78fed14a0..cc3ca19cbe8d 100644
--- a/graphics/libkipiplugins/Makefile
+++ b/graphics/libkipiplugins/Makefile
@@ -8,7 +8,6 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= ${${KIPI_PLUGIN}_DESC}
KIPI_PLUGIN= libkipiplugins
-NO_STAGE= yes
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
USE_KDE4+= libkdcraw libkexiv2 libkipi