8 files changed, 285 insertions, 10 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 6376d5b84f46..e8f03e1fa64f 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -32,7 +31,7 @@ CMAKE_ARGS+=	-DBUILD_kpackage:BOOL=Off \
 
 OPTIONS=	PRINTER_CONFIG "Install printer configuration utility" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_PRINTER_CONFIG)
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/system-config-printer-kde/system-config-printer-kde.py:${PORTSDIR}/print/system-config-printer-kde
@@ -49,4 +48,4 @@ post-patch:
 	${REINPLACE_CMD} -e '/add_subdirectory.*system-config-printer-kde/d' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 1fba0f22a8d8..03a68ad59ed9 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-4.3.5.tar.bz2) = 082537af4bd47ea9006ff4fd4e9bd7af
-SHA256 (KDE/kdeadmin-4.3.5.tar.bz2) = 3465614c448bf8650476a3bdc1628e5f4309eafeb2b705f635e9fd7e73203c8c
-SIZE (KDE/kdeadmin-4.3.5.tar.bz2) = 1878006
+MD5 (KDE/kdeadmin-4.4.3.tar.bz2) = e66161a079841bdbce7d5fb5f61f3ee5
+SHA256 (KDE/kdeadmin-4.4.3.tar.bz2) = 5599e693bea91a14f301fc7c9a93360e049034cc3ffe8e01b866b6d79f724023
+SIZE (KDE/kdeadmin-4.4.3.tar.bz2) = 1430849
diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network-conf.cmake b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network-conf.cmake
new file mode 100644
index 000000000000..6bc996719ced
--- /dev/null
+++ b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network-conf.cmake
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..01d20e32a1a8
--- /dev/null
+++ b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-network.pl.cmake
@@ -0,0 +1,122 @@
+--- 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
new file mode 100644
index 000000000000..f45b820961f7
--- /dev/null
+++ b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-platform.pl.cmake
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..50767025fdfa
--- /dev/null
+++ b/sysutils/kdeadmin4/files/patch-knetworkconf-backends-service.pl.cmake
@@ -0,0 +1,22 @@
+--- 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/files/patch-knetworkconf-knetworkconf-knetworkconfigparser.cpp b/sysutils/kdeadmin4/files/patch-knetworkconf-knetworkconf-knetworkconfigparser.cpp
new file mode 100644
index 000000000000..f6c96d9691d4
--- /dev/null
+++ b/sysutils/kdeadmin4/files/patch-knetworkconf-knetworkconf-knetworkconfigparser.cpp
@@ -0,0 +1,112 @@
+--- knetworkconf/knetworkconf/knetworkconfigparser.cpp.orig	2009-07-28 21:43:49.000000000 +0200
++++ knetworkconf/knetworkconf/knetworkconfigparser.cpp	2010-01-13 19:20:10.911935722 +0100
+@@ -21,6 +21,9 @@
+ #include <QPixmap>
+ #include <QTextStream>
+ #include <Q3PtrList>
++#ifdef Q_OS_FREEBSD
++#include <QProcess>
++#endif
+ 
+ KNetworkConfigParser::KNetworkConfigParser(){
+   networkInfo = new KNetworkInfo();
+@@ -184,7 +187,8 @@
+ }
+ 
+ /**
+-  Reads /proc/net/route looking for the default gateway.
++  Reads /proc/net/route or parses the output of /sbin/route (FreeBSD)
++  looking for the default gateway.
+ 
+   NOTE:We should use the gateway reported by gst, but if there's a
+   gw in a config file and one of the network interfaces is
+@@ -193,22 +197,77 @@
+ */
+ void KNetworkConfigParser::loadRoutingInfo( KRoutingInfo *routingInfo){
+ //  routingInfo = NULL;
+-  QFile f( "/proc/net/route");
++#ifdef Q_OS_FREEBSD
++  QProcess *route = new QProcess(this);
++  QString routeBin = "/sbin/route";
++  bool success = false;
++  QByteArray output;
++  // Check for an IPv6 configuration.
++  route->start(routeBin, QStringList() << "get" << "-inet6" << "default");
++  if (route->waitForStarted(1000))
++  {
++    route->waitForFinished(1000);
++    output = route->readAllStandardOutput();
++  }
++  if (output.isEmpty())
++  {
++    // IPv6 is not enabled, check for an IPv4 configuration.
++    route = new QProcess(this);
++    route->start(routeBin, QStringList() << "get" << "default");
++    if (route->waitForStarted(1000))
++    {
++      route->waitForFinished(1000);
++      output = route->readAllStandardOutput();
++    }
++  }
++  if (!output.isEmpty())
++  {
++    QTextStream t(output);
++    QString gw, interface;
++    while (!t.atEnd())
++    {
++      QString s = t.readLine();
++      QString row = s.section(' ', 0, 0, QString::SectionSkipEmpty);
++      if (row == "gateway:")
++      {
++        gw = s.section(' ', 1, 1, QString::SectionSkipEmpty);
++      }
++      else if (row == "interface:")
++      {
++        interface = s.section(' ', 1, 1, QString::SectionSkipEmpty);
++      }
++      if (!gw.isEmpty() && !interface.isEmpty())
++      {
++        routingInfo->setGateway(gw);
++        routingInfo->setGatewayDevice(interface);
++        success = true;
++        break;
++      }
++    }
++  }
++  if (!success)
++  {
++    KMessageBox::error(0,
++                        i18n("Could not get information from %1.", routeBin),
++                        i18n("Could Not Get Information"));
++  }
++#else
++  QString fname = "/proc/net/route";
++  QFile f(fname);
+   if ( !f.open(QIODevice::ReadOnly) )
+   {
+ //    return routingInfo;
+     KMessageBox::error(0,
+-                        i18n("Could not open file /proc/net/route."),
++                        i18n("Could not open file %1.", fname),
+                         i18n("Could Not Open File"));
+   }
+   else
+   {
+ //    routingInfo = new KRoutingInfo();
+     QTextStream t( &f );        // use a text stream
+-    QString s;
+     while (!t.atEnd())
+     {
+-      s = t.readLine();       // line of text excluding '\n'
++      QString s = t.readLine();       // line of text excluding '\n'
+       QString interface = s.section('\t',0,0);
+       QString destination = s.section('\t',1,1);
+       QString gw = s.section('\t',2,2);
+@@ -222,6 +281,7 @@
+     }
+   }
+   f.close();
++#endif
+ }
+ QString
+ KNetworkConfigParser::hexIPv4ToDecIPv4(const QString &hex)
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index ca8c2576245b..bd2e9840310c 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -60,11 +60,9 @@ share/doc/HTML/en/kcontrol/knetworkconf/index.docbook
 share/doc/HTML/en/kcron/common
 share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
-share/doc/HTML/en/kcron/kcron.png
 share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
-share/doc/HTML/en/kcron/print.png
 share/doc/HTML/en/ksystemlog/common
 share/doc/HTML/en/ksystemlog/filter-process.png
 share/doc/HTML/en/ksystemlog/first-opening.png
@@ -105,5 +103,3 @@ share/kde4/services/kcm_knetworkconfmodule.desktop
 @dirrm share/apps/knetworkconf/pixmaps
 @dirrm share/apps/knetworkconf/backends
 @dirrm share/apps/knetworkconf
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake