summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/kdeadmin3/distinfo4
-rw-r--r--sysutils/kdeadmin3/files/patch-kcron_cttask.cpp42
-rw-r--r--sysutils/kdeadmin4/distinfo4
-rw-r--r--sysutils/kdeadmin4/files/patch-kcron_cttask.cpp42
-rw-r--r--sysutils/kdf/Makefile2
-rw-r--r--sysutils/kdf/distinfo4
-rw-r--r--sysutils/kdf/files/patch-ark-tar.cpp11
-rw-r--r--sysutils/kfloppy/Makefile2
-rw-r--r--sysutils/kfloppy/distinfo4
-rw-r--r--sysutils/kfloppy/files/patch-ark-tar.cpp11
-rw-r--r--sysutils/sweeper/Makefile2
-rw-r--r--sysutils/sweeper/distinfo4
-rw-r--r--sysutils/sweeper/files/patch-ark-tar.cpp11
13 files changed, 97 insertions, 46 deletions
diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index c064c6d108ce..a71a740c4d1d 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeadmin-3.2.2.tar.bz2) = 4a39ce0d9abdd2dccb4531466ee7f229
-SIZE (KDE/kdeadmin-3.2.2.tar.bz2) = 1559783
+MD5 (KDE/kdeadmin-3.2.3.tar.bz2) = 52cac3afb5ae527f7d65cdd27937ecf4
+SIZE (KDE/kdeadmin-3.2.3.tar.bz2) = 1551138
diff --git a/sysutils/kdeadmin3/files/patch-kcron_cttask.cpp b/sysutils/kdeadmin3/files/patch-kcron_cttask.cpp
new file mode 100644
index 000000000000..dcf2078dd383
--- /dev/null
+++ b/sysutils/kdeadmin3/files/patch-kcron_cttask.cpp
@@ -0,0 +1,42 @@
+--- 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/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index c064c6d108ce..a71a740c4d1d 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeadmin-3.2.2.tar.bz2) = 4a39ce0d9abdd2dccb4531466ee7f229
-SIZE (KDE/kdeadmin-3.2.2.tar.bz2) = 1559783
+MD5 (KDE/kdeadmin-3.2.3.tar.bz2) = 52cac3afb5ae527f7d65cdd27937ecf4
+SIZE (KDE/kdeadmin-3.2.3.tar.bz2) = 1551138
diff --git a/sysutils/kdeadmin4/files/patch-kcron_cttask.cpp b/sysutils/kdeadmin4/files/patch-kcron_cttask.cpp
new file mode 100644
index 000000000000..dcf2078dd383
--- /dev/null
+++ b/sysutils/kdeadmin4/files/patch-kcron_cttask.cpp
@@ -0,0 +1,42 @@
+--- 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/kdf/Makefile b/sysutils/kdf/Makefile
index 996d5eb01ca0..cf65cf6d3400 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -45,7 +45,7 @@ WITHOUT_KLAPTOP=yes
.if defined(WITHOUT_KLAPTOP)
DO_NOT_COMPILE+=klaptopdaemon
.else
-PLIST_APPEND+= plist.klaptop
+PLIST_APPEND+= plist.klaptop
.endif
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index a5c5ce5a8d18..2d2007674ce0 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeutils-3.2.2.tar.bz2) = 94eee311b04f91aa083d1f8a8620faca
-SIZE (KDE/kdeutils-3.2.2.tar.bz2) = 2549521
+MD5 (KDE/kdeutils-3.2.3.tar.bz2) = 3a98f8a0a6f4582e03d4503708cb218a
+SIZE (KDE/kdeutils-3.2.3.tar.bz2) = 2482811
diff --git a/sysutils/kdf/files/patch-ark-tar.cpp b/sysutils/kdf/files/patch-ark-tar.cpp
deleted file mode 100644
index 0c88c38fcd9e..000000000000
--- a/sysutils/kdf/files/patch-ark-tar.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ark/tar.cpp.orig Thu Apr 15 21:48:14 2004
-+++ ark/tar.cpp Thu Apr 15 21:49:21 2004
-@@ -81,7 +81,7 @@
-
- m_fileMimeType = _openAsMimeType;
- if ( m_fileMimeType.isNull() )
-- m_fileMimeType = KMimeType::findByFileContent( _filename )->name();
-+ m_fileMimeType = KMimeType::findByPath( _filename )->name();
-
- kdDebug(1601) << "TarArch::TarArch: mimetype is " << m_fileMimeType << endl;
-
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 996d5eb01ca0..cf65cf6d3400 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -45,7 +45,7 @@ WITHOUT_KLAPTOP=yes
.if defined(WITHOUT_KLAPTOP)
DO_NOT_COMPILE+=klaptopdaemon
.else
-PLIST_APPEND+= plist.klaptop
+PLIST_APPEND+= plist.klaptop
.endif
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index a5c5ce5a8d18..2d2007674ce0 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeutils-3.2.2.tar.bz2) = 94eee311b04f91aa083d1f8a8620faca
-SIZE (KDE/kdeutils-3.2.2.tar.bz2) = 2549521
+MD5 (KDE/kdeutils-3.2.3.tar.bz2) = 3a98f8a0a6f4582e03d4503708cb218a
+SIZE (KDE/kdeutils-3.2.3.tar.bz2) = 2482811
diff --git a/sysutils/kfloppy/files/patch-ark-tar.cpp b/sysutils/kfloppy/files/patch-ark-tar.cpp
deleted file mode 100644
index 0c88c38fcd9e..000000000000
--- a/sysutils/kfloppy/files/patch-ark-tar.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ark/tar.cpp.orig Thu Apr 15 21:48:14 2004
-+++ ark/tar.cpp Thu Apr 15 21:49:21 2004
-@@ -81,7 +81,7 @@
-
- m_fileMimeType = _openAsMimeType;
- if ( m_fileMimeType.isNull() )
-- m_fileMimeType = KMimeType::findByFileContent( _filename )->name();
-+ m_fileMimeType = KMimeType::findByPath( _filename )->name();
-
- kdDebug(1601) << "TarArch::TarArch: mimetype is " << m_fileMimeType << endl;
-
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 996d5eb01ca0..cf65cf6d3400 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -45,7 +45,7 @@ WITHOUT_KLAPTOP=yes
.if defined(WITHOUT_KLAPTOP)
DO_NOT_COMPILE+=klaptopdaemon
.else
-PLIST_APPEND+= plist.klaptop
+PLIST_APPEND+= plist.klaptop
.endif
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index a5c5ce5a8d18..2d2007674ce0 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeutils-3.2.2.tar.bz2) = 94eee311b04f91aa083d1f8a8620faca
-SIZE (KDE/kdeutils-3.2.2.tar.bz2) = 2549521
+MD5 (KDE/kdeutils-3.2.3.tar.bz2) = 3a98f8a0a6f4582e03d4503708cb218a
+SIZE (KDE/kdeutils-3.2.3.tar.bz2) = 2482811
diff --git a/sysutils/sweeper/files/patch-ark-tar.cpp b/sysutils/sweeper/files/patch-ark-tar.cpp
deleted file mode 100644
index 0c88c38fcd9e..000000000000
--- a/sysutils/sweeper/files/patch-ark-tar.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ark/tar.cpp.orig Thu Apr 15 21:48:14 2004
-+++ ark/tar.cpp Thu Apr 15 21:49:21 2004
-@@ -81,7 +81,7 @@
-
- m_fileMimeType = _openAsMimeType;
- if ( m_fileMimeType.isNull() )
-- m_fileMimeType = KMimeType::findByFileContent( _filename )->name();
-+ m_fileMimeType = KMimeType::findByPath( _filename )->name();
-
- kdDebug(1601) << "TarArch::TarArch: mimetype is " << m_fileMimeType << endl;
-