Lo and behold, welcome KDE 2.1 to our ports tree. As a direct result of

the KDE team's excellent work, I am initiating burn sequence for KDE
1.x.  All base KDE1 ports are hereby nuked.  I am also reluctantly
reassuming maintainership of the KDE2 ports.  Official KDE 2.1 packages
built for FreeBSD 4.2-STABLE w/ XFree86 4.0.2 are available on KDE's
official ftp mirrors now.  Enjoy!

Note:  It seems that the KDE people rerolled their kdelibs and kdebase
packages, and a quick examination of diffs reveal minor changes, but the
port should still work.  I'll fix the packaging problems that bento runs
into.

Approved by:	kevlo

4 files changed, 232 insertions, 40 deletions

diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index b9f2613c67bd..fc87f1816cb6 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 4821550eec63..a61e71638f8d 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-2.0.1.tar.bz2) = e9d1123f47f9b092a02818f125cdc824
+MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33
diff --git a/graphics/kdegraphics4/files/patch-kfax.cpp b/graphics/kdegraphics4/files/patch-kfax.cpp
deleted file mode 100644
index 4bdb092f1459..000000000000
--- a/graphics/kdegraphics4/files/patch-kfax.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- kfax/kfax.cpp.orig	Fri Dec  1 13:48:29 2000
-+++ kfax/kfax.cpp	Fri Dec  1 13:51:10 2000
-@@ -46,6 +46,7 @@
- #include <kmessagebox.h>
- #include <kcmdlineargs.h>
- #include <kio/netaccess.h>
-+#include <ktempfile.h>
- 
- #include "kfax.h"
- #include "kfax.moc"
-@@ -994,14 +995,12 @@
-       if(defaultpage.expander ==  g31expand)
- 	faxtype = 31;
- 
-+      KTempFile tmpFile;
-+      tmpFile.setAutoDelete(true);
- 
--      QString tempfile;
--      tempfile = tmpnam(NULL);
-+      fax2tiffmain(pn->pathname,QFile::encodeName(tmpFile.name()),pn->lsbfirst,pn->vres?0:1,faxtype);
- 
--      fax2tiffmain(pn->pathname,tempfile.ascii(),pn->lsbfirst,pn->vres?0:1,faxtype);
--      fax2psmain(tempfile.ascii(),psfile,width,height,pi.scale);
--
--      remove(tempfile.ascii());
-+      fax2psmain(QFile::encodeName(tmpFile.name()),psfile,width,height,pi.scale);
- 
-     }
- 
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 292fb8ed59f1..57aafc2a2140 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -2,10 +2,15 @@ bin/kdvi
 bin/kfax
 bin/kfract
 bin/kghostview
+bin/kiconedit
+bin/kpaint
 bin/kpixmap2bitmap
+bin/kruler
 bin/ksnapshot
 bin/kview
 bin/kviewshell
+bin/pixie
+include/ifplugin.h
 include/mini-magick/animate.h
 include/mini-magick/api.h
 include/mini-magick/blob.h
@@ -27,9 +32,6 @@ include/mini-magick/utility.h
 include/mini-magick/version.h
 lib/kview.la
 lib/kview.so
-lib/libbaglayout.la
-lib/libbaglayout.so
-lib/libbaglayout.so.0
 lib/libkdvi.la
 lib/libkdvi.so
 lib/libkfax.la
@@ -37,6 +39,15 @@ lib/libkfax.so
 lib/libkghostview.la
 lib/libkghostview.so
 lib/libkghostview.so.1
+lib/libkif_kdeeffects.la
+lib/libkif_kdeeffects.so
+lib/libkif_kdeeffects.so.1
+lib/libkif_magick.la
+lib/libkif_magick.so
+lib/libkif_magick.so.1
+lib/libkifplugin.la
+lib/libkifplugin.so
+lib/libkifplugin.so.3
 lib/libkmultipage.la
 lib/libkmultipage.so
 lib/libkmultipage.so.0
@@ -49,13 +60,23 @@ lib/libkviewpart.so
 lib/libminimagick.la
 lib/libminimagick.so
 lib/libminimagick.so.5
+lib/libpixie_color.la
+lib/libpixie_color.so
+lib/libpixie_color.so.1
+lib/libpixie_thumb.la
+lib/libpixie_thumb.so
+lib/libpixie_thumb.so.1
 share/applnk/Graphics/kdvi.desktop
 share/applnk/Graphics/kfax.desktop
 share/applnk/Graphics/kfract.desktop
 share/applnk/Graphics/kghostview.desktop
+share/applnk/Graphics/kiconedit.desktop
+share/applnk/Graphics/kpaint.desktop
 share/applnk/Graphics/kpixmap2bitmap.desktop
+share/applnk/Graphics/kruler.desktop
 share/applnk/Graphics/ksnapshot.desktop
 share/applnk/Graphics/kview.desktop
+share/applnk/Graphics/pixie.desktop
 share/apps/kdvi/kdvi_part.rc
 share/apps/kdvi/toolbar/forwpage.xpm
 share/apps/kdvi/toolbar/largetext.xpm
@@ -66,11 +87,83 @@ share/apps/kfax/pics/kfaxlogo.xpm
 share/apps/kfract/kfract.rc
 share/apps/kghostview/kghostviewui.rc
 share/apps/kghostview/kgv_part.rc
+share/apps/kiconedit/pics/compressed.png
+share/apps/kiconedit/pics/source.png
+share/apps/kiconedit/pics/standard.png
+share/apps/kiconedit/toolbar/aim-cursor.xpm
+share/apps/kiconedit/toolbar/aim.png
+share/apps/kiconedit/toolbar/areaselect.png
+share/apps/kiconedit/toolbar/circle.png
+share/apps/kiconedit/toolbar/ellipse.png
+share/apps/kiconedit/toolbar/eraser-cursor.xpm
+share/apps/kiconedit/toolbar/fileclose.png
+share/apps/kiconedit/toolbar/filledcircle.png
+share/apps/kiconedit/toolbar/filledellipse.png
+share/apps/kiconedit/toolbar/filledrectangle.png
+share/apps/kiconedit/toolbar/flood-cursor.xpm
+share/apps/kiconedit/toolbar/flood.png
+share/apps/kiconedit/toolbar/grayscale.png
+share/apps/kiconedit/toolbar/grid.png
+share/apps/kiconedit/toolbar/kdepalette.png
+share/apps/kiconedit/toolbar/line.png
+share/apps/kiconedit/toolbar/newwin.png
+share/apps/kiconedit/toolbar/paintbrush-cursor.xpm
+share/apps/kiconedit/toolbar/paintbrush.png
+share/apps/kiconedit/toolbar/pointer.png
+share/apps/kiconedit/toolbar/rectangle.png
+share/apps/kiconedit/toolbar/selectcircle.png
+share/apps/kiconedit/toolbar/selectrect.png
+share/apps/kiconedit/toolbar/spraycan-cursor.xpm
+share/apps/kiconedit/toolbar/spraycan.png
+share/apps/kiconedit/toolbar/transform.png
+share/apps/kpaint/kpaint.rc
+share/apps/kpaint/toolbar/areaselect.xpm
+share/apps/kpaint/toolbar/brush.xpm
+share/apps/kpaint/toolbar/circle.xpm
+share/apps/kpaint/toolbar/ellipse.xpm
+share/apps/kpaint/toolbar/largetext.xpm
+share/apps/kpaint/toolbar/line.xpm
+share/apps/kpaint/toolbar/pen.xpm
+share/apps/kpaint/toolbar/rectangle.xpm
+share/apps/kpaint/toolbar/roundangle.xpm
+share/apps/kpaint/toolbar/spraycan.xpm
+share/apps/kruler/kruler-east.png
+share/apps/kruler/kruler-north.png
+share/apps/kruler/kruler-south.png
+share/apps/kruler/kruler-west.png
 share/apps/kview/kview_part.rc
+share/apps/kview/kview_popup.rc
+share/apps/kview/kviewui.rc
 share/apps/kview/toolbar/rotate.png
 share/apps/kviewerpart/kviewerpart.rc
 share/apps/kviewshell/kviewshell.rc
 share/apps/kviewshell/paper-formats
+share/apps/pixie/dec2.png
+share/apps/pixie/dec2high.png
+share/apps/pixie/inc2.png
+share/apps/pixie/inc2high.png
+share/apps/pixie/logo.png
+share/apps/pixie/plugins/kdeeffects.desktop
+share/apps/pixie/plugins/magick.desktop
+share/apps/pixie/progress1.png
+share/apps/pixie/progress2.png
+share/apps/pixie/thumbwallpaper.png
+share/apps/pixie/toolbar/back.png
+share/apps/pixie/toolbar/brightness+.png
+share/apps/pixie/toolbar/brightness-.png
+share/apps/pixie/toolbar/contrast+.png
+share/apps/pixie/toolbar/contrast-.png
+share/apps/pixie/toolbar/fliph.png
+share/apps/pixie/toolbar/flipv.png
+share/apps/pixie/toolbar/forward.png
+share/apps/pixie/toolbar/kwin.png
+share/apps/pixie/toolbar/mini-ray.png
+share/apps/pixie/toolbar/mini-run.png
+share/apps/pixie/toolbar/play.png
+share/apps/pixie/toolbar/scaledown.png
+share/apps/pixie/toolbar/scaleup.png
+share/apps/pixie/toolbar/stop.png
+share/apps/pixie/toolbar/thumb.png
 share/doc/HTML/en/kdvi/.anchors
 share/doc/HTML/en/kdvi/KDVI-features.dvi
 share/doc/HTML/en/kdvi/KDVI-features.tex
@@ -110,6 +203,7 @@ share/doc/HTML/en/kfax/themenuentries.html
 share/doc/HTML/en/kfax/view.html
 share/doc/HTML/en/kfract/.anchors
 share/doc/HTML/en/kfract/common
+share/doc/HTML/en/kfract/credits-and-license.html
 share/doc/HTML/en/kfract/index.cvlog
 share/doc/HTML/en/kfract/index.docbook
 share/doc/HTML/en/kfract/index.html
@@ -146,75 +240,202 @@ share/doc/HTML/en/kghostview/tool-bar.html
 share/doc/HTML/en/kghostview/tutorial.html
 share/doc/HTML/en/kghostview/view-control.html
 share/doc/HTML/en/kghostview/view.html
+share/doc/HTML/en/kiconedit/.anchors
+share/doc/HTML/en/kiconedit/common
+share/doc/HTML/en/kiconedit/compilation-and-installation.html
+share/doc/HTML/en/kiconedit/configuration.html
+share/doc/HTML/en/kiconedit/edit.html
+share/doc/HTML/en/kiconedit/grid.html
+share/doc/HTML/en/kiconedit/help.html
+share/doc/HTML/en/kiconedit/index.cvlog
+share/doc/HTML/en/kiconedit/index.docbook
+share/doc/HTML/en/kiconedit/index.html
+share/doc/HTML/en/kiconedit/installation.html
+share/doc/HTML/en/kiconedit/introduction.html
+share/doc/HTML/en/kiconedit/onscreenfundamentals.html
+share/doc/HTML/en/kiconedit/options.html
+share/doc/HTML/en/kiconedit/requirements.html
+share/doc/HTML/en/kiconedit/statusbar.html
+share/doc/HTML/en/kiconedit/themenuentries.html
+share/doc/HTML/en/kiconedit/tools-toolbar.html
+share/doc/HTML/en/kiconedit/tools.html
+share/doc/HTML/en/kiconedit/view.html
+share/doc/HTML/en/kpaint/.anchors
+share/doc/HTML/en/kpaint/Technic.png
+share/doc/HTML/en/kpaint/common
+share/doc/HTML/en/kpaint/index.cvlog
+share/doc/HTML/en/kpaint/index.docbook
+share/doc/HTML/en/kpaint/index.html
+share/doc/HTML/en/kpaint/introductiongraphicfilereftechnicpnggraphic.html
+share/doc/HTML/en/kpaint/planned-features.html
 share/doc/HTML/en/ksnapshot/.anchors
 share/doc/HTML/en/ksnapshot/additional-features.html
 share/doc/HTML/en/ksnapshot/common
+share/doc/HTML/en/ksnapshot/compilation-installation.html
 share/doc/HTML/en/ksnapshot/credits.html
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/index.html
 share/doc/HTML/en/ksnapshot/installation.html
 share/doc/HTML/en/ksnapshot/introduction.html
 share/doc/HTML/en/ksnapshot/preview.png
+share/doc/HTML/en/ksnapshot/requirements.html
 share/doc/HTML/en/ksnapshot/taking-snapshot.html
 share/doc/HTML/en/ksnapshot/using-ksapshot.html
+share/doc/HTML/en/ksnapshot/window.png
 share/doc/HTML/en/kview/.anchors
-share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/cluttering-desktop.html
+share/doc/HTML/en/kview/command-line.html
+share/doc/HTML/en/kview/commands.html
 share/doc/HTML/en/kview/common
-share/doc/HTML/en/kview/how.html
-share/doc/HTML/en/kview/index.cvlog
+share/doc/HTML/en/kview/credits.html
+share/doc/HTML/en/kview/desktop-menu.html
+share/doc/HTML/en/kview/edit-menu.html
+share/doc/HTML/en/kview/filter-menu.html
+share/doc/HTML/en/kview/help-menu.html
+share/doc/HTML/en/kview/images-menu.html
 share/doc/HTML/en/kview/index.docbook
 share/doc/HTML/en/kview/index.html
+share/doc/HTML/en/kview/installation.html
 share/doc/HTML/en/kview/introduction.html
-share/doc/HTML/en/kview/notes.html
-share/doc/HTML/en/kview/what.html
+share/doc/HTML/en/kview/requirements.html
+share/doc/HTML/en/kview/sample-session.html
+share/doc/HTML/en/kview/selection.html
+share/doc/HTML/en/kview/settings-menu.html
+share/doc/HTML/en/kview/snapshot1.png
+share/doc/HTML/en/kview/snapshot2.png
+share/doc/HTML/en/kview/snapshot3.png
+share/doc/HTML/en/kview/snapshot4.png
+share/doc/HTML/en/kview/snapshot5.png
+share/doc/HTML/en/kview/snapshot6.png
+share/doc/HTML/en/kview/snapshot7.png
+share/doc/HTML/en/kview/snapshot8.png
+share/doc/HTML/en/kview/snapshot9.png
+share/doc/HTML/en/kview/stirring-paste.html
+share/doc/HTML/en/kview/transform-menu.html
+share/doc/HTML/en/kview/view-menu.html
 share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/clone.png
+share/doc/HTML/en/pixie/command-line-options.html
 share/doc/HTML/en/pixie/common
+share/doc/HTML/en/pixie/compilation.html
+share/doc/HTML/en/pixie/configure.html
+share/doc/HTML/en/pixie/copy-paste.png
+share/doc/HTML/en/pixie/credits.html
+share/doc/HTML/en/pixie/drag-and-drop.html
+share/doc/HTML/en/pixie/edit-advanced.html
+share/doc/HTML/en/pixie/edit-basics.html
+share/doc/HTML/en/pixie/effects.html
+share/doc/HTML/en/pixie/file.html
+share/doc/HTML/en/pixie/getting-started.html
+share/doc/HTML/en/pixie/help.html
+share/doc/HTML/en/pixie/hotlist.png
+share/doc/HTML/en/pixie/image-edit.png
+share/doc/HTML/en/pixie/image-size.png
+share/doc/HTML/en/pixie/ind-color-edit.png
 share/doc/HTML/en/pixie/index.docbook
 share/doc/HTML/en/pixie/index.html
+share/doc/HTML/en/pixie/installation.html
 share/doc/HTML/en/pixie/introduction.html
+share/doc/HTML/en/pixie/key-bindings.html
+share/doc/HTML/en/pixie/new-win.png
+share/doc/HTML/en/pixie/open-save-print.png
+share/doc/HTML/en/pixie/open.png
+share/doc/HTML/en/pixie/options.png
+share/doc/HTML/en/pixie/pixie.png
+share/doc/HTML/en/pixie/reload.png
+share/doc/HTML/en/pixie/requirements.html
+share/doc/HTML/en/pixie/scale.png
+share/doc/HTML/en/pixie/screenshot.png
+share/doc/HTML/en/pixie/sharp-bright.png
+share/doc/HTML/en/pixie/startup.png
+share/doc/HTML/en/pixie/stop.png
+share/doc/HTML/en/pixie/thumb-fm.png
+share/doc/HTML/en/pixie/thumbgen.png
+share/doc/HTML/en/pixie/thumbnails.png
+share/doc/HTML/en/pixie/thumbs-preview.png
+share/doc/HTML/en/pixie/thumbs-update.png
+share/doc/HTML/en/pixie/toggle.png
+share/doc/HTML/en/pixie/toolbar-menu-entries.html
+share/doc/HTML/en/pixie/windows.html
+share/icons/hicolor/16x16/apps/kruler.png
 share/icons/hicolor/32x32/apps/kdvi.png
 share/icons/hicolor/32x32/apps/kfax.png
 share/icons/hicolor/32x32/apps/kfract.png
 share/icons/hicolor/32x32/apps/kghostview.png
+share/icons/hicolor/32x32/apps/kiconedit.png
+share/icons/hicolor/32x32/apps/kpaint.png
 share/icons/hicolor/32x32/apps/kpixmap2bitmap.png
+share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
 share/icons/hicolor/32x32/apps/kview.png
+share/icons/hicolor/32x32/apps/pixie.png
 share/icons/hicolor/48x48/apps/kdvi.png
 share/icons/hicolor/48x48/apps/kfax.png
 share/icons/hicolor/48x48/apps/kfract.png
 share/icons/hicolor/48x48/apps/kghostview.png
+share/icons/hicolor/48x48/apps/kiconedit.png
+share/icons/hicolor/48x48/apps/kpaint.png
 share/icons/hicolor/48x48/apps/kpixmap2bitmap.png
+share/icons/hicolor/48x48/apps/kruler.png
 share/icons/hicolor/48x48/apps/ksnapshot.png
 share/icons/hicolor/48x48/apps/kview.png
+share/icons/hicolor/48x48/apps/pixie.png
 share/icons/locolor/16x16/apps/kdvi.png
 share/icons/locolor/16x16/apps/kfax.png
 share/icons/locolor/16x16/apps/kfract.png
 share/icons/locolor/16x16/apps/kghostview.png
+share/icons/locolor/16x16/apps/kiconedit.png
+share/icons/locolor/16x16/apps/kpaint.png
 share/icons/locolor/16x16/apps/kpixmap2bitmap.png
+share/icons/locolor/16x16/apps/kruler.png
 share/icons/locolor/16x16/apps/ksnapshot.png
 share/icons/locolor/16x16/apps/kview.png
+share/icons/locolor/16x16/apps/pixie.png
 share/icons/locolor/32x32/apps/kdvi.png
 share/icons/locolor/32x32/apps/kfax.png
 share/icons/locolor/32x32/apps/kfract.png
 share/icons/locolor/32x32/apps/kghostview.png
+share/icons/locolor/32x32/apps/kiconedit.png
+share/icons/locolor/32x32/apps/kpaint.png
 share/icons/locolor/32x32/apps/kpixmap2bitmap.png
+share/icons/locolor/32x32/apps/kruler.png
 share/icons/locolor/32x32/apps/ksnapshot.png
 share/icons/locolor/32x32/apps/kview.png
+share/icons/locolor/32x32/apps/pixie.png
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/pixie
 @dirrm share/doc/HTML/en/kview
 @dirrm share/doc/HTML/en/ksnapshot
+@dirrm share/doc/HTML/en/kpaint
+@dirrm share/doc/HTML/en/kiconedit
 @dirrm share/doc/HTML/en/kghostview
 @dirrm share/doc/HTML/en/kfract
 @dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
+@dirrm share/doc/HTML/en
+@dirrm share/apps/pixie/toolbar
+@dirrm share/apps/pixie/plugins
+@dirrm share/apps/pixie
 @dirrm share/apps/kviewshell
 @dirrm share/apps/kviewerpart
 @dirrm share/apps/kview/toolbar
 @dirrm share/apps/kview
+@dirrm share/apps/kruler
+@dirrm share/apps/kpaint/toolbar
+@dirrm share/apps/kpaint
+@dirrm share/apps/kiconedit/toolbar
+@dirrm share/apps/kiconedit/pics
+@dirrm share/apps/kiconedit
 @dirrm share/apps/kghostview
 @dirrm share/apps/kfract
 @dirrm share/apps/kfax/pics
 @dirrm share/apps/kfax
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
+@dirrm share/apps
+@dirrm share/applnk/Graphics
 @dirrm include/mini-magick