6 files changed, 90 insertions, 175 deletions

diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 24348ad762a6..4b4ef73ac0c4 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -1,32 +1,34 @@
 # New ports collection makefile for:	gwenview
-# Date created:		22 Jun 2002
-# Whom:			Stefan Jahn <stefan.jahn@nemesis-sektor.de>
+# Date created:				5 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gwenview
-PORTVERSION=	1.4.2
-PORTREVISION=	9
+PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	graphics kde
-MASTER_SITES=	SF
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An image viewer and browser for the KDE environment
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Image viewer and browser for KDE 4
 
-LIB_DEPENDS=	kipi.2:${PORTSDIR}/graphics/libkipi \
-		exiv2.10:${PORTSDIR}/graphics/exiv2
+LATEST_LINK=	${PORTNAME}-kde4
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool
-
-CONFIGURE_ARGS+=--enable-kipi
+LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+		soprano.4:${PORTSDIR}/textproc/soprano \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
+		kipi.8:${PORTSDIR}/graphics/libkipi-kde4
 
-MAN1=	gwenview.1
+CONFLICTS=	kdegraphics-4.[0-6].*
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+USE_KDE4=	kdehier kdelibs kdeprefix baseapps automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus qmake_build moc_build uic_build rcc_build
+USE_BZIP2=	yes
+MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/gwenview-kde4/distinfo b/graphics/gwenview-kde4/distinfo
index 644085b21532..56555abd1cd0 100644
--- a/graphics/gwenview-kde4/distinfo
+++ b/graphics/gwenview-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gwenview-1.4.2.tar.bz2) = 26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd
-SIZE (gwenview-1.4.2.tar.bz2) = 984977
+SHA256 (KDE/gwenview-4.7.2.tar.bz2) = ba379b0e0c790e5889a7a434d1de73e7bcdb2f31ae44981de7e53ca45f5ccf7e
+SIZE (KDE/gwenview-4.7.2.tar.bz2) = 1975048
diff --git a/graphics/gwenview-kde4/files/patch-src_gvcore_pngformattype.cpp b/graphics/gwenview-kde4/files/patch-src_gvcore_pngformattype.cpp
deleted file mode 100644
index a7c10d008337..000000000000
--- a/graphics/gwenview-kde4/files/patch-src_gvcore_pngformattype.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gvcore/pngformattype.cpp.orig	2007-09-15 15:46:13.000000000 +0200
-+++ src/gvcore/pngformattype.cpp	2010-03-30 10:12:59.000000000 +0200
-@@ -245,7 +245,7 @@
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr->trans_color.gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -273,7 +273,7 @@
- 		    info_ptr->palette[i].red,
- 		    info_ptr->palette[i].green,
- 		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr->trans_alpha[i]
- 		    )
- 		);
- 		i++;
diff --git a/graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp b/graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp
deleted file mode 100644
index 48943654ed68..000000000000
--- a/graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/imageutils/jpegcontent.cpp.orig	2007-09-15 19:46:17.000000000 +0600
-+++ src/imageutils/jpegcontent.cpp	2009-01-09 14:24:04.000000000 +0500
-@@ -589,7 +589,8 @@
- QImage JPEGContent::thumbnail() const {
- 	QImage image;
- 	if (!d->mExifData.empty()) {
--		Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
-+		Exiv2::ExifThumbC thumb(d->mExifData);
-+		Exiv2::DataBuf const thumbnail = thumb.copy();
- 		image.loadFromData(thumbnail.pData_, thumbnail.size_);
- 	}
- 	return image;
-@@ -611,7 +612,8 @@
- 		return;
- 	}
- 	
--	d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
-+	Exiv2::ExifThumb thumb(d->mExifData);
-+	thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
- }
- 
- 
diff --git a/graphics/gwenview-kde4/pkg-descr b/graphics/gwenview-kde4/pkg-descr
index 824634580601..3d866d438756 100644
--- a/graphics/gwenview-kde4/pkg-descr
+++ b/graphics/gwenview-kde4/pkg-descr
@@ -1,7 +1,43 @@
-Gwenview is a simple image viewer which offers
-a folder tree window and a file list window for
-navigating easily through your image file
-heirarchy. It supports all image formats your
-KDE installation supports.
+Gwenview is an image viewer for KDE.
+
+IMAGE VIEWING
+Gwenview can load and save all image formats supported by KDE. It
+correctly displays images with alpha channel, using the traditionnal
+checker board as a background to reveal transparency. Gwenview lets
+you accurately control the way images are scaled: you can zoom in and
+out or automatically scale the image to fit the window. Zoom is locked
+so that you can easily compare images by going back and forth. When
+browsing JPEG images with EXIF information, Gwenview automatically
+rotates them according to the EXIF orientation tag. It can show image
+properties and image specific meta-information like Dolphin does. It
+knows about animated images like MNG or GIF and is also capable of
+displaying vector images in SVG format as well as playing videos.
+
+IMAGE MANIPULATIONS
+Gwenview does not try to replace your favorite image editor, so it
+only features simple image manipulations: rotation, mirroring,
+cropping, resizing and red eye reduction. When working with JPEG
+files, Gwenview performs lossless manipulations.
+
+BROWSING YOUR COLLECTIONS OF IMAGES
+Gwenview features the necessary file management operations: copy,
+move, delete, rename and drag 'n' drop images. It has full support for
+KIO slaves: you can browse FTP/Windows shares, go into tarballs or zip
+files.
+
+PRESENTING YOUR IMAGES
+The fullscreen with optional thumbnail bar and the simple built-in
+slide show allows you to present images the way you want them to show.
+
+THE INTERFACE
+Gwenview features a browse mode to get a quick overview of images in a
+folder and a view mode to go through one image at a time. The view
+mode can also display a thumbnail bar.
+
+KPARTS
+Gwenview can be used both as a standalone application and embedded in
+other KDE applications through the KPart system. For example, thanks
+to Gwenview image KPart, Konqueror can display images using Gwneview,
+letting you zoom in and out as well as rotate it.
 
 WWW: http://gwenview.sourceforge.net
diff --git a/graphics/gwenview-kde4/pkg-plist b/graphics/gwenview-kde4/pkg-plist
index a7f6feaf4b09..428159e8cb2e 100644
--- a/graphics/gwenview-kde4/pkg-plist
+++ b/graphics/gwenview-kde4/pkg-plist
@@ -1,126 +1,45 @@
 bin/gwenview
-lib/kde3/gwenview.a
-lib/kde3/gwenview.la
-lib/kde3/gwenview.so
-lib/kde3/libgvdirpart.a
-lib/kde3/libgvdirpart.la
-lib/kde3/libgvdirpart.so
-lib/kde3/libgvimagepart.a
-lib/kde3/libgvimagepart.la
-lib/kde3/libgvimagepart.so
-lib/libgwenviewcore.a
-lib/libgwenviewcore.la
-lib/libgwenviewcore.so
-lib/libgwenviewcore.so.1
-lib/libkdeinit_gwenview.a
-lib/libkdeinit_gwenview.la
-lib/libkdeinit_gwenview.so
-share/applications/kde/gwenview.desktop
-share/apps/gvdirpart/gvdirpart.rc
-share/apps/gvimagepart/gvimagepart.rc
-share/apps/gvimagepart/gvimagepartpopup.rc
+bin/gwenview_importer
+lib/kde4/gvpart.so
+lib/libgwenviewlib.so
+lib/libgwenviewlib.so.5
+lib/libgwenviewlib.so.5.0.1
+share/applications/kde4/gwenview.desktop
+share/apps/gvpart/gvpart.rc
 share/apps/gwenview/cursors/zoom.png
+share/apps/gwenview/fullscreenthemes/blackglass/checked.png
+share/apps/gwenview/fullscreenthemes/blackglass/scroll-left.png
+share/apps/gwenview/fullscreenthemes/blackglass/scroll-right.png
+share/apps/gwenview/fullscreenthemes/blackglass/style.css
 share/apps/gwenview/gwenviewui.rc
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd1.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd2.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd3.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd4.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd5.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd6.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd7.png
-share/apps/gwenview/icons/hicolor/16x16/actions/dnd8.png
-share/apps/gwenview/icons/hicolor/16x16/actions/flip.png
-share/apps/gwenview/icons/hicolor/16x16/actions/mirror.png
-share/apps/gwenview/icons/hicolor/16x16/actions/rotate_left.png
-share/apps/gwenview/icons/hicolor/16x16/actions/rotate_right.png
-share/apps/gwenview/icons/hicolor/16x16/actions/slideshow_pause.png
-share/apps/gwenview/icons/hicolor/16x16/actions/slideshow_play.png
-share/apps/gwenview/icons/hicolor/22x22/actions/flip.png
-share/apps/gwenview/icons/hicolor/22x22/actions/mirror.png
-share/apps/gwenview/icons/hicolor/22x22/actions/rotate_left.png
-share/apps/gwenview/icons/hicolor/22x22/actions/rotate_right.png
-share/apps/gwenview/icons/hicolor/22x22/actions/slideshow_pause.png
-share/apps/gwenview/icons/hicolor/22x22/actions/slideshow_play.png
-share/apps/gwenview/icons/hicolor/32x32/actions/flip.png
-share/apps/gwenview/icons/hicolor/32x32/actions/mirror.png
-share/apps/gwenview/icons/hicolor/32x32/actions/rotate_left.png
-share/apps/gwenview/icons/hicolor/32x32/actions/rotate_right.png
-share/apps/gwenview/icons/hicolor/32x32/actions/slideshow_pause.png
-share/apps/gwenview/icons/hicolor/32x32/actions/slideshow_play.png
-share/apps/gwenview/icons/hicolor/48x48/actions/flip.png
-share/apps/gwenview/icons/hicolor/48x48/actions/mirror.png
-share/apps/gwenview/icons/hicolor/48x48/actions/rotate_left.png
-share/apps/gwenview/icons/hicolor/48x48/actions/rotate_right.png
-share/apps/gwenview/icons/hicolor/48x48/actions/slideshow_pause.png
-share/apps/gwenview/icons/hicolor/48x48/actions/slideshow_play.png
-share/apps/gwenview/icons/hicolor/scalable/actions/slideshow_pause.svgz
-share/apps/gwenview/icons/hicolor/scalable/actions/slideshow_play.svgz
-share/apps/gwenview/thumbnail/wait.png
-share/apps/gwenview/tools/gimp.desktop
-share/apps/gwenview/tools/kolourpaint.desktop
-share/apps/gwenview/tools/konqueror.desktop
-share/apps/gwenview/tools/tiledwallpaper.desktop
-share/apps/gwenview/tools/wallpaper.desktop
-share/apps/kconf_update/gwenview_1.4_osdformat.sh
-share/apps/kconf_update/gwenview_1.4_osdformat.upd
-share/apps/kconf_update/gwenview_thumbnail_size.sh
-share/apps/kconf_update/gwenview_thumbnail_size.upd
-share/apps/konqueror/servicemenus/konqgwenview.desktop
-share/config.kcfg/fileoperationconfig.kcfg
-share/config.kcfg/fileviewconfig.kcfg
-share/config.kcfg/fullscreenconfig.kcfg
-share/config.kcfg/gvdirpartconfig.kcfg
-share/config.kcfg/imageviewconfig.kcfg
-share/config.kcfg/miscconfig.kcfg
-share/config.kcfg/slideshowconfig.kcfg
+share/apps/solid/actions/gwenview_importer.desktop
+share/apps/solid/actions/gwenview_importer_camera.desktop
 share/doc/HTML/en/gwenview/browse_mode.png
 share/doc/HTML/en/gwenview/common
-share/doc/HTML/en/gwenview/dock_grip.png
-share/doc/HTML/en/gwenview/docked_windows.docbook
-share/doc/HTML/en/gwenview/external_tools.docbook
-share/doc/HTML/en/gwenview/external_tools_dialog.png
+share/doc/HTML/en/gwenview/fullscreen_mode.png
+share/doc/HTML/en/gwenview/importer.png
 share/doc/HTML/en/gwenview/index.cache.bz2
 share/doc/HTML/en/gwenview/index.docbook
-share/doc/HTML/en/gwenview/interface.docbook
-share/doc/HTML/en/gwenview/introduction.docbook
-share/doc/HTML/en/gwenview/keybindings.docbook
-share/doc/HTML/en/gwenview/mouse.docbook
 share/doc/HTML/en/gwenview/view_mode.png
-share/icons/crystalsvg/16x16/apps/gvdirpart.png
-share/icons/crystalsvg/22x22/apps/gvdirpart.png
-share/icons/crystalsvg/32x32/apps/gvdirpart.png
-share/icons/crystalsvg/scalable/apps/gvdirpart.svg
+share/icons/hicolor/128x128/actions/document-share.png
 share/icons/hicolor/128x128/apps/gwenview.png
-share/icons/hicolor/16x16/apps/gvdirpart.png
+share/icons/hicolor/16x16/actions/document-share.png
 share/icons/hicolor/16x16/apps/gwenview.png
-share/icons/hicolor/22x22/apps/gvdirpart.png
+share/icons/hicolor/22x22/actions/document-share.png
 share/icons/hicolor/22x22/apps/gwenview.png
-share/icons/hicolor/32x32/apps/gvdirpart.png
+share/icons/hicolor/32x32/actions/document-share.png
 share/icons/hicolor/32x32/apps/gwenview.png
+share/icons/hicolor/48x48/actions/document-share.png
 share/icons/hicolor/48x48/apps/gwenview.png
+share/icons/hicolor/64x64/actions/document-share.png
 share/icons/hicolor/64x64/apps/gwenview.png
-share/icons/hicolor/scalable/apps/gvdirpart.svg
+share/icons/hicolor/scalable/actions/document-share.svgz
 share/icons/hicolor/scalable/apps/gwenview.svgz
-share/services/gvdirpart.desktop
-share/services/gvimagepart.desktop
+share/kde4/services/ServiceMenus/slideshow.desktop
+share/kde4/services/gvpart.desktop
 @dirrm share/doc/HTML/en/gwenview
-@dirrmtry share/apps/kconf_update
-@dirrm share/apps/gwenview/tools
-@dirrm share/apps/gwenview/thumbnail
-@dirrm share/apps/gwenview/icons/hicolor/scalable/actions
-@dirrm share/apps/gwenview/icons/hicolor/scalable
-@dirrm share/apps/gwenview/icons/hicolor/48x48/actions
-@dirrm share/apps/gwenview/icons/hicolor/48x48
-@dirrm share/apps/gwenview/icons/hicolor/32x32/actions
-@dirrm share/apps/gwenview/icons/hicolor/32x32
-@dirrm share/apps/gwenview/icons/hicolor/22x22/actions
-@dirrm share/apps/gwenview/icons/hicolor/22x22
-@dirrm share/apps/gwenview/icons/hicolor/16x16/actions
-@dirrm share/apps/gwenview/icons/hicolor/16x16
-@dirrm share/apps/gwenview/icons/hicolor
-@dirrm share/apps/gwenview/icons
+@dirrm share/apps/gwenview/fullscreenthemes/blackglass
+@dirrm share/apps/gwenview/fullscreenthemes
 @dirrm share/apps/gwenview/cursors
 @dirrm share/apps/gwenview
-@dirrm share/apps/gvimagepart
-@dirrm share/apps/gvdirpart
-@dirrmtry share/applications/kde
+@dirrm share/apps/gvpart