4 files changed, 7 insertions, 53 deletions

diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index a39c0f04050b..025b5a8dfcdd 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	kdeadmin
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index a71a740c4d1d..a8f1567517dc 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeadmin-3.2.3.tar.bz2) = 52cac3afb5ae527f7d65cdd27937ecf4
-SIZE (KDE/kdeadmin-3.2.3.tar.bz2) = 1551138
+MD5 (KDE/kdeadmin-3.3.0.tar.bz2) = 7a4480c4e3b73206252397345d2055b2
+SIZE (KDE/kdeadmin-3.3.0.tar.bz2) = 1557283
diff --git a/sysutils/kdeadmin3/files/patch-kcron_cttask.cpp b/sysutils/kdeadmin3/files/patch-kcron_cttask.cpp
deleted file mode 100644
index dcf2078dd383..000000000000
--- a/sysutils/kdeadmin3/files/patch-kcron_cttask.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- kcron/cttask.cpp	2003/03/31 12:18:41	1.14
-+++ kcron/cttask.cpp	2004/06/01 14:12:34	1.14.2.1
-@@ -44,6 +44,39 @@ CTTask::CTTask(string tokStr, string _co
-   {
-     silent = false;
-   }
-+  
-+  if (tokStr.substr(0,1) == "@")
-+  {
-+    if (tokStr.substr(1,6) == "reboot")
-+    {
-+      // Dunno what to do with this...
-+      tokStr = "0 0 1 1 *"+tokStr.substr(7,tokStr.length()-1);
-+    }
-+    else if (tokStr.substr(1,6) == "yearly")
-+    {
-+      tokStr = "0 0 1 1 *"+tokStr.substr(7,tokStr.length()-1);
-+    }
-+    else if (tokStr.substr(1,8) == "annually")
-+    {
-+      tokStr = "0 0 1 1 *"+tokStr.substr(9,tokStr.length()-1);
-+    }
-+    else if (tokStr.substr(1,7) == "monthly")
-+    {
-+      tokStr = "0 0 1 * *"+tokStr.substr(8,tokStr.length()-1);
-+    }
-+    else if (tokStr.substr(1,6) == "weekly")
-+    {
-+      tokStr = "0 0 * * 0"+tokStr.substr(7,tokStr.length()-1);
-+    }
-+    else if (tokStr.substr(1,5) == "daily")
-+    {
-+      tokStr = "0 0 * * *"+tokStr.substr(6,tokStr.length()-1);
-+    }
-+    else if (tokStr.substr(1,6) == "hourly")
-+    {
-+      tokStr = "0 * * * *"+tokStr.substr(7,tokStr.length()-1);
-+    }
-+  }
- 
-   int spacepos(tokStr.find_first_of(" \t"));
-   minute.initialize(tokStr.substr(0,spacepos));
diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist
index e7f14dcb2711..5573b0c35176 100644
--- a/sysutils/kdeadmin3/pkg-plist
+++ b/sysutils/kdeadmin3/pkg-plist
@@ -18,6 +18,8 @@ share/apps/kpackage/pics/dbad.png
 share/apps/kpackage/pics/deb.png
 share/apps/kpackage/pics/dnew.png
 share/apps/kpackage/pics/dupdated.png
+share/apps/kpackage/pics/ftin.xpm
+share/apps/kpackage/pics/ftout.xpm
 share/apps/kpackage/pics/kiss.png
 share/apps/kpackage/pics/knew.png
 share/apps/kpackage/pics/kupdated.png
@@ -31,8 +33,6 @@ share/apps/kpackage/pics/slack.png
 share/apps/kpackage/pics/snew.png
 share/apps/kpackage/pics/supdated.png
 share/apps/kpackage/pics/tick.png
-share/apps/kpackage/toolbar/ftin.xpm
-share/apps/kpackage/toolbar/ftout.xpm
 share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
 share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
 share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
@@ -42,6 +42,7 @@ share/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
 share/apps/kuser/kuserui.rc
 share/apps/kuser/pics/group.png
 share/apps/kuser/pics/user.png
+share/config.kcfg/kuser.kcfg
 share/doc/HTML/en/kcron/common
 share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
@@ -90,22 +91,17 @@ share/icons/crystalsvg/64x64/apps/kuser.png
 share/mimelnk/application/x-debian-package.desktop
 share/services/kfile_deb.desktop
 share/services/kfile_rpm.desktop
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksysv
 @dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/kdat
 @dirrm share/doc/HTML/en/kcron
+@dirrm share/config.kcfg
 @dirrm share/apps/kuser/pics
 @dirrm share/apps/kuser/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kuser/icons/crystalsvg/22x22
 @dirrm share/apps/kuser/icons/crystalsvg
 @dirrm share/apps/kuser/icons
 @dirrm share/apps/kuser
-@dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage