Update to 0.7.4

Remove patches merged upstream
Strip Makefile header

Feature safe:	yes

7 files changed, 11 insertions, 133 deletions

diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index c280d96562d0..3db280bdf6a1 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	knemo
-# Date created:				Sat Jan 22 00:20:26 CET 2005
-# Whom:					Markus Brueffer <markus@FreeBSD.org>
-#
 # $FreeBSD$
 
 PORTNAME=	knemo
-PORTVERSION=	0.7.2
-PORTREVISION=	4
+PORTVERSION=	0.7.4
 CATEGORIES=	net kde
 MASTER_SITES=	http://kde-apps.org/CONTENT/content-files/
 DISTNAME=	12956-${PORTNAME}-${PORTVERSION}
@@ -19,7 +14,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_QT4=	qmake_build moc_build uic_build rcc_build
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdeprefix kdelibs workspace automoc4
 
 MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net/knemo-kde4/distinfo b/net/knemo-kde4/distinfo
index 75876cce210f..94be3464016b 100644
--- a/net/knemo-kde4/distinfo
+++ b/net/knemo-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (12956-knemo-0.7.2.tar.bz2) = f615ed261803459f8e4fd3c24c01119a2819a03a33ee543e2868d5acab8f5bc8
-SIZE (12956-knemo-0.7.2.tar.bz2) = 644730
+SHA256 (12956-knemo-0.7.4.tar.bz2) = 25ea31cacf5dd9404984ed20b7e5b478e71b2676a74e2f7448463236d8187485
+SIZE (12956-knemo-0.7.4.tar.bz2) = 663619
diff --git a/net/knemo-kde4/files/patch-svn_1299925 b/net/knemo-kde4/files/patch-svn_1299925
deleted file mode 100644
index 19ce8feea80a..000000000000
--- a/net/knemo-kde4/files/patch-svn_1299925
+++ /dev/null
@@ -1,78 +0,0 @@
---- ./src/knemod/backends/bsdbackend.cpp	2012/06/12 02:18:00	1299924
-+++ ./src/knemod/backends/bsdbackend.cpp	2012/06/12 02:18:03	1299925
-@@ -108,6 +108,8 @@
-         interface->outgoingBytes = 0;
-         interface->prevRxPackets = interface->rxPackets;
-         interface->prevTxPackets = interface->txPackets;
-+        interface->rxPackets = 0;
-+        interface->txPackets = 0;
-         interface->addrData.clear();
-         interface->ip4DefaultGateway = ip4DefGw;
-         interface->ip6DefaultGateway = ip6DefGw;
-@@ -281,6 +283,7 @@
- void BSDBackend::updateIfaceData( const QString& ifName, BackendData* data )
- {
-     struct ifaddrs *ifa;
-+    unsigned long rx_bytes = 0, tx_bytes = 0;
-     for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next)
-     {
-         bool allUp = false;
-@@ -294,22 +297,12 @@
-             data->status |= KNemoIface::Up;
- 
-         // stats
-+        struct if_data * stats;
-         if ( ifa->ifa_data )
-         {
--            unsigned long rx_bytes = 0, tx_bytes = 0;
--            struct if_data * stats = static_cast<if_data *>(ifa->ifa_data);
--            data->rxPackets = stats->ifi_ipackets;
--            data->txPackets = stats->ifi_opackets;
--            rx_bytes = stats->ifi_ibytes;
--            tx_bytes = stats->ifi_obytes;
--            if ( IFT_PPP == stats->ifi_type )
--                data->interfaceType == KNemoIface::PPP;
--            incBytes( data->interfaceType, rx_bytes, data->incomingBytes, data->prevRxBytes, data->rxBytes );
--            data->rxString = KIO::convertSize( data->rxBytes );
--
--            incBytes( data->interfaceType, tx_bytes, data->outgoingBytes, data->prevTxBytes, data->txBytes );
--            data->txString = KIO::convertSize( data->txBytes );
--
-+            stats = static_cast<if_data *>(ifa->ifa_data);
-+            if ( stats->ifi_type == IFT_PPP )
-+                data->interfaceType = KNemoIface::PPP;
-             if ( stats->ifi_link_state == LINK_STATE_UP && ifa->ifa_flags & IFF_UP )
-                 allUp = true;
-         }
-@@ -350,6 +343,16 @@
- 
-                 if ( !addrKey.isEmpty() )
-                     data->addrData.insert( addrKey, addrVal );
-+
-+                if ( stats )
-+                {
-+                    // Sum the numbers of all network-level interfaces
-+                    // (e.g., when several IP addresses are assigned)
-+                    data->rxPackets += stats->ifi_ipackets;
-+                    data->txPackets += stats->ifi_opackets;
-+                    rx_bytes += stats->ifi_ibytes;
-+                    tx_bytes += stats->ifi_obytes;
-+                }
-             }
-         }
- 
-@@ -359,6 +362,14 @@
-                 data->status |= KNemoIface::Connected;
-         }
-     }
-+
-+    // Traffic stats. No check needed: if there were no stats,
-+    // values are and always were 0
-+    incBytes( data->interfaceType, rx_bytes, data->incomingBytes, data->prevRxBytes, data->rxBytes );
-+    data->rxString = KIO::convertSize( data->rxBytes );
-+    incBytes( data->interfaceType, tx_bytes, data->outgoingBytes, data->prevTxBytes, data->txBytes );
-+    data->txString = KIO::convertSize( data->txBytes );
-+
-     if ( data->status < KNemoIface::Available )
-         data->status = KNemoIface::Unavailable;
- }
diff --git a/net/knemo-kde4/files/patch-svn_1299926 b/net/knemo-kde4/files/patch-svn_1299926
deleted file mode 100644
index f54632aef0e9..000000000000
--- a/net/knemo-kde4/files/patch-svn_1299926
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/knemod/backends/bsdbackend.cpp	2012/06/12 02:18:03	1299925
-+++ ./src/knemod/backends/bsdbackend.cpp	2012/06/12 02:18:06	1299926
-@@ -334,7 +334,12 @@
-                 addrKey = getAddr( ifa, addrVal );
- 
-                 // Check here too for non-ethernet interfaces
--                if ( ifa->ifa_flags & IFF_RUNNING &&
-+                struct ifmediareq ifmr;
-+                memset( &ifmr, 0, sizeof( ifmr ) );
-+                strncpy( ifmr.ifm_name, ifName.toLatin1(), sizeof( ifmr.ifm_name ) );
-+                if ( ioctl( s, SIOCGIFMEDIA, &ifmr ) >= 0 &&
-+                     ifmr.ifm_status & IFM_AVALID &&
-+                     ifmr.ifm_status & IFM_ACTIVE &&
-                      addrVal.scope != RT_SCOPE_LINK &&
-                      addrVal.scope != RT_SCOPE_NOWHERE )
-                 {
diff --git a/net/knemo-kde4/files/patch-svn_1299928 b/net/knemo-kde4/files/patch-svn_1299928
deleted file mode 100644
index 2f49468daa86..000000000000
--- a/net/knemo-kde4/files/patch-svn_1299928
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/knemod/backends/bsdbackend.cpp	2012/06/12 02:19:11	1299927
-+++ ./src/knemod/backends/bsdbackend.cpp	2012/06/12 02:22:52	1299928
-@@ -429,14 +429,9 @@
-         data->prevAccessPoint = data->accessPoint;
-     }
- 
--    if ( get80211val( ifName, IEEE80211_IOC_AUTHMODE, &val) >= 0 )
-+    if ( get80211val( ifName, IEEE80211_IOC_PRIVACY, &val ) >= 0 )
-     {
--        if ( val == IEEE80211_AUTH_WPA )
--            data->isEncrypted = true;
--    }
--    else if ( get80211val( ifName, IEEE80211_IOC_WEP, &val ) >= 0 && val != IEEE80211_WEP_NOSUP )
--    {
--        if ( val == IEEE80211_WEP_ON )
-+        if ( val > 0 )
-             data->isEncrypted = true;
-     }
- 
diff --git a/net/knemo-kde4/files/patch-svn_1299929 b/net/knemo-kde4/files/patch-svn_1299929
deleted file mode 100644
index 764da804cdc0..000000000000
--- a/net/knemo-kde4/files/patch-svn_1299929
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/common/utils.cpp	2012/06/12 02:22:52	1299928
-+++ ./src/common/utils.cpp	2012/06/12 02:22:55	1299929
-@@ -211,7 +211,7 @@
-                     ifname = tempname;
-                 }
- 
--                cp += sizeof( struct sockaddr );
-+                cp += SA_SIZE( sa );
-             }
-     }
-     else
diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist
index 523880bd3f5d..ab2753f4bd40 100644
--- a/net/knemo-kde4/pkg-plist
+++ b/net/knemo-kde4/pkg-plist
@@ -10,6 +10,7 @@ share/apps/kconf_update/knemo.upd
 share/apps/knemo/knemo.notifyrc
 share/apps/knemo/themes/modem.desktop
 share/apps/knemo/themes/monitor.desktop
+share/apps/knemo/themes/monochrome.desktop
 share/apps/knemo/themes/network.desktop
 share/apps/knemo/themes/wireless.desktop
 share/autostart/knemo.desktop
@@ -44,6 +45,12 @@ share/icons/hicolor/32x32/apps/knemo.png
 share/icons/hicolor/48x48/apps/knemo.png
 share/icons/hicolor/64x64/apps/knemo.png
 share/icons/hicolor/scalable/apps/knemo.svgz
+share/icons/hicolor/scalable/status/knemo-monochrome-error.svgz
+share/icons/hicolor/scalable/status/knemo-monochrome-idle.svgz
+share/icons/hicolor/scalable/status/knemo-monochrome-offline.svgz
+share/icons/hicolor/scalable/status/knemo-monochrome-receive.svgz
+share/icons/hicolor/scalable/status/knemo-monochrome-transmit-receive.svgz
+share/icons/hicolor/scalable/status/knemo-monochrome-transmit.svgz
 share/kde4/services/kcm_knemo.desktop
 share/locale/ar/LC_MESSAGES/kcm_knemo.mo
 share/locale/ar/LC_MESSAGES/knemo.mo