4 files changed, 29 insertions, 47 deletions

diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 8fd8edc27538..cd7cea6592b5 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -1,40 +1,31 @@
 # New ports collection makefile for:	kamera
-# Date created:				July 09 2004
-# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+# Date created:				5 September 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kamera
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
-PKGNAMEPREFIX=	kdegraphics-
-DISTNAME=	kdegraphics-${PORTVERSION}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Digital camera support for KDE
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Digital camera manager for KDE 4
 
-LIB_DEPENDS+=	gphoto2:${PORTSDIR}/graphics/libgphoto2
+LATEST_LINK=	${PORTNAME}-kde4
 
-CONFLICTS=	kdegraphics-3.1.* kdegraphics-3.2.[0-3]
+LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
+CONFLICTS=	kdegraphics-4.[0-6].*
 
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus qt3support qmake_build moc_build uic_build rcc_build
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/kdegraphics-${PORTVERSION}
+MAKE_JOBS_SAFE=	yes
 
-pre-configure:
-	${ECHO_CMD} ${PORTNAME} doc > ${WRKSRC}/inst-apps
-	${REINPLACE_CMD} \
-	's|^SUBDIRS =.*${PORTNAME}.*$$|SUBDIRS =\. ${PORTNAME}|g' \
-		${WRKSRC}/doc/Makefile.in
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/graphics/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo
index 8930fac32c47..e6363c278e05 100644
--- a/graphics/kamera-kde4/distinfo
+++ b/graphics/kamera-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdegraphics-3.5.10.tar.bz2) = bdc73fa98008aa64b72636282bf0d83c7bb3e6d4ba1d0831277dda469b57408b
-SIZE (KDE/kdegraphics-3.5.10.tar.bz2) = 7440912
+SHA256 (KDE/kamera-4.7.2.tar.bz2) = f68c8e3150ab7175a239f95375a7c633f5f6d18cdfa145c9762e1e3ab2836ecd
+SIZE (KDE/kamera-4.7.2.tar.bz2) = 38608
diff --git a/graphics/kamera-kde4/pkg-descr b/graphics/kamera-kde4/pkg-descr
index b37891651f55..97e7b570db32 100644
--- a/graphics/kamera-kde4/pkg-descr
+++ b/graphics/kamera-kde4/pkg-descr
@@ -1,3 +1,4 @@
-Kamera is an IO slave and a KControl panel module which allows you to access
-folders and images within any digital camera supported by the upcoming gPhoto2
-libraries. 
+This is a digital camera IO slave for KDE 4 which uses gPhoto2 to
+allow access to your camera pictures with the URL camera:/.
+
+WWW: http://www.kde.org
diff --git a/graphics/kamera-kde4/pkg-plist b/graphics/kamera-kde4/pkg-plist
index 51321f767bbd..08bd4370b5df 100644
--- a/graphics/kamera-kde4/pkg-plist
+++ b/graphics/kamera-kde4/pkg-plist
@@ -1,19 +1,9 @@
-lib/kde3/kcm_kamera.a
-lib/kde3/kcm_kamera.la
-lib/kde3/kcm_kamera.so
-lib/kde3/kio_kamera.a
-lib/kde3/kio_kamera.la
-lib/kde3/kio_kamera.so
-share/applications/kde/kamera.desktop
-share/doc/HTML/en/kamera/common
-share/doc/HTML/en/kamera/index.cache.bz2
-share/doc/HTML/en/kamera/index.docbook
-share/icons/crystalsvg/16x16/actions/camera_test.png
-share/icons/crystalsvg/16x16/apps/camera.png
-share/icons/crystalsvg/16x16/devices/camera.png
-share/icons/crystalsvg/22x22/devices/camera.png
-share/icons/crystalsvg/22x22/filesystems/camera.png
-share/icons/crystalsvg/32x32/devices/camera.png
-share/icons/crystalsvg/32x32/filesystems/camera.png
-share/services/camera.protocol
-@dirrm share/doc/HTML/en/kamera
+lib/kde4/kcm_kamera.so
+lib/kde4/kio_kamera.so
+share/apps/solid/actions/solid_camera.desktop
+share/doc/HTML/en/kcontrol/kamera/common
+share/doc/HTML/en/kcontrol/kamera/index.cache.bz2
+share/doc/HTML/en/kcontrol/kamera/index.docbook
+share/kde4/services/camera.protocol
+share/kde4/services/kamera.desktop
+@dirrm share/doc/HTML/en/kcontrol/kamera