1, Restored kamera with a WITH_GPHOTO2 knob that works like the WITH_SANE knob.

That is, it looks for gphoto2-config.
2, pkg-plist changes to go with (1).
3. Changed WITH_SANE= to WITH_SANE?= (and WITH_GPHOTO2 is the same) so that
even if the package is installed you can build kdegraphics without it by
using WITH_SANE=no and/or WITH_GPHOTO2=no.
4. No PR, just request on list and it seemed reasonable.

4 files changed, 72 insertions, 16 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 07007be25070..02fd92036317 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -19,28 +20,45 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--without-kamera --without-imlib-config
 
 .if defined(WITH_IMLIB) || defined(KDE_WITH_IMLIB)
 USE_IMLIB=	yes
 PLIST_SUB+=	IMLIB=""
+CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
 .else
 WITHOUT_IMLIB=	yes
-CONFIGURE_ARGS+=--without-imlib-config
 PLIST_SUB+=	IMLIB="@comment "
+CONFIGURE_ARGS+=	--without-imlib-config
 .endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.pre.mk>
 
-# temporarily disable kamera, it requires gphoto2
+GPHOTO2_CONFIG=	${LOCALBASE}/bin/gphoto2-config
+
+.if exists(${GPHOTO2_CONFIG})
+WITH_GPHOTO2?=	yes
+.endif
+
+.if defined(WITH_GPHOTO2) && ${WITH_GPHOTO2} == yes
+LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/gphoto2
+PLIST_SUB+=	KAMERA=""
+.else
 PLIST_SUB+=	KAMERA="@comment "
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "======================================================="
+	@${ECHO_MSG} "If you want to compile with digital camera support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GPHOTO2=yes\""
+	@${ECHO_MSG} "======================================================="
+	@${ECHO_MSG}
+.endif
 
 SANE_CONFIG=	${LOCALBASE}/bin/sane-config
 
 .if exists(${SANE_CONFIG})
-WITH_SANE=	yes
+WITH_SANE?=	yes
 .endif
 
 .if defined(WITH_SANE) && ${WITH_SANE} == yes
@@ -50,8 +68,10 @@ PLIST_SUB+=	SANE=""
 PLIST_SUB+=	SANE="@comment "
 pre-everything::
 	@${ECHO_MSG}
+	@${ECHO_MSG} "======================================================="
 	@${ECHO_MSG} "If you want to compile with scanner (SANE) support,"
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SANE=yes\""
+	@${ECHO_MSG} "======================================================="
 	@${ECHO_MSG}
 .endif
 
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 2b724619cf88..9866d1cfd5df 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -36,14 +36,14 @@ lib/kde3/kfile_png.la
 lib/kde3/kfile_png.so
 lib/kde3/kfile_ps.la
 lib/kde3/kfile_ps.so
-%%KAMERA%%lib/kio_kamera.la
-%%KAMERA%%lib/kio_kamera.so
+%%KAMERA%%lib/kde3/kio_kamera.la
+%%KAMERA%%lib/kde3/kio_kamera.so
+%%KAMERA%%lib/kde3/libkcm_kamera.la
+%%KAMERA%%lib/kde3/libkcm_kamera.so
 %%IMLIB%%lib/kuickshow.la
 %%IMLIB%%lib/kuickshow.so
 lib/kview.la
 lib/kview.so
-%%KAMERA%%lib/libkcm_kamera.la
-%%KAMERA%%lib/libkcm_kamera.so
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
@@ -233,6 +233,7 @@ share/icons/hicolor/16x16/apps/ksnapshot.png
 %%IMLIB%%share/icons/hicolor/16x16/apps/kuickshow.png
 share/icons/hicolor/16x16/apps/kview.png
 share/icons/hicolor/16x16/apps/kviewshell.png
+%%KAMERA%%share/icons/hicolor/16x16/devices/camera.png
 share/icons/hicolor/32x32/apps/kcoloredit.png
 share/icons/hicolor/32x32/apps/kdvi.png
 share/icons/hicolor/32x32/apps/kfax.png
@@ -244,6 +245,8 @@ share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
 %%IMLIB%%share/icons/hicolor/32x32/apps/kuickshow.png
 share/icons/hicolor/32x32/apps/kview.png
+%%KAMERA%%share/icons/hicolor/32x32/devices/camera.png
+%%KAMERA%%share/icons/hicolor/32x32/filesystems/camera.png
 share/icons/hicolor/32x32/apps/kviewshell.png
 share/icons/hicolor/48x48/apps/kdvi.png
 share/icons/hicolor/48x48/apps/kfax.png
@@ -273,8 +276,11 @@ share/services/kfile_ps.desktop
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
+%%KAMERA%%@dirrm share/icons/hicolor/32x32/filesystems
+%%KAMERA%%@dirrm share/icons/hicolor/32x32/devices
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/32x32
+%%KAMERA%%@dirrm share/icons/hicolor/16x16/devices
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
@@ -315,6 +321,8 @@ share/services/kfile_ps.desktop
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
 @dirrm share/apps
+%%KAMERA%%@dirrm share/applnk/Settings/Peripherals
+%%KAMERA%%@dirrm share/applnk/Settings
 @dirrm share/applnk/Graphics
 @dirrm share/applnk
 @dirrm lib/kde3
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 07007be25070..02fd92036317 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -19,28 +20,45 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--without-kamera --without-imlib-config
 
 .if defined(WITH_IMLIB) || defined(KDE_WITH_IMLIB)
 USE_IMLIB=	yes
 PLIST_SUB+=	IMLIB=""
+CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
 .else
 WITHOUT_IMLIB=	yes
-CONFIGURE_ARGS+=--without-imlib-config
 PLIST_SUB+=	IMLIB="@comment "
+CONFIGURE_ARGS+=	--without-imlib-config
 .endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.pre.mk>
 
-# temporarily disable kamera, it requires gphoto2
+GPHOTO2_CONFIG=	${LOCALBASE}/bin/gphoto2-config
+
+.if exists(${GPHOTO2_CONFIG})
+WITH_GPHOTO2?=	yes
+.endif
+
+.if defined(WITH_GPHOTO2) && ${WITH_GPHOTO2} == yes
+LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/gphoto2
+PLIST_SUB+=	KAMERA=""
+.else
 PLIST_SUB+=	KAMERA="@comment "
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "======================================================="
+	@${ECHO_MSG} "If you want to compile with digital camera support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GPHOTO2=yes\""
+	@${ECHO_MSG} "======================================================="
+	@${ECHO_MSG}
+.endif
 
 SANE_CONFIG=	${LOCALBASE}/bin/sane-config
 
 .if exists(${SANE_CONFIG})
-WITH_SANE=	yes
+WITH_SANE?=	yes
 .endif
 
 .if defined(WITH_SANE) && ${WITH_SANE} == yes
@@ -50,8 +68,10 @@ PLIST_SUB+=	SANE=""
 PLIST_SUB+=	SANE="@comment "
 pre-everything::
 	@${ECHO_MSG}
+	@${ECHO_MSG} "======================================================="
 	@${ECHO_MSG} "If you want to compile with scanner (SANE) support,"
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SANE=yes\""
+	@${ECHO_MSG} "======================================================="
 	@${ECHO_MSG}
 .endif
 
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 2b724619cf88..9866d1cfd5df 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -36,14 +36,14 @@ lib/kde3/kfile_png.la
 lib/kde3/kfile_png.so
 lib/kde3/kfile_ps.la
 lib/kde3/kfile_ps.so
-%%KAMERA%%lib/kio_kamera.la
-%%KAMERA%%lib/kio_kamera.so
+%%KAMERA%%lib/kde3/kio_kamera.la
+%%KAMERA%%lib/kde3/kio_kamera.so
+%%KAMERA%%lib/kde3/libkcm_kamera.la
+%%KAMERA%%lib/kde3/libkcm_kamera.so
 %%IMLIB%%lib/kuickshow.la
 %%IMLIB%%lib/kuickshow.so
 lib/kview.la
 lib/kview.so
-%%KAMERA%%lib/libkcm_kamera.la
-%%KAMERA%%lib/libkcm_kamera.so
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
@@ -233,6 +233,7 @@ share/icons/hicolor/16x16/apps/ksnapshot.png
 %%IMLIB%%share/icons/hicolor/16x16/apps/kuickshow.png
 share/icons/hicolor/16x16/apps/kview.png
 share/icons/hicolor/16x16/apps/kviewshell.png
+%%KAMERA%%share/icons/hicolor/16x16/devices/camera.png
 share/icons/hicolor/32x32/apps/kcoloredit.png
 share/icons/hicolor/32x32/apps/kdvi.png
 share/icons/hicolor/32x32/apps/kfax.png
@@ -244,6 +245,8 @@ share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
 %%IMLIB%%share/icons/hicolor/32x32/apps/kuickshow.png
 share/icons/hicolor/32x32/apps/kview.png
+%%KAMERA%%share/icons/hicolor/32x32/devices/camera.png
+%%KAMERA%%share/icons/hicolor/32x32/filesystems/camera.png
 share/icons/hicolor/32x32/apps/kviewshell.png
 share/icons/hicolor/48x48/apps/kdvi.png
 share/icons/hicolor/48x48/apps/kfax.png
@@ -273,8 +276,11 @@ share/services/kfile_ps.desktop
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
+%%KAMERA%%@dirrm share/icons/hicolor/32x32/filesystems
+%%KAMERA%%@dirrm share/icons/hicolor/32x32/devices
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/32x32
+%%KAMERA%%@dirrm share/icons/hicolor/16x16/devices
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
@@ -315,6 +321,8 @@ share/services/kfile_ps.desktop
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
 @dirrm share/apps
+%%KAMERA%%@dirrm share/applnk/Settings/Peripherals
+%%KAMERA%%@dirrm share/applnk/Settings
 @dirrm share/applnk/Graphics
 @dirrm share/applnk
 @dirrm lib/kde3