Please welcome Qt3/KDE3 to our ports tree. This includes work since the

original versions of these ports, so some PORTREVISIONs were bumped.  See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.

bsd.kde.mk has already been updated a few days ago to work with these.

Some patches applied to fix a few bugs were:

deskutils/kdepim3:
        [1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
        [2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
        [3] Fix compile problem with kvoctrain.
x11/kdebase3:
        [4] Fix KDM CPU usage and login bug.

Some caveats:
        * All PLISTs are broken for deinstall due to script bug that I
          didn't notice until very recently.  This will be fixed when I
          commit an update tomorrow.  These ports should still install
          perfectly fine though.  They should also deinstall without
          giving errors, but will leave directories behind.
        * You can't install this with any other version of QT or KDE
          already installed.  I am not sure the checks are 100% working,
          but fixes for these will be forthcoming.  This is mainly due
          to a policy decision made by kde@ to make QT/KDE ports install
          the way the rest of the world expects it to while also still
          conforming to FreeBSD's hier(7).  For reference on this decision,
          please consult the KDE/FreeBSD mailing list archives.  This
          decision fixes 2-year-old bug reports relating to how we handled
          this for KDE2 vs KDE1.

Submitted by:   [1] Adrian de Groot <adridg@cs.kun.nl>,
                [2] David Faure <faure@kde.org>,
                    Andy Fawcett <andy@athame.co.uk>
                    Lauri Watts <lauri@kde.org>
                [3] Lauri Watts <lauri@kde.org>
                [4] Alan Eldridge <alane@geeksrus.net>
                    Oswald Buddenhagen <ossi@kde.org>
Reviewed by:    kde

4 files changed, 10 insertions, 366 deletions

diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index fd18c7ac3fb0..3163616cd341 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,46 +1,26 @@
 # New ports collection makefile for:	kdeutils2
-# Date created:				Sun 14 May 2000 02:52:20
-# Whom:					Will Andrews <will@FreeBSD.org>
+# Date created:				3 November 2001
+# Whom:					will@cvs.kde.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0
 CATEGORIES?=	misc kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITES=	http://www.csociety.org/~will/kde/${PORTVERSION}/
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-
-USE_KDELIBS_VER=2
+#WRKSRC=		${WRKDIR}/kdeutils
+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
 MAN1=		efax.1 efix.1 fax.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
-.endif
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 2a396fa164aa..37fe27951179 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-2.2.2.tar.bz2) = 68c3c86d97c3a95079f81b2c7f4bf35a
+MD5 (KDE/kdeutils-3.0.tar.bz2) = 25df70632935464d9c4ca011ab9d22c2
diff --git a/math/kcalc/files/patch-portable.cpp b/math/kcalc/files/patch-portable.cpp
deleted file mode 100644
index d6746dc1c282..000000000000
--- a/math/kcalc/files/patch-portable.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- klaptopdaemon/portable.cpp-	Thu Jun 28 00:08:02 2001
-+++ klaptopdaemon/portable.cpp	Thu Jun 28 00:08:22 2001
-@@ -453,7 +453,7 @@
- 	if (ret == -1)
- 	  return 0;
- 
--	return (info.ai_batt_time != 0xffff);
-+	return (info.ai_batt_time != -1);
- }
- 
- //
-@@ -638,7 +638,7 @@
- 
-        	p.powered = info.ai_acline;
-        	p.percentage = (info.ai_batt_life==255 ? 100 : info.ai_batt_life);
--       	p.time = (info.ai_batt_time != 0xffff ? info.ai_batt_time/60 : -1);
-+       	p.time = (info.ai_batt_time != -1 ? info.ai_batt_time/60 : -1);
-        	return(p);
- 
- bad:
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index a26fa72c3a97..e69de29bb2d1 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -1,316 +0,0 @@
-bin/ark
-bin/efax
-bin/efix
-bin/fax
-bin/kab
-bin/karm
-bin/kcalc
-bin/kcharselect
-bin/kdepasswd
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/kfind
-bin/kfloppy
-bin/khexedit
-bin/kjots
-bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
-bin/knotes
-bin/ktimer
-bin/kwikdisk
-include/KNotesIface.h
-lib/kcalc.la
-lib/kcalc.so
-lib/kde2/kedit.la
-lib/kde2/kedit.so
-lib/kfind.la
-lib/kfind.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-lib/libkcharselectapplet.la
-lib/libkcharselectapplet.so
-lib/libkcharselectapplet.so.1
-lib/libkcm_kdf.la
-lib/libkcm_kdf.so
-lib/libkcm_laptop.la
-lib/libkcm_laptop.so
-share/applnk/Editors/KEdit.desktop
-share/applnk/Kfind.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Information/pcmcia.desktop
-share/applnk/Settings/PowerControl/battery.desktop
-share/applnk/Settings/PowerControl/bwarning.desktop
-share/applnk/Settings/PowerControl/cwarning.desktop
-share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KFloppy.desktop
-share/applnk/Utilities/KLJetTool.desktop
-share/applnk/Utilities/KLpq.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kab.desktop
-share/applnk/Utilities/karm.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klprfax.desktop
-share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimer.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
-share/apps/kab/htmlexport/templates/index.html
-share/apps/kab/htmlexport/templates/kab_address.html
-share/apps/kab/htmlexport/templates/kab_background.gif
-share/apps/kab/htmlexport/templates/kab_entrylist.html
-share/apps/kab/htmlexport/templates/kab_person.html
-share/apps/kab/pics/addressbook_logo.png
-share/apps/karm/karmui.rc
-share/apps/karm/pics/clock.xpm
-share/apps/karm/pics/clockedit.xpm
-share/apps/karm/pics/empty-watch.xpm
-share/apps/karm/pics/filedel.xpm
-share/apps/karm/pics/watch-0.xpm
-share/apps/karm/pics/watch-1.xpm
-share/apps/karm/pics/watch-2.xpm
-share/apps/karm/pics/watch-3.xpm
-share/apps/karm/pics/watch-4.xpm
-share/apps/karm/pics/watch-5.xpm
-share/apps/karm/pics/watch-6.xpm
-share/apps/karm/pics/watch-7.xpm
-share/apps/kcalc/pics/kcalclogo.png
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/kfind/icons/locolor/22x22/actions/archive.png
-share/apps/kfind/icons/locolor/22x22/actions/delete.png
-share/apps/kfind/icons/locolor/22x22/actions/idea.png
-share/apps/kfind/icons/locolor/22x22/actions/info.png
-share/apps/kfind/icons/locolor/22x22/actions/openfile.png
-share/apps/kfind/icons/locolor/22x22/actions/save.png
-share/apps/kfind/icons/locolor/22x22/actions/search.png
-share/apps/kfloppy/pics/kfloppylogo.png
-share/apps/khexedit/toolbar/hexdrag.png
-share/apps/khexedit/toolbar/hexmask.png
-share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kjots/pics/filedel.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/apps/kljettool/pics/kljetlogo.png
-share/apps/knotes/knotesui.rc
-share/apps/knotes/pics/knotesclose.png
-share/apps/knotes/pics/knotesdelete.png
-share/apps/knotes/pics/knoteslogo.png
-share/apps/konqueror/servicemenus/arkservicemenu.desktop
-share/config/knotesrc
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/index.cache.bz2
-share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/kab-edit.png
-share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/karm/common
-share/doc/HTML/en/karm/index.cache.bz2
-share/doc/HTML/en/karm/index.docbook
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfind/common
-share/doc/HTML/en/kfind/index.cache.bz2
-share/doc/HTML/en/kfind/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/djcdoscommands.txt
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cache.bz2
-share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/index.cache.bz2
-share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klprfax/common
-share/doc/HTML/en/klprfax/index.cache.bz2
-share/doc/HTML/en/klprfax/index.docbook
-share/doc/HTML/en/knotes/common
-share/doc/HTML/en/knotes/index.cache.bz2
-share/doc/HTML/en/knotes/index.docbook
-share/doc/HTML/en/kpm/common
-share/doc/HTML/en/kpm/index.cache.bz2
-share/doc/HTML/en/kpm/index.docbook
-share/doc/HTML/en/kpm/kpmjobs.png
-share/doc/HTML/en/kpm/kpmmemory.png
-share/doc/HTML/en/kpm/kpmstart.png
-share/doc/HTML/en/kpm/kpmtext.png
-share/doc/HTML/en/kpm/qps.1
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/kab.png
-share/icons/hicolor/16x16/apps/karm.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kcmdf.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfind.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-share/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/icons/hicolor/16x16/apps/kljettool.png
-share/icons/hicolor/16x16/apps/klpq.png
-share/icons/hicolor/16x16/apps/klprfax.png
-share/icons/hicolor/16x16/apps/knotes.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/laptop_battery.png
-share/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/kab.png
-share/icons/hicolor/32x32/apps/karm.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcmdf.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kljettool.png
-share/icons/hicolor/32x32/apps/klpq.png
-share/icons/hicolor/32x32/apps/klprfax.png
-share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/laptop_battery.png
-share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kab.png
-share/icons/hicolor/48x48/apps/karm.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kljettool.png
-share/icons/hicolor/48x48/apps/klpq.png
-share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/laptop_battery.png
-share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/klprfax.png
-share/icons/locolor/32x32/apps/klprfax.png
-share/services/arkpart.desktop
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/kpm
-@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/klprfax
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kfind
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/karm
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/knotes/pics
-@dirrm share/apps/knotes
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/hicolor
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kfloppy/pics
-@dirrm share/apps/kfloppy
-@dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps/karm/pics
-@dirrm share/apps/karm
-@dirrm share/apps/kab/pics
-@dirrm share/apps/kab/htmlexport/templates
-@dirrm share/apps/kab/htmlexport
-@dirrm share/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/apps/ark/icons/hicolor/22x22
-@dirrm share/apps/ark/icons/hicolor
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors
-@dirrm share/applnk