7 files changed, 5 insertions, 172 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index e8f03e1fa64f..a9ff16540d56 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -14,6 +14,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Admin applications
 
+BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index a8137a93b956..5c3567e7e8de 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-4.4.5.tar.bz2) = 695dfc8c22b34fa9914a8e6bec7ccafc
-SHA256 (KDE/kdeadmin-4.4.5.tar.bz2) = 9e87237f0d2af5bf58ecc71a90d5451e923be8f8c512d67d6f58b279a5dcb2ca
-SIZE (KDE/kdeadmin-4.4.5.tar.bz2) = 1430987
+MD5 (KDE/kdeadmin-4.5.1.tar.bz2) = 1d7d749183bfbd2dedf9332c0180e6c3
+SHA256 (KDE/kdeadmin-4.5.1.tar.bz2) = 6245c02e94bf2b860c97cff44fa1f6d37a8fac1c6874a91bf02a69a4aa962a04
+SIZE (KDE/kdeadmin-4.5.1.tar.bz2) = 1245108
diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network-conf.cmake b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network-conf.cmake
deleted file mode 100644
index 6bc996719ced..000000000000
--- a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network-conf.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- knetworkconf/backends/network-conf.cmake.orig	2010-01-05 15:48:23.659695661 +0100
-+++ knetworkconf/backends/network-conf.cmake	2010-01-05 15:47:12.922927736 +0100
-@@ -78,7 +78,8 @@
- 	      "mandriva-2009.0", "mandriva-2009.1", "mandriva-2010.0",
-               "vine-3.0", "vine-3.1",
-               "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
--              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "ark");
-+	      "freebsd-5", "freebsd-6", "freebsd-7", "freebsd-8", "freebsd-9",
-+              "gentoo", "vlos-1.2", "ark");
- 
- $description =<<"end_of_description;";
-        Configures all network parameters and interfaces.
diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network.pl.cmake b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network.pl.cmake
deleted file mode 100644
index 01d20e32a1a8..000000000000
--- a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network.pl.cmake
+++ /dev/null
@@ -1,122 +0,0 @@
---- knetworkconf/backends/network.pl.cmake.orig	2010-01-05 15:48:32.209103654 +0100
-+++ knetworkconf/backends/network.pl.cmake	2010-01-05 17:04:04.405595464 +0100
-@@ -91,30 +91,21 @@
- 
- sub gst_network_get_freebsd_wireless_ifaces
- {
--  my ($fd, $line, $iface);
--  my (@ifaces, $command);
-+  my $file = "/etc/rc.conf";
-+  my ($fd, $i, @ret);
- 
--  $command = &gst_file_get_cmd_path ("iwconfig");
--  open $fd, "$command |";
--  return @ifaces if $fd eq undef;
-+  $fd = &gst_file_open_read_from_names ($file);
-+  return @ret if !$fd;
- 
--  while (<$fd>)
--  {
--    if (/^([a-zA-Z]+[0-9]+):/)
-+  while ($i = <$fd>)
-     {
--      $iface = $1;
--    }
--
--    if (/media:.*wireless.*/i)
-+    if ($i =~ /^wlans_.*[ \t]*=[ \t]*(.*)/)
-     {
--      push @ifaces, $iface;
-+      push @ret, $1;
-     }
-   }
- 
--  &gst_file_close ($fd);
--  &gst_report_leave ();
--
--  return \@ifaces;
-+  return \@ret;
- }
- 
- # Returns an array with the wireless devices found
-@@ -142,7 +133,9 @@
-     $command  = $command_ifconfig if ($$tool{"system"} eq "FreeBSD");
- 
-     $command .= " $dev";
--    $command .= " essid '$essid'" if ($essid);
-+    $command .= " essid" if ($$tool{"system"} eq "Linux");
-+    $command .= " ssid" if ($$tool{"system"} eq "FreeBSD");
-+    $command .= " '$essid'";
- 
-     if ($key)
-     {
-@@ -541,6 +534,9 @@
-        "vlos-1.2"     => "debian-2.2",
-        "freebsd-5"    => "debian-2.2",
-        "freebsd-6"    => "debian-2.2",
-+       "freebsd-7"    => "debian-2.2",
-+       "freebsd-8"    => "debian-2.2",
-+       "freebsd-9"    => "debian-2.2",
-        "ark"          => "redhat-6.2",
-        );
- 
-@@ -1842,6 +1838,9 @@
- 	  "gentoo"       => \&gst_network_deb22_get_file,
- 	  "freebsd-5"    => \&gst_network_deb22_get_file,
- 	  "freebsd-6"    => \&gst_network_deb22_get_file,
-+	  "freebsd-7"    => \&gst_network_deb22_get_file,
-+	  "freebsd-8"    => \&gst_network_deb22_get_file,
-+	  "freebsd-9"    => \&gst_network_deb22_get_file,
- 	  "ark"          => \&get_network_rh62_get_file,
- 	  );
- 
-@@ -3965,6 +3964,9 @@
- 	  "vlos-1.2"     => "",
- 	  "freebsd-5"    => "",
- 	  "freebsd-6"    => "",
-+	  "freebsd-7"    => "",
-+	  "freebsd-8"    => "",
-+	  "freebsd-9"    => "",
- 	  "ark"          => "lo",
- 	  );
- 
-@@ -4113,6 +4115,9 @@
- 	  "vlos-1.2"     => "vlos-1.2",
- 	  "freebsd-5"    => "freebsd-5",
- 	  "freebsd-6"    => "freebsd-5",
-+	  "freebsd-7"    => "freebsd-5",
-+	  "freebsd-8"    => "freebsd-5",
-+	  "freebsd-9"    => "freebsd-5",
- 	  "ark"          => "ark",
- 	  );
- 
-@@ -4612,6 +4617,9 @@
- 	  "vlos-1.2"     => "vlos-1.2",
- 	  "freebsd-5"    => "freebsd-5",
- 	  "freebsd-6"    => "freebsd-5",
-+	  "freebsd-7"    => "freebsd-5",
-+	  "freebsd-8"    => "freebsd-5",
-+	  "freebsd-9"    => "freebsd-5",
- 	  "ark"          => "ark",
- 	  );
-   
-@@ -5506,6 +5514,9 @@
- 	  "vlos-1.2"     => "vlos-1.2",
- 	  "freebsd-5"    => "freebsd-5",
- 	  "freebsd-6"    => "freebsd-5",
-+	  "freebsd-7"    => "freebsd-5",
-+	  "freebsd-8"    => "freebsd-5",
-+	  "freebsd-9"    => "freebsd-5",
- 	  );
- 
-   my %dist_tables =
-@@ -5955,6 +5966,9 @@
- 	  "vlos-1.2"     => "vlos-1.2",
- 	  "freebsd-5"    => "freebsd-5",
- 	  "freebsd-6"    => "freebsd-5",
-+	  "freebsd-7"    => "freebsd-5",
-+	  "freebsd-8"    => "freebsd-5",
-+	  "freebsd-9"    => "freebsd-5",
- 	  );
- 
-   my %dist_tables =
diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-platform.pl.cmake b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-platform.pl.cmake
deleted file mode 100644
index f45b820961f7..000000000000
--- a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-platform.pl.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- knetworkconf/backends/platform.pl.cmake.orig	2010-01-05 17:04:31.763334277 +0100
-+++ knetworkconf/backends/platform.pl.cmake	2010-01-05 17:05:14.400699634 +0100
-@@ -96,6 +96,9 @@
-   "freebsd-4"       => "FreeBSD 4",
-   "freebsd-5"       => "FreeBSD 5",
-   "freebsd-6"       => "FreeBSD 6",
-+  "freebsd-7"       => "FreeBSD 7",
-+  "freebsd-8"       => "FreeBSD 8",
-+  "freebsd-9"       => "FreeBSD 9",
-   "gentoo"          => "Gentoo Linux",
-   "vlos-1.2"        => "Vida Linux OS 1.2",
-   "archlinux-0.7"   => "Arch Linux 0.7",
diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-service.pl.cmake b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-service.pl.cmake
deleted file mode 100644
index 50767025fdfa..000000000000
--- a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-service.pl.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
---- knetworkconf/backends/service.pl.cmake.orig	2010-01-05 17:05:28.885442778 +0100
-+++ knetworkconf/backends/service.pl.cmake	2010-01-05 17:06:56.310432111 +0100
-@@ -287,6 +287,9 @@
- 
-      "freebsd-5"      => "freebsd-5",
-      "freebsd-6"      => "freebsd-5",
-+     "freebsd-7"      => "freebsd-5",
-+     "freebsd-8"      => "freebsd-5",
-+     "freebsd-9"      => "freebsd-5",
- 
-      "ark"            => "redhat-5.2",
-     );
-@@ -1642,6 +1645,9 @@
- 
-        "freebsd-5"    => \&gst_service_rcng_get_status,
-        "freebsd-6"    => \&gst_service_rcng_get_status,
-+       "freebsd-7"    => \&gst_service_rcng_get_status,
-+       "freebsd-8"    => \&gst_service_rcng_get_status,
-+       "freebsd-9"    => \&gst_service_rcng_get_status,
- 
-        "ark"          => \&gst_service_redhat_get_status,
-       );
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index bd2e9840310c..99802e64d340 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -66,7 +66,6 @@ share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/ksystemlog/common
 share/doc/HTML/en/ksystemlog/filter-process.png
 share/doc/HTML/en/ksystemlog/first-opening.png
-share/doc/HTML/en/ksystemlog/groupby-hour.png
 share/doc/HTML/en/ksystemlog/index.cache.bz2
 share/doc/HTML/en/ksystemlog/index.docbook
 share/doc/HTML/en/ksystemlog/main-screen.png