5 files changed, 45 insertions, 35 deletions

diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 5ce4596d1e35..1e08caccef1b 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	KDE2 Graphics
+# New ports collection makefile for:	KDE3 Graphics
 # Date created:				Saturday 2 September 2000
 # Whom:					Will Andrews <will@FreeBSD.org>
 #
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	3.0
-PORTREVISION=	2
+PORTVERSION=	3.0.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -19,18 +18,19 @@ USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--without-kamera
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
-CONFIGURE_ARGS+=--enable-final
-.endif
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
-CONFIGURE_ARGS+=--disable-debug
+CONFIGURE_ARGS+=--without-kamera --without-imlib-config
+
+.if defined(WITH_IMLIB) || defined(KDE_WITH_IMLIB)
+USE_IMLIB=	yes
+PLIST_SUB+=	IMLIB=""
+.else
+WITHOUT_IMLIB=	yes
+CONFIGURE_ARGS+=--without-imlib-config
+PLIST_SUB+=	IMLIB="@comment "
 .endif
 
-LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index a2d9ff6259d8..d8e3f9255b5f 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegraphics-3.0.tar.bz2) = e90e7df47c51c10355b4f034f5e74788
+MD5 (KDE/kdegraphics-3.0.1.tar.bz2) = 9d081640a9524ab64853c2568bb507ec
diff --git a/graphics/kdegraphics4/pkg-comment b/graphics/kdegraphics4/pkg-comment
index 186230f9287d..56b139d3c6b2 100644
--- a/graphics/kdegraphics4/pkg-comment
+++ b/graphics/kdegraphics4/pkg-comment
@@ -1 +1 @@
-Utilities for the KDE integrated X11 desktop
+Graphics utilities for the KDE3 integrated X11 desktop
diff --git a/graphics/kdegraphics4/pkg-descr b/graphics/kdegraphics4/pkg-descr
index 90ae45773bea..76134544da73 100644
--- a/graphics/kdegraphics4/pkg-descr
+++ b/graphics/kdegraphics4/pkg-descr
@@ -1 +1,5 @@
 KDE provides an integrated X11 based environment, much like CDE.
+This particular port installs the graphics and image manipulation
+components of KDE3.
+
+WWW: http://www.kde.org/
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 9a4dc52cde33..5db4f9f378e3 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -9,7 +9,7 @@ bin/kiconedit
 bin/kpaint
 bin/kruler
 bin/ksnapshot
-bin/kuickshow
+%%IMLIB%%bin/kuickshow
 bin/kview
 bin/kviewshell
 %%SANE%%include/devselector.h
@@ -38,8 +38,8 @@ lib/kde3/kfile_ps.la
 lib/kde3/kfile_ps.so
 %%KAMERA%%lib/kio_kamera.la
 %%KAMERA%%lib/kio_kamera.so
-lib/kuickshow.la
-lib/kuickshow.so
+%%IMLIB%%lib/kuickshow.la
+%%IMLIB%%lib/kuickshow.so
 lib/kview.la
 lib/kview.so
 %%KAMERA%%lib/libkcm_kamera.la
@@ -73,7 +73,7 @@ share/applnk/Graphics/kiconedit.desktop
 share/applnk/Graphics/kpaint.desktop
 share/applnk/Graphics/kruler.desktop
 share/applnk/Graphics/ksnapshot.desktop
-share/applnk/Graphics/kuickshow.desktop
+%%IMLIB%%share/applnk/Graphics/kuickshow.desktop
 share/applnk/Graphics/kview.desktop
 %%KAMERA%%share/applnk/Settings/Peripherals/kamera.desktop
 share/apps/kdvi/kdvi_part.rc
@@ -144,16 +144,16 @@ share/apps/kruler/kruler-north.png
 share/apps/kruler/kruler-south.png
 share/apps/kruler/kruler-west.png
 share/apps/kruler/move.wav
-share/apps/kuickshow/im_palette.pal
-share/apps/kuickshow/pics/about.png
-share/apps/kuickshow/pics/calibrate.png
-share/apps/kuickshow/pics/handcursor.png
-share/apps/kuickshow/pics/imageviewer-medium.png
-share/apps/kuickshow/pics/imageviewer-small.png
-share/apps/kuickshow/pics/ksslide.png
-share/apps/kuickshow/pics/kuickshow-day.jpg
-share/apps/kuickshow/pics/kuickshow-night.jpg
-share/apps/kuickshow/pics/logo.png
+%%IMLIB%%share/apps/kuickshow/im_palette.pal
+%%IMLIB%%share/apps/kuickshow/pics/about.png
+%%IMLIB%%share/apps/kuickshow/pics/calibrate.png
+%%IMLIB%%share/apps/kuickshow/pics/handcursor.png
+%%IMLIB%%share/apps/kuickshow/pics/imageviewer-medium.png
+%%IMLIB%%share/apps/kuickshow/pics/imageviewer-small.png
+%%IMLIB%%share/apps/kuickshow/pics/ksslide.png
+%%IMLIB%%share/apps/kuickshow/pics/kuickshow-day.jpg
+%%IMLIB%%share/apps/kuickshow/pics/kuickshow-night.jpg
+%%IMLIB%%share/apps/kuickshow/pics/logo.png
 share/apps/kview/kview_part.rc
 share/apps/kview/kview_popup.rc
 share/apps/kview/kviewui.rc
@@ -230,7 +230,7 @@ share/icons/hicolor/16x16/apps/kiconedit.png
 share/icons/hicolor/16x16/apps/kpaint.png
 share/icons/hicolor/16x16/apps/kruler.png
 share/icons/hicolor/16x16/apps/ksnapshot.png
-share/icons/hicolor/16x16/apps/kuickshow.png
+%%IMLIB%%share/icons/hicolor/16x16/apps/kuickshow.png
 share/icons/hicolor/16x16/apps/kview.png
 share/icons/hicolor/16x16/apps/kviewshell.png
 share/icons/hicolor/32x32/apps/kcoloredit.png
@@ -242,7 +242,7 @@ share/icons/hicolor/32x32/apps/kiconedit.png
 share/icons/hicolor/32x32/apps/kpaint.png
 share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
-share/icons/hicolor/32x32/apps/kuickshow.png
+%%IMLIB%%share/icons/hicolor/32x32/apps/kuickshow.png
 share/icons/hicolor/32x32/apps/kview.png
 share/icons/hicolor/32x32/apps/kviewshell.png
 share/icons/hicolor/48x48/apps/kdvi.png
@@ -256,14 +256,16 @@ share/icons/hicolor/48x48/apps/ksnapshot.png
 share/icons/hicolor/48x48/apps/kview.png
 share/icons/hicolor/48x48/apps/kviewshell.png
 share/icons/locolor/16x16/apps/kcoloredit.png
-share/icons/locolor/16x16/apps/kuickshow.png
+%%IMLIB%%share/icons/locolor/16x16/apps/kuickshow.png
 share/icons/locolor/32x32/apps/kcoloredit.png
-share/icons/locolor/32x32/apps/kuickshow.png
+%%IMLIB%%share/icons/locolor/32x32/apps/kuickshow.png
 %%KAMERA%%share/services/kamera.protocol
 share/services/kfile_pdf.desktop
 share/services/kfile_png.desktop
 share/services/kfile_ps.desktop
 %%SANE%%share/services/scanservice.desktop
+@comment directories
+@dirrm share/services
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/apps
@@ -277,8 +279,8 @@ share/services/kfile_ps.desktop
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kview
-@dirrm share/doc/HTML/en/kuickshow
 @dirrm share/doc/HTML/en/ksnapshot
 @dirrm share/doc/HTML/en/kruler
 @dirrm share/doc/HTML/en/kpaint
@@ -288,12 +290,15 @@ share/services/kfile_ps.desktop
 @dirrm share/doc/HTML/en/kfract
 @dirrm share/doc/HTML/en/kdvi
 @dirrm share/doc/HTML/en/kcoloredit
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
 @dirrm share/apps/kviewshell
 @dirrm share/apps/kviewerpart
 @dirrm share/apps/kview/toolbar
 @dirrm share/apps/kview
-@dirrm share/apps/kuickshow/pics
-@dirrm share/apps/kuickshow
+%%IMLIB%%@dirrm share/apps/kuickshow/pics
+%%IMLIB%%@dirrm share/apps/kuickshow
 @dirrm share/apps/kruler
 @dirrm share/apps/kpaint/toolbar
 @dirrm share/apps/kpaint
@@ -311,3 +316,4 @@ share/services/kfile_ps.desktop
 @dirrm share/apps
 @dirrm share/applnk/Graphics
 @dirrm share/applnk
+@dirrm lib/kde3