- Update to version 0.4.1

- Switch mastersite back to the projectsite as the distfile of this
  version ships a correct buildsystem

10 files changed, 70 insertions, 46 deletions

diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index 85f449be2c56..7605a747bb24 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	knemo
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	net kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	markus
+MASTER_SITES=	http://www.eris23.de/knemo/
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Network monitor for KDE
diff --git a/net/knemo-kde4/distinfo b/net/knemo-kde4/distinfo
index 5942c79f4203..4f0538c48338 100644
--- a/net/knemo-kde4/distinfo
+++ b/net/knemo-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (knemo-0.4.0.tar.bz2) = 5fc147c23b5342d26ca74a03881829e0
-SHA256 (knemo-0.4.0.tar.bz2) = 3b07e892878433dbfbb5f8ff932a82fbafa85d4935dc8008f3446d297208830c
-SIZE (knemo-0.4.0.tar.bz2) = 899310
+MD5 (knemo-0.4.1.tar.bz2) = 93ee976ba6bad9a8a726f46021e5c344
+SHA256 (knemo-0.4.1.tar.bz2) = 3362e90e606bc3028dd010ad305852f3dfd7eb5b6488e0783c2db393e3f1d114
+SIZE (knemo-0.4.1.tar.bz2) = 592925
diff --git a/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp b/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp
index ba194f906dbd..09ad62f0543f 100644
--- a/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp
+++ b/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp
@@ -1,5 +1,5 @@
---- src/knemod/interfaceupdater.cpp.orig	Sat Apr  1 21:44:22 2006
-+++ src/knemod/interfaceupdater.cpp	Sun Apr  2 21:29:24 2006
+--- src/knemod/interfaceupdater.cpp.orig	Mon Jun 12 13:20:13 2006
++++ src/knemod/interfaceupdater.cpp	Mon Jun 12 14:43:02 2006
 @@ -17,6 +17,24 @@
     Boston, MA 02110-1301, USA.
  */
@@ -23,17 +23,17 @@
 +#endif
 +
  #include <qmap.h>
- #include <qtimer.h>
  #include <qregexp.h>
-@@ -49,6 +67,7 @@
-     mTimer->stop();
-     delete mTimer;
+ #include <qstringlist.h>
+@@ -40,6 +58,7 @@
  
+ InterfaceUpdater::~InterfaceUpdater()
+ {
 +#ifndef Q_OS_FREEBSD
      if ( mRouteProcess )
      {
          mRouteProcess->kill();
-@@ -64,10 +83,12 @@
+@@ -55,10 +74,12 @@
          mIwconfigProcess->kill();
          delete mIwconfigProcess;
      }
@@ -46,7 +46,7 @@
      if ( !mIfconfigProcess )
      {
          mIfconfigStdout = QString::null;
-@@ -109,6 +130,7 @@
+@@ -100,6 +121,7 @@
          }
      }
  #endif
@@ -54,7 +54,7 @@
  
  #ifdef PATH_ROUTE
      if ( !mRouteProcess )
-@@ -117,7 +139,11 @@
+@@ -108,7 +130,11 @@
          mRouteProcess = new KProcess();
          mRouteProcess->setEnvironment( "LANG", "C" );
          mRouteProcess->setEnvironment( "LC_ALL", "C" );
@@ -66,7 +66,7 @@
          connect( mRouteProcess,  SIGNAL( receivedStdout( KProcess*, char*, int ) ),
                   this, SLOT( routeProcessStdout( KProcess*, char*, int ) ) );
          connect( mRouteProcess,  SIGNAL( receivedStderr( KProcess*, char*, int ) ),
-@@ -132,6 +158,140 @@
+@@ -123,6 +149,140 @@
          }
      }
  #endif
@@ -207,7 +207,7 @@
  }
  
  void InterfaceUpdater::routeProcessExited( KProcess* process )
-@@ -181,6 +341,7 @@
+@@ -172,6 +332,7 @@
  
  void InterfaceUpdater::parseIfconfigOutput()
  {
@@ -215,7 +215,7 @@
      /* mIfconfigStdout contains the complete output of 'ifconfig' which we
       * are going to parse here.
       */
-@@ -237,10 +398,12 @@
+@@ -228,10 +389,12 @@
          }
          interface->activateMonitor();
      }
@@ -228,7 +228,7 @@
      QRegExp regExp( ".*RX.*:(\\d+).*:\\d+.*:\\d+.*:\\d+" );
      if ( regExp.search( config ) > -1 )
          data.rxPackets = regExp.cap( 1 ).toULong();
-@@ -330,10 +493,12 @@
+@@ -321,10 +484,12 @@
          if ( regExp.search( config ) > -1 )
              data.ptpAddress = regExp.cap( 2 );
      }
@@ -241,7 +241,7 @@
      /* mIwconfigStdout contains the complete output of 'iwconfig' which we
       * are going to parse here.
       */
-@@ -376,10 +541,12 @@
+@@ -367,10 +532,12 @@
              updateWirelessData( configs[key], interface->getWirelessData() );
          }
      }
@@ -254,7 +254,7 @@
      QRegExp regExp( "ESSID:\"?([^\"]*)\"?" );
      if ( regExp.search( config ) > -1 )
          data.essid = regExp.cap( 1 );
-@@ -413,6 +580,7 @@
+@@ -404,6 +571,7 @@
      regExp.setPattern( "Link Quality[=:]([\\d/]*)" );
      if ( regExp.search( config ) > -1 )
          data.linkQuality = regExp.cap( 1 );
@@ -262,7 +262,7 @@
  }
  
  void InterfaceUpdater::parseRouteOutput()
-@@ -421,16 +589,25 @@
+@@ -412,16 +580,25 @@
       * are going to parse here.
       */
      QMap<QString, QStringList> configs;
diff --git a/net/knemo-kde4/files/patch-knemod-knemodaemon.cpp b/net/knemo-kde4/files/patch-knemod-knemodaemon.cpp
new file mode 100644
index 000000000000..11f2cc3e39fe
--- /dev/null
+++ b/net/knemo-kde4/files/patch-knemod-knemodaemon.cpp
@@ -0,0 +1,11 @@
+--- src/knemod/knemodaemon.cpp.orig	Mon Jun 12 15:47:54 2006
++++ src/knemod/knemodaemon.cpp	Mon Jun 12 16:30:45 2006
+@@ -306,6 +306,8 @@
+ 
+     // needed to calculate the current speed
+     mGeneralData.secondsSinceLastUpdate = mLastUpdateTime.secsTo( QDateTime::currentDateTime() );
++    if (mGeneralData.secondsSinceLastUpdate == 0)
++        mGeneralData.secondsSinceLastUpdate = 1;
+     mLastUpdateTime.setDate( QDate::currentDate() );
+     mLastUpdateTime.setTime( QTime::currentTime() );
+ 
diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist
index 3b6ee1bbbc38..866585aa2771 100644
--- a/net/knemo-kde4/pkg-plist
+++ b/net/knemo-kde4/pkg-plist
@@ -52,6 +52,8 @@ share/locale/fr/LC_MESSAGES/kcm_knemo.mo
 share/locale/fr/LC_MESSAGES/knemod.mo
 share/locale/ga/LC_MESSAGES/kcm_knemo.mo
 share/locale/ga/LC_MESSAGES/knemod.mo
+share/locale/hu/LC_MESSAGES/kcm_knemo.mo
+share/locale/hu/LC_MESSAGES/knemod.mo
 share/locale/it/LC_MESSAGES/kcm_knemo.mo
 share/locale/it/LC_MESSAGES/knemod.mo
 share/locale/ka/LC_MESSAGES/kcm_knemo.mo
@@ -79,7 +81,7 @@ share/locale/sv/LC_MESSAGES/knemod.mo
 share/locale/tr/LC_MESSAGES/kcm_knemo.mo
 share/locale/tr/LC_MESSAGES/knemod.mo
 share/services/kded/knemod.desktop
-@dirrm share/services/kded
+@dirrmtry share/services/kded
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/net/knemo/Makefile b/net/knemo/Makefile
index 85f449be2c56..7605a747bb24 100644
--- a/net/knemo/Makefile
+++ b/net/knemo/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	knemo
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	net kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	markus
+MASTER_SITES=	http://www.eris23.de/knemo/
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Network monitor for KDE
diff --git a/net/knemo/distinfo b/net/knemo/distinfo
index 5942c79f4203..4f0538c48338 100644
--- a/net/knemo/distinfo
+++ b/net/knemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (knemo-0.4.0.tar.bz2) = 5fc147c23b5342d26ca74a03881829e0
-SHA256 (knemo-0.4.0.tar.bz2) = 3b07e892878433dbfbb5f8ff932a82fbafa85d4935dc8008f3446d297208830c
-SIZE (knemo-0.4.0.tar.bz2) = 899310
+MD5 (knemo-0.4.1.tar.bz2) = 93ee976ba6bad9a8a726f46021e5c344
+SHA256 (knemo-0.4.1.tar.bz2) = 3362e90e606bc3028dd010ad305852f3dfd7eb5b6488e0783c2db393e3f1d114
+SIZE (knemo-0.4.1.tar.bz2) = 592925
diff --git a/net/knemo/files/patch-knemod-interfaceupdater.cpp b/net/knemo/files/patch-knemod-interfaceupdater.cpp
index ba194f906dbd..09ad62f0543f 100644
--- a/net/knemo/files/patch-knemod-interfaceupdater.cpp
+++ b/net/knemo/files/patch-knemod-interfaceupdater.cpp
@@ -1,5 +1,5 @@
---- src/knemod/interfaceupdater.cpp.orig	Sat Apr  1 21:44:22 2006
-+++ src/knemod/interfaceupdater.cpp	Sun Apr  2 21:29:24 2006
+--- src/knemod/interfaceupdater.cpp.orig	Mon Jun 12 13:20:13 2006
++++ src/knemod/interfaceupdater.cpp	Mon Jun 12 14:43:02 2006
 @@ -17,6 +17,24 @@
     Boston, MA 02110-1301, USA.
  */
@@ -23,17 +23,17 @@
 +#endif
 +
  #include <qmap.h>
- #include <qtimer.h>
  #include <qregexp.h>
-@@ -49,6 +67,7 @@
-     mTimer->stop();
-     delete mTimer;
+ #include <qstringlist.h>
+@@ -40,6 +58,7 @@
  
+ InterfaceUpdater::~InterfaceUpdater()
+ {
 +#ifndef Q_OS_FREEBSD
      if ( mRouteProcess )
      {
          mRouteProcess->kill();
-@@ -64,10 +83,12 @@
+@@ -55,10 +74,12 @@
          mIwconfigProcess->kill();
          delete mIwconfigProcess;
      }
@@ -46,7 +46,7 @@
      if ( !mIfconfigProcess )
      {
          mIfconfigStdout = QString::null;
-@@ -109,6 +130,7 @@
+@@ -100,6 +121,7 @@
          }
      }
  #endif
@@ -54,7 +54,7 @@
  
  #ifdef PATH_ROUTE
      if ( !mRouteProcess )
-@@ -117,7 +139,11 @@
+@@ -108,7 +130,11 @@
          mRouteProcess = new KProcess();
          mRouteProcess->setEnvironment( "LANG", "C" );
          mRouteProcess->setEnvironment( "LC_ALL", "C" );
@@ -66,7 +66,7 @@
          connect( mRouteProcess,  SIGNAL( receivedStdout( KProcess*, char*, int ) ),
                   this, SLOT( routeProcessStdout( KProcess*, char*, int ) ) );
          connect( mRouteProcess,  SIGNAL( receivedStderr( KProcess*, char*, int ) ),
-@@ -132,6 +158,140 @@
+@@ -123,6 +149,140 @@
          }
      }
  #endif
@@ -207,7 +207,7 @@
  }
  
  void InterfaceUpdater::routeProcessExited( KProcess* process )
-@@ -181,6 +341,7 @@
+@@ -172,6 +332,7 @@
  
  void InterfaceUpdater::parseIfconfigOutput()
  {
@@ -215,7 +215,7 @@
      /* mIfconfigStdout contains the complete output of 'ifconfig' which we
       * are going to parse here.
       */
-@@ -237,10 +398,12 @@
+@@ -228,10 +389,12 @@
          }
          interface->activateMonitor();
      }
@@ -228,7 +228,7 @@
      QRegExp regExp( ".*RX.*:(\\d+).*:\\d+.*:\\d+.*:\\d+" );
      if ( regExp.search( config ) > -1 )
          data.rxPackets = regExp.cap( 1 ).toULong();
-@@ -330,10 +493,12 @@
+@@ -321,10 +484,12 @@
          if ( regExp.search( config ) > -1 )
              data.ptpAddress = regExp.cap( 2 );
      }
@@ -241,7 +241,7 @@
      /* mIwconfigStdout contains the complete output of 'iwconfig' which we
       * are going to parse here.
       */
-@@ -376,10 +541,12 @@
+@@ -367,10 +532,12 @@
              updateWirelessData( configs[key], interface->getWirelessData() );
          }
      }
@@ -254,7 +254,7 @@
      QRegExp regExp( "ESSID:\"?([^\"]*)\"?" );
      if ( regExp.search( config ) > -1 )
          data.essid = regExp.cap( 1 );
-@@ -413,6 +580,7 @@
+@@ -404,6 +571,7 @@
      regExp.setPattern( "Link Quality[=:]([\\d/]*)" );
      if ( regExp.search( config ) > -1 )
          data.linkQuality = regExp.cap( 1 );
@@ -262,7 +262,7 @@
  }
  
  void InterfaceUpdater::parseRouteOutput()
-@@ -421,16 +589,25 @@
+@@ -412,16 +580,25 @@
       * are going to parse here.
       */
      QMap<QString, QStringList> configs;
diff --git a/net/knemo/files/patch-knemod-knemodaemon.cpp b/net/knemo/files/patch-knemod-knemodaemon.cpp
new file mode 100644
index 000000000000..11f2cc3e39fe
--- /dev/null
+++ b/net/knemo/files/patch-knemod-knemodaemon.cpp
@@ -0,0 +1,11 @@
+--- src/knemod/knemodaemon.cpp.orig	Mon Jun 12 15:47:54 2006
++++ src/knemod/knemodaemon.cpp	Mon Jun 12 16:30:45 2006
+@@ -306,6 +306,8 @@
+ 
+     // needed to calculate the current speed
+     mGeneralData.secondsSinceLastUpdate = mLastUpdateTime.secsTo( QDateTime::currentDateTime() );
++    if (mGeneralData.secondsSinceLastUpdate == 0)
++        mGeneralData.secondsSinceLastUpdate = 1;
+     mLastUpdateTime.setDate( QDate::currentDate() );
+     mLastUpdateTime.setTime( QTime::currentTime() );
+ 
diff --git a/net/knemo/pkg-plist b/net/knemo/pkg-plist
index 3b6ee1bbbc38..866585aa2771 100644
--- a/net/knemo/pkg-plist
+++ b/net/knemo/pkg-plist
@@ -52,6 +52,8 @@ share/locale/fr/LC_MESSAGES/kcm_knemo.mo
 share/locale/fr/LC_MESSAGES/knemod.mo
 share/locale/ga/LC_MESSAGES/kcm_knemo.mo
 share/locale/ga/LC_MESSAGES/knemod.mo
+share/locale/hu/LC_MESSAGES/kcm_knemo.mo
+share/locale/hu/LC_MESSAGES/knemod.mo
 share/locale/it/LC_MESSAGES/kcm_knemo.mo
 share/locale/it/LC_MESSAGES/knemod.mo
 share/locale/ka/LC_MESSAGES/kcm_knemo.mo
@@ -79,7 +81,7 @@ share/locale/sv/LC_MESSAGES/knemod.mo
 share/locale/tr/LC_MESSAGES/kcm_knemo.mo
 share/locale/tr/LC_MESSAGES/knemod.mo
 share/services/kded/knemod.desktop
-@dirrm share/services/kded
+@dirrmtry share/services/kded
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES