diff options
Diffstat (limited to 'net/kdenetwork3')
-rw-r--r-- | net/kdenetwork3/Makefile | 3 | ||||
-rw-r--r-- | net/kdenetwork3/distinfo | 12 | ||||
-rw-r--r-- | net/kdenetwork3/patches/patch-aa | 23 | ||||
-rw-r--r-- | net/kdenetwork3/patches/patch-ab | 17 | ||||
-rw-r--r-- | net/kdenetwork3/patches/patch-ad | 70 |
5 files changed, 7 insertions, 118 deletions
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 14966b997ac..19d8a9fe670 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2008/01/18 05:08:42 tnn Exp $ +# $NetBSD: Makefile,v 1.67 2008/02/20 10:00:24 markd Exp $ DISTNAME= kdenetwork-${_KDE_VERSION} -PKGREVISION= 2 CATEGORIES= net COMMENT= Network modules for the KDE integrated X11 desktop diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index c062f557b27..4b011add096 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.44 2007/10/20 10:40:23 markd Exp $ +$NetBSD: distinfo,v 1.45 2008/02/20 10:00:24 markd Exp $ -SHA1 (kdenetwork-3.5.8.tar.bz2) = ad96484b0fce4d224195407ffdef3b040e5069cc -RMD160 (kdenetwork-3.5.8.tar.bz2) = 3941c56411ab4cdb89ae9de116a24d0906a275da -Size (kdenetwork-3.5.8.tar.bz2) = 9334188 bytes -SHA1 (patch-aa) = e075ad19377786359849263b9b872dd8116bec7c -SHA1 (patch-ab) = cd2fe9a73be928e391923947cb29cbbdeb79ae03 +SHA1 (kdenetwork-3.5.9.tar.bz2) = a4901468e94d3433468ebf1f2213b93b37496cca +RMD160 (kdenetwork-3.5.9.tar.bz2) = 3df73e0cd2b628cb49d12da3af663288aebdfd71 +Size (kdenetwork-3.5.9.tar.bz2) = 9339308 bytes +SHA1 (patch-aa) = 951a131ad509a7592fcb62885a6a2084f7d56fe1 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 -SHA1 (patch-ad) = 83bd8b1131366a093783f5dcbf498a0cd977009f SHA1 (patch-ae) = 401d126a6df6225641dd35803d3d467ec587c683 SHA1 (patch-af) = d1955d7712b980db173f765586e6dc373cf3eea0 SHA1 (patch-ag) = 6fad1af3bd383c01f80b7fa4da64184ad7172bb3 diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa index 5ed9c08b06a..2ae23f9c149 100644 --- a/net/kdenetwork3/patches/patch-aa +++ b/net/kdenetwork3/patches/patch-aa @@ -1,31 +1,10 @@ -$NetBSD: patch-aa,v 1.16 2006/10/12 10:47:18 markd Exp $ +$NetBSD: patch-aa,v 1.17 2008/02/20 10:00:24 markd Exp $ utmpx patch gets ktalkd to build on Solaris 10 but wont actually read the file properly - needs to be fixed. --- configure.orig 2006-10-03 07:24:51.000000000 +1300 +++ configure -@@ -43422,7 +43422,11 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - #include <unistd.h> - #include <arpa/inet.h> -+#ifdef __DragonFly__ -+#include <net/ppp_layer/ppp_defs.h> -+#else - #include <net/ppp_defs.h> -+#endif - #include <netinet/in.h> - - #ifdef __svr4__ -@@ -43438,6 +43442,8 @@ cat >>conftest.$ac_ext <<_ACEOF - - #if defined(linux) - #include <linux/if_ppp.h> -+ #elif defined(__DragonFly__) -+ #include <net/ppp/if_ppp.h> - #else - #include <net/if_ppp.h> /* BSD, NeXT, etc. */ - #endif @@ -44334,6 +44340,7 @@ else /var/run/utmp \ /var/adm/utmp \ diff --git a/net/kdenetwork3/patches/patch-ab b/net/kdenetwork3/patches/patch-ab deleted file mode 100644 index e6171bc1ffa..00000000000 --- a/net/kdenetwork3/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2005/11/18 15:04:57 joerg Exp $ - ---- kppp/opener.cpp.orig 2005-11-16 16:45:28.000000000 +0000 -+++ kppp/opener.cpp -@@ -68,7 +68,11 @@ extern "C" int _Precvmsg(int, void*, int - #endif - - #ifndef HAVE_NET_IF_PPP_H --# ifdef HAVE_LINUX_IF_PPP_H -+# if defined(__DragonFly__) -+# include <net/ppp_layer/ppp_defs.h> -+# include <net/if.h> -+# include <net/ppp/if_ppp.h> -+# elif defined(HAVE_LINUX_IF_PPP_H) - # include <linux/if_ppp.h> - # endif - #else diff --git a/net/kdenetwork3/patches/patch-ad b/net/kdenetwork3/patches/patch-ad deleted file mode 100644 index b3f486cb02b..00000000000 --- a/net/kdenetwork3/patches/patch-ad +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2006/03/30 02:47:01 markd Exp $ - ---- kppp/pppstats.cpp.orig 2006-03-17 23:12:34.000000000 +1300 -+++ kppp/pppstats.cpp -@@ -54,7 +54,11 @@ - #include <arpa/inet.h> - #include <unistd.h> - #include <netinet/in.h> -+#ifdef __DragonFly__ -+#include <net/ppp_layer/ppp_defs.h> -+#else - #include <net/ppp_defs.h> -+#endif - - #include "config.h" - #include "pppstats.h" -@@ -70,6 +74,9 @@ - #ifdef HAVE_LINUX_IF_PPP_H - #include <linux/if.h> - #include <linux/if_ppp.h> -+ #elif defined(__DragonFly__) -+ #include <net/if.h> -+ #include <net/ppp/if_ppp.h> - #endif - #else - #include <net/if.h> -@@ -218,26 +225,29 @@ bool PPPStats::initStats() { - - strlcpy(ifr.ifr_name, unitName, sizeof(ifr.ifr_name)); - -+ local_ip_address = ""; - if (ioctl(s, SIOCGIFADDR, &ifr) < 0) { -- } -+ kdDebug(5002) << "Cannot get ip address" << endl; -+ } else { -+ sinp = (struct sockaddr_in*)&ifr.ifr_addr; - -- sinp = (struct sockaddr_in*)&ifr.ifr_addr; -+ if(sinp->sin_addr.s_addr) -+ local_ip_address = inet_ntoa(sinp->sin_addr); - -- if(sinp->sin_addr.s_addr) -- local_ip_address = inet_ntoa(sinp->sin_addr); -- else -- local_ip_address = ""; -- kdDebug(5002) << "Local IP: " << local_ip_address << endl; -+ kdDebug(5002) << "Local IP: " << local_ip_address << endl; -+ } - -- (void) ioctl(s, SIOCGIFDSTADDR, &ifr); -+ remote_ip_address = ""; -+ if (ioctl(s, SIOCGIFDSTADDR, &ifr) < 0) { -+ kdDebug(5002) << "Cannot get remote ip address" << endl; -+ } else { -+ sinp = (struct sockaddr_in*)&ifr.ifr_dstaddr; - -- sinp = (struct sockaddr_in*)&ifr.ifr_dstaddr; -+ if(sinp->sin_addr.s_addr) -+ remote_ip_address = inet_ntoa(sinp->sin_addr); - -- if(sinp->sin_addr.s_addr) -- remote_ip_address = inet_ntoa(sinp->sin_addr); -- else -- remote_ip_address = ""; -- kdDebug(5002) << "Remote IP: " << remote_ip_address << endl; -+ kdDebug(5002) << "Remote IP: " << remote_ip_address << endl; -+ } - - return true; - |