[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Update to KDE-3.1.5.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cedfc6d486e3
branches:  trunk
changeset: 466306:cedfc6d486e3
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 15 10:15:14 2004 +0000

description:
Update to KDE-3.1.5.

Changes:
* konqueror: Fixed "Location bar forgets what you type if you dont press
  enter and change tabs"
* konqueror: Fixed "tabs resize (shrink) when clicked on while loading"
* konqueror: Don't show hardcoded shortcuts in tab context menu
* konqueror: Made "Detach Tab" create new konqueror window of proper size
* konqueror: Set location bar URL for new tabs immediately
* konsole: Fixed "List Sessions" feature.

Also add a kdm rc.d script (from Julio M. Merino Vidal)

diffstat:

 x11/kdebase3/Makefile         |    8 +-
 x11/kdebase3/PLIST            |    3 +-
 x11/kdebase3/distinfo         |   70 ++++----
 x11/kdebase3/files/kdm.sh     |   26 +++
 x11/kdebase3/patches/patch-aa |   16 +-
 x11/kdebase3/patches/patch-ac |  300 ++++++++++++++++++++++-------------------
 x11/kdebase3/patches/patch-ai |   64 ++------
 x11/kdebase3/patches/patch-am |   22 ++-
 x11/kdebase3/patches/patch-ao |  273 ++++++++++++++++++-------------------
 x11/kdebase3/patches/patch-aw |   26 +-
 x11/kdebase3/patches/patch-ba |  216 +++++++++++++++--------------
 x11/kdebase3/patches/patch-bg |   58 +++----
 x11/kdebase3/patches/patch-bk |   24 +-
 x11/kdebase3/patches/patch-bm |   37 ++--
 x11/kdebase3/patches/patch-bp |   22 +-
 x11/kdebase3/patches/patch-bq |   14 -
 x11/kdebase3/patches/patch-bs |   47 ++++--
 x11/kdebase3/patches/patch-bz |   80 ++++++-----
 x11/kdebase3/patches/patch-cd |  105 +++++++-------
 x11/kdebase3/patches/patch-ch |  210 ++++++++++++++--------------
 x11/kdebase3/patches/patch-cj |   36 ++--
 x11/kdebase3/patches/patch-cn |   89 ++++++------
 x11/kdebase3/patches/patch-ct |  184 ++++++++++++-------------
 x11/kdebase3/patches/patch-cz |   36 +---
 x11/kdebase3/patches/patch-dh |  133 ++++++++++--------
 x11/kdebase3/patches/patch-dn |   22 +-
 x11/kdebase3/patches/patch-dp |   14 +-
 x11/kdebase3/patches/patch-dr |   22 +-
 x11/kdebase3/patches/patch-dx |   21 +-
 x11/kdebase3/patches/patch-dz |   22 +-
 x11/kdebase3/patches/patch-eb |   22 +-
 x11/kdebase3/patches/patch-ed |  147 +++++++++-----------
 x11/kdebase3/patches/patch-eh |  109 +++++++-------
 x11/kdebase3/patches/patch-ej |   40 ++--
 x11/kdebase3/patches/patch-eq |   27 +--
 x11/kdebase3/patches/patch-et |   14 +-
 x11/kdebase3/patches/patch-fd |   14 +
 37 files changed, 1294 insertions(+), 1279 deletions(-)

diffs (truncated from 5210 to 300 lines):

diff -r b8782a3135af -r cedfc6d486e3 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Thu Jan 15 10:02:54 2004 +0000
+++ b/x11/kdebase3/Makefile     Thu Jan 15 10:15:14 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2004/01/03 18:49:59 reed Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/15 10:15:14 markd Exp $
 
-DISTNAME=      kdebase-3.1.4
-PKGREVISION=   3
+DISTNAME=      kdebase-3.1.5
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
@@ -24,6 +23,8 @@
 
 REPLACE_PERL=          kcontrol/fileshare/fileshareset
 
+RCD_SCRIPTS=           kdm
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
@@ -157,5 +158,6 @@
 .include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/qt3-tools/buildlink2.mk"
 .include "../../x11/kdelibs3/buildlink2.mk"
+.include "../../mk/kerberos.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r b8782a3135af -r cedfc6d486e3 x11/kdebase3/PLIST
--- a/x11/kdebase3/PLIST        Thu Jan 15 10:02:54 2004 +0000
+++ b/x11/kdebase3/PLIST        Thu Jan 15 10:15:14 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/05/22 02:42:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/01/15 10:15:14 markd Exp $
 bin/appletproxy
 bin/chooser
 bin/drkonqi
@@ -64,6 +64,7 @@
 bin/kxkb
 bin/startkde
 etc/ksysguarddrc
+etc/rc.d/kdm
 include/KBackgroundIface.h
 include/KDesktopIface.h
 include/KScreensaverIface.h
diff -r b8782a3135af -r cedfc6d486e3 x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo     Thu Jan 15 10:02:54 2004 +0000
+++ b/x11/kdebase3/distinfo     Thu Jan 15 10:15:14 2004 +0000
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.38 2003/11/08 13:13:49 jdolecek Exp $
+$NetBSD: distinfo,v 1.39 2004/01/15 10:15:14 markd Exp $
 
-SHA1 (kdebase-3.1.4.tar.bz2) = 8f6e69ee4a34fdfb5b5d090ef9a4125d7936a7c4
-Size (kdebase-3.1.4.tar.bz2) = 15192052 bytes
+SHA1 (kdebase-3.1.5.tar.bz2) = 489f802e2558db2025ca59ca888286a026bf2552
+Size (kdebase-3.1.5.tar.bz2) = 15163007 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = 55f763bd8ecbb1eadaeb4fb6982a35fce43ce1a5
+SHA1 (patch-aa) = 89cc384b677d1d6c9ef8282d1bd4b8d184d8191e
 SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44
-SHA1 (patch-ac) = 08793eed3b396839abf2b8ff3d52caafa3a9c59d
+SHA1 (patch-ac) = 87a5a42d1dbb50cb1e76532693c367508a75f7ba
 SHA1 (patch-ad) = 40be5fb84b1fe2a7a08e4c2119350246004e5b29
 SHA1 (patch-ae) = 2a1717aea4ee6b3a891dc93102af523db3801302
 SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1
 SHA1 (patch-ag) = eaa30fb93c43d93e4227bc5018e6b56a2680cea2
 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5
-SHA1 (patch-ai) = 4a210a71c4830f5a3dd6545c4a106e8bff8caba7
+SHA1 (patch-ai) = 8294023f053c2689eddffbf01d32c335f536fb16
 SHA1 (patch-aj) = 87e9ada51ab2d584cd3af40cc5772d52f7357429
 SHA1 (patch-ak) = 19ce7c8ec8726e7e97011d322b98ca67974e51b0
 SHA1 (patch-al) = 20d1860d839b90e73577e5c05f38753a45beed6c
-SHA1 (patch-am) = e8e7f42749eeebc57f0d4e13fc44dbcd08f5f65c
+SHA1 (patch-am) = 4acb2c8548b064ab472d6545b8f16cf8476404c2
 SHA1 (patch-an) = 36bc6f26f108830290fd107f94892b32f5975a24
-SHA1 (patch-ao) = 62ea78c61d9e259a23aa8575b45bcfa5fed69b18
+SHA1 (patch-ao) = c31c60390af7f121cab70ad3a8717a43adf26b1d
 SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2
 SHA1 (patch-aq) = e8a32080b981b8bc732cb76c060fb6b6cc0db5db
 SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d
@@ -28,92 +28,91 @@
 SHA1 (patch-at) = 2f747db0e1102ff219d1723598cbe4a6e78c0cbb
 SHA1 (patch-au) = 53228332fc535b161bae0985b09141dfa062a25f
 SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d
-SHA1 (patch-aw) = 129011c80dadcfe63eb74cb5bd59da5554fc34d7
+SHA1 (patch-aw) = 473ced4a3db648f915015ad4a8ebb35de0a1c99e
 SHA1 (patch-ax) = 27d74a4893edfa60bbfd1d2b7a993b7a3b236282
 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2
 SHA1 (patch-az) = 76629061210b9800da5267104085acc0cb521d81
-SHA1 (patch-ba) = e1057d92ed873e84ad6121322fa2f8f969a05e9e
+SHA1 (patch-ba) = f8b87788ca6aca5e2f9706f3c9b5ff7a08723bbe
 SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a
 SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
 SHA1 (patch-bd) = 1e13d72ec5fa3bc08641f24c999dbc0e33ab11b0
 SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786
 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5
-SHA1 (patch-bg) = e7f2975e44eec92e508c27c4c4bbf8ce9258cb2d
+SHA1 (patch-bg) = 310a3d1b91b510223c15ac79d4536c67df7cb207
 SHA1 (patch-bh) = 7cc29ef896f3337cee768439904f9adfeef792fe
 SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164
 SHA1 (patch-bj) = 53e4391ff75aa2766c9b4e0d7a4796b355af8081
-SHA1 (patch-bk) = 270f5362478c4b71740a53c900e21c05e123efd5
+SHA1 (patch-bk) = 80ed1bd3ef30aecbe15dfaf572dbc6755ff3325d
 SHA1 (patch-bl) = 6761e02d32c7afdf02f4717ee0b4875fc07c6aab
-SHA1 (patch-bm) = adab3f3d8d395aadd4404f6e2395507f030dd7f3
+SHA1 (patch-bm) = 79a9fd0d6731b3023363486c085ffd7b398012fd
 SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef
 SHA1 (patch-bo) = 5c0e1a396882d5436093d2597a4797a4414ead66
-SHA1 (patch-bp) = 1b51f504e3a0c72b4af9386813f767cc7957e90b
-SHA1 (patch-bq) = 188150254df32941fc1f37be34336ac7d8401ebe
+SHA1 (patch-bp) = b6bf3872aa3a4a7bd69a0bb7ecc31f349daf6ac1
 SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21
-SHA1 (patch-bs) = cd8eedc75f703010da01351daee4efdb8e8ad740
+SHA1 (patch-bs) = fba91b1e399d9285751b90311888b7369b76289f
 SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a
 SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16
 SHA1 (patch-bx) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9
 SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b
-SHA1 (patch-bz) = 87b82a90ac371949240f6dc68bc143666c1b356e
+SHA1 (patch-bz) = 58a28f1c7204b7e179cbd2412319057d62ea5aa4
 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b
 SHA1 (patch-cc) = 30af57e7c59c8484e6b562664e0cb5e32c36e144
-SHA1 (patch-cd) = 99838c42b20df7558df003bb34b736ae1e5d8f74
+SHA1 (patch-cd) = 65fdd27e126a8a9f0466236d78622cc938e8a952
 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e
 SHA1 (patch-cg) = b0a395b6c57e527da07f36256f2771d8ede58ac5
-SHA1 (patch-ch) = e8ec78e6c10c363211f0faf16bed06a765cbac73
+SHA1 (patch-ch) = 2169262518f56002e67c78e6e4501f59522dcbc5
 SHA1 (patch-ci) = 91a906ab0cdc12e0610e9920facdb100903426d4
-SHA1 (patch-cj) = b0991467eeb3c170e5172ea31c5cf75fc2d45766
+SHA1 (patch-cj) = 77665b0fcccff0456cb07c51d1843674123bf765
 SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd
 SHA1 (patch-cm) = 71ec2ce962ac46f6a9d9634001c7492d383b69ec
-SHA1 (patch-cn) = 61d8b8f99505eaf8e42dfdf8ce2d3fd0622309b4
+SHA1 (patch-cn) = 479c9eb941526beaf69841f7cb76db9f5c2dcb8c
 SHA1 (patch-cp) = e2a5a664b0ae0b582bf90253e3f0c91d68cdab9f
 SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f
 SHA1 (patch-cs) = 40fd36127054b092bb9a18f1f989060e9a0df018
-SHA1 (patch-ct) = ee9cdc12d3e7c75ab0be238dbe53b785ad725e11
+SHA1 (patch-ct) = 6b61eccce2bd22842568b6faebff52b9239974c4
 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf
 SHA1 (patch-cx) = 5e44d311404a839ab30c45d7a9ba764197a96b4b
 SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80
-SHA1 (patch-cz) = f74d50e90acab6a9da6e95266f78fd38657ce0a8
+SHA1 (patch-cz) = 3807ed902aa07bd1c28ccdedb61b38db2cd5e394
 SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81
 SHA1 (patch-dg) = 900ce410b99912583ab0620d20b2e0d597f7c3a4
-SHA1 (patch-dh) = 6d3d963900e31e4359c526c4efc17103973cd799
+SHA1 (patch-dh) = 778f0d994dbddb123c213daf97ec2194bcd0b8c8
 SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59
 SHA1 (patch-dj) = c3b5f503720234518192732e4ca3f32514aad1ff
 SHA1 (patch-dk) = 1933b34e056d384b59c86b78301fa3c21854b33d
 SHA1 (patch-dl) = 863ece9d3b0b00ea2660d0f91e73f48bdafa3894
 SHA1 (patch-dm) = 866cb67d9bb39f889226ef5c588552379d153eff
-SHA1 (patch-dn) = 76e7a0dec98f63cc8e9addc4a3fdd0f07710110f
+SHA1 (patch-dn) = 6ea2c644d31eca109c4657ab64c0e2f56ba2d0a5
 SHA1 (patch-do) = b8712d7d7b242896f034f147969721d4cc0d50e9
-SHA1 (patch-dp) = f75bb540aa59c0df3a89b837ae93c62815f56d43
+SHA1 (patch-dp) = 2c5c9461b53b43e0c25069b54e709218896565ab
 SHA1 (patch-dq) = d354ec69536f68253597fc6912c8ffc5e5d19796
-SHA1 (patch-dr) = 5edc88e7e28731d85442bf4a26b95ab2ca2eca0a
+SHA1 (patch-dr) = c32988360a5a0f938a12ea376fd9c781fbbabe0a
 SHA1 (patch-ds) = 4a8bc0f2624fb8ee1ddf7013e751d6fb93e4d47b
 SHA1 (patch-dt) = 90baacdc4d0f85baeb3ea0c3f227cbffb37c08f1
 SHA1 (patch-du) = 9069c9775c1a2b309bcd23d971fb8f24dcd36cf6
 SHA1 (patch-dv) = c19d5ea88fad2cbffed3c42d58dd5b3dfb3982b4
 SHA1 (patch-dw) = a50a08c8a1eafeffe187512de9bda98edb5f5045
-SHA1 (patch-dx) = f1b7b494ead663b0995ab97b1334f6c49bfbe69b
+SHA1 (patch-dx) = 7e9f24f67b44a542b6346bd80f159539014864b4
 SHA1 (patch-dy) = c80bae613812210e1e0fbc29c767b476f925cf9c
-SHA1 (patch-dz) = 01b735d0aed64b2a046cd6bea8c7387a9bcefafc
+SHA1 (patch-dz) = 0f3d737904114f906d33f42a50b6969a293d13c8
 SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714
-SHA1 (patch-eb) = 2f1778a43bf5c64d3265380e0c7211d6b8279da2
+SHA1 (patch-eb) = 473b4f0111d5a86249371d51ef671a2bcbfead73
 SHA1 (patch-ec) = 8c9d6be582eb92ad720bf02aace5660e1c6c0dec
-SHA1 (patch-ed) = 7dd9f659d5b361daa1849ae0f06449985cfde74d
+SHA1 (patch-ed) = 0f5968e790d547b9b41d12fbb7ea99e0454636e5
 SHA1 (patch-ee) = 9311858579184fc50cd1345b251607cd14e3dff3
 SHA1 (patch-ef) = edef4f29fa65a51986306055a24fcccf7739bdef
 SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610
-SHA1 (patch-eh) = 0b1987583255018fdbc4b844b81715197f938bbf
+SHA1 (patch-eh) = ab160ddc92d4dd601b89a5b7e43e1427549f00df
 SHA1 (patch-ei) = f1a9d5155af533f3628f9e3ea68f62384f3febe7
-SHA1 (patch-ej) = 3dea867394534af3902fa6654de7ca8e9b97137b
+SHA1 (patch-ej) = eaac77fe210920a5729fc71eae8b0e979ebfec74
 SHA1 (patch-ek) = 774406667b24eeaa1539f58207354662de4cba94
 SHA1 (patch-em) = 75fa7c78bbe6aec49745d4988ddc82c46ab16efd
 SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1
 SHA1 (patch-ep) = 6762a5d93ea1d0c4ba7ef0b447eb1e3fb3deac82
-SHA1 (patch-eq) = 917ad364f7b1d4779d8972d78ceba0a966812077
+SHA1 (patch-eq) = 527bdbb2ad75b6bdb6633f3f432136fa01b81950
 SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380
 SHA1 (patch-es) = efe9aed66ab85970629bfd9c444b28282cc9db32
-SHA1 (patch-et) = 4a70d356cf351e67bf0b8bb62b0d7522b00a14cd
+SHA1 (patch-et) = 610488a6c7b006e632c9faab7fe7ecf1473c95cf
 SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
@@ -121,3 +120,4 @@
 SHA1 (patch-fa) = fc8d6f0e22548e86ad4d9f328a657c86ea9f51c4
 SHA1 (patch-fb) = 5f6895322c186813c43a3426dfe4d57a17090346
 SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
+SHA1 (patch-fd) = 0005eaf7eaecb6377da5342c27effd798f425c95
diff -r b8782a3135af -r cedfc6d486e3 x11/kdebase3/files/kdm.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/files/kdm.sh Thu Jan 15 10:15:14 2004 +0000
@@ -0,0 +1,26 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: kdm.sh,v 1.1 2004/01/15 10:15:14 markd Exp $
+#
+
+# PROVIDE: kdm
+# REQUIRE: DAEMON LOGIN wscons
+# KEYWORD: shutdown
+
+if [ -f /etc/rc.subr ]; then
+       . /etc/rc.subr
+fi
+
+name="kdm"
+rcvar=$name
+command="@PREFIX@/bin/${name}"
+pidfile="/var/run/xdm.pid"
+required_files="@PREFIX@/share/kde/config/kdm/kdmrc"
+
+if [ -f /etc/rc.subr ]; then
+       load_rc_config $name
+       run_rc_command "$1"
+else
+       echo -n " ${name}"
+       ${command} ${kdm_flags} ${command_args}
+fi
diff -r b8782a3135af -r cedfc6d486e3 x11/kdebase3/patches/patch-aa
--- a/x11/kdebase3/patches/patch-aa     Thu Jan 15 10:02:54 2004 +0000
+++ b/x11/kdebase3/patches/patch-aa     Thu Jan 15 10:15:14 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2003/11/08 13:13:49 jdolecek Exp $
+$NetBSD: patch-aa,v 1.11 2004/01/15 10:15:14 markd Exp $
 
---- configure.orig     2003-09-10 17:00:30.000000000 +0200
-+++ configure  2003-11-04 14:33:06.000000000 +0100
-@@ -23166,7 +23166,7 @@
+--- configure.orig     2003-12-17 14:22:44.000000000 +1300
++++ configure
+@@ -22983,7 +22983,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -11,14 +11,14 @@
                kde_cv_uic_plugins=yes
        fi
  fi
-@@ -31619,63 +31619,6 @@
+@@ -31436,63 +31436,6 @@ _ACEOF
  
  
  
 -  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
 -echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
+-/* #line $LINENO "configure" */
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -75,7 +75,7 @@
  echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
  echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
  
-@@ -33816,6 +33759,23 @@
+@@ -33636,6 +33579,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -99,7 +99,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -38765,6 +38725,7 @@
+@@ -38585,6 +38545,7 @@ fi
  case "$UNAME" in
        Linux) LIBHOSTS="$LIBSENSORS" ;;
        FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff -r b8782a3135af -r cedfc6d486e3 x11/kdebase3/patches/patch-ac
--- a/x11/kdebase3/patches/patch-ac     Thu Jan 15 10:02:54 2004 +0000
+++ b/x11/kdebase3/patches/patch-ac     Thu Jan 15 10:15:14 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $
+$NetBSD: patch-ac,v 1.7 2004/01/15 10:15:14 markd Exp $
 
---- kate/app/Makefile.in.orig  2003-07-15 22:03:17.000000000 +1200
+--- kate/app/Makefile.in.orig  2004-01-02 14:05:55.000000000 +1300
 +++ kate/app/Makefile.in
-@@ -421,7 +421,7 @@ target_os = @target_os@