diff options
author | skrll <skrll@pkgsrc.org> | 2003-01-04 15:04:45 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2003-01-04 15:04:45 +0000 |
commit | c0f67e24278f416619fcec62720c8f683ab43995 (patch) | |
tree | 3ad05197a8ecad0cba4e5c04b5340098c7bf7dbc /x11/kdebase3 | |
parent | c81a9b197180a348600ae5fa9f9edcf45f7f2f9e (diff) | |
download | pkgsrc-c0f67e24278f416619fcec62720c8f683ab43995.tar.gz |
Fix a couple of mistakes.
Diffstat (limited to 'x11/kdebase3')
-rw-r--r-- | x11/kdebase3/distinfo | 4 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-df | 25 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-eq | 22 |
3 files changed, 8 insertions, 43 deletions
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index f0cde17fd81..ab6d4288881 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2003/01/02 09:12:33 skrll Exp $ +$NetBSD: distinfo,v 1.13 2003/01/04 15:04:45 skrll Exp $ SHA1 (kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1 Size (kdebase-3.0.5a.tar.bz2) = 13117676 bytes @@ -89,7 +89,7 @@ SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d SHA1 (patch-dd) = 2e9da1069c86ccafd19dbd0ed2b4594c5a4e2f71 SHA1 (patch-de) = 1fbea1abe5a8aefc0eacdc94d4ff60d26fb3c02a -SHA1 (patch-df) = f60490bb53ba5988ec212008615344d090635968 +SHA1 (patch-df) = dc52254033ede1582ac375bd47f356045da96970 SHA1 (patch-dg) = 2a0e3e14049665549a793cf0f785fc55cc1c7d5d SHA1 (patch-dh) = a89a4d94a568de02e7d095068356edf6e7011464 SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59 diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df index e716be18f31..e1bb85a8047 100644 --- a/x11/kdebase3/patches/patch-df +++ b/x11/kdebase3/patches/patch-df @@ -1,27 +1,14 @@ +$NetBSD: patch-df,v 1.7 2003/01/04 15:04:46 skrll Exp $ + --- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Tue Nov 5 02:41:09 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c Tue Nov 26 11:56:27 2002 -@@ -1,7 +1,7 @@ - /* - KSysGuard, the KDE System Guard - -- Copyright (c) 2001 Tobias Koenig <tokoe@kde.org> -+ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> - - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public -@@ -16,304 +16,269 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -- $Id: patch-df,v 1.6 2003/01/02 09:12:35 skrll Exp $ -+ $Id: patch-df,v 1.6 2003/01/02 09:12:35 skrll Exp $ ++++ ksysguard/ksysguardd/FreeBSD/netdev.c +@@ -20,300 +20,265 @@ */ --#include <sys/types.h> -+#include <sys/types.h> /* for sys/socket.h, ifaddrs.h */ + #include <sys/types.h> +#include <ifaddrs.h> #include <sys/socket.h> -+#include <sys/param.h> /* for sys/sysctl.h */ ++#include <sys/param.h> #include <sys/sysctl.h> -#include <sys/time.h> - diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq deleted file mode 100644 index 211efb43ae6..00000000000 --- a/x11/kdebase3/patches/patch-eq +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-eq,v 1.2 2002/08/25 19:23:48 jlam Exp $ - ---- admin/am_edit.orig Tue Jun 25 10:10:02 2002 -+++ admin/am_edit -@@ -384,7 +384,16 @@ - # all modules are installed. automake doesn't know this, so we need to move - # this here from install-data to install-exec. - if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) { -- $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; -+ my $lookup2 = 'install-exec-am:\s*([^\n]*)'; -+ if ($MakefileData =~ /\n$lookup2\n/) { -+ my $newdeps = $1; -+ if ($newdeps =~ m/\s*install-libLTLIBRARIES\s*/) { -+ $newdeps =~ s/(install-libLTLIBRARIES)/$1 install-kde_moduleLTLIBRARIES/g; -+ substituteLine($lookup2, "install-exec-am: " . $newdeps); -+ } else { -+ $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; -+ } -+ } - my $lookup = 'install-data-am:\s*(.*)'; - if ($MakefileData =~ /\n$lookup\n/) { - my $newdeps = $1; |