Update to KDE 3.3.1

Changes:
* KHTML: fixed spurious deletion of textarea contents
* KHTML: fixed innerHTML getter to not behave like outerHTML
* KHTML: fix crash in caret mode
* KHTML: added missing <marquee> ECMAScript bindings
* KHTML: fixed missing Javascript-support for HTMLDocument.compatMode
* KHTML: fixed off-by-one error which caused decorations to exceed the
  selection-end by one pixel
* KHTML: fixed wrong positioning of text-decorations in selections
* KHTML: small paint optimization for render texts
* KHTML: fixed spurious scrollbars on the canvas when overflow of clipped
  children exceeds the viewport boundaries
* KHTML: fixed unreachable relatively positioned content on viewport
* KHTML: fixed unreachable positioned content in clipped blocks
* KHTML: fixed selection not being redrawn in overflow-area
* KHTML: jump-to-anchor fixes
* KHTML: Don't warn that a form was not submitted after pressing back button
* KHTML: fix crash on illegal CSS
* KHTML: On popular demand, double-click between two words selects both
  again as in KDE 3.2.
* kfile: Added "New Folder..." in context menu within KDirSelectDialog
* kfile: Enabled dragging of directories within KDirSelectDialog
* kfile: KURLRequester now popups KDirSelectDialog when a directory is
  requested
* kfile: Toggling hidden files didn't refresh the file selection list
* kio: Separate general from meta info in filetips
* don't crash when right clicking on a toolbar in some applications that
  are using KParts

3 files changed, 25 insertions, 8 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index b2380bd4439..49fb419e735 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.69 2004/10/13 11:47:51 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -46,9 +45,15 @@ pre-configure:
 	done
 
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink3.mk"
-BUILD_DEFS+=		USE_CUPS
+PKG_DEFAULT_OPTIONS+=	cups
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdelibs
+PKG_SUPPORTED_OPTIONS=	cups
+.include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/cups/buildlink3.mk"
 PLIST_SUBST+=		CUPS=
 .else
 PLIST_SUBST+=		CUPS="@comment "
@@ -138,6 +143,11 @@ CFLAGS:=        ${CFLAGS:C/-O[0-9]*/-O/g}
 CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
 CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
 .  endif
+#
+# Configure finds these but apparently they are not ready for primetime
+# and build will blow up as declarations in netdb.h are not visible
+CONFIGURE_ENV+= ac_cv_func_getservbyname_r='no'
+CONFIGURE_ENV+= ac_cv_func_getprotobyname_r='no'
 .endif
 
 .if ${OPSYS} == "SunOS"
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index 8cb5b4f2200..854f1a685a2 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/10/13 11:47:51 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -2460,6 +2460,7 @@ share/kde/config/kthemestylerc
 share/kde/config/language.codes
 share/kde/config/ui/kprintpreviewui.rc
 share/kde/config/ui/ui_standards.rc
+share/kde/icons/crystalsvg/128x128/actions/player_playlist.png
 share/kde/icons/crystalsvg/128x128/apps/password.png
 share/kde/icons/crystalsvg/128x128/devices/blockdevice.png
 share/kde/icons/crystalsvg/128x128/devices/chardevice.png
@@ -2739,6 +2740,7 @@ share/kde/icons/crystalsvg/16x16/actions/player_end.png
 share/kde/icons/crystalsvg/16x16/actions/player_fwd.png
 share/kde/icons/crystalsvg/16x16/actions/player_pause.png
 share/kde/icons/crystalsvg/16x16/actions/player_play.png
+share/kde/icons/crystalsvg/16x16/actions/player_playlist.png
 share/kde/icons/crystalsvg/16x16/actions/player_rew.png
 share/kde/icons/crystalsvg/16x16/actions/player_start.png
 share/kde/icons/crystalsvg/16x16/actions/player_stop.png
@@ -3124,6 +3126,7 @@ share/kde/icons/crystalsvg/22x22/actions/player_end.png
 share/kde/icons/crystalsvg/22x22/actions/player_fwd.png
 share/kde/icons/crystalsvg/22x22/actions/player_pause.png
 share/kde/icons/crystalsvg/22x22/actions/player_play.png
+share/kde/icons/crystalsvg/22x22/actions/player_playlist.png
 share/kde/icons/crystalsvg/22x22/actions/player_rew.png
 share/kde/icons/crystalsvg/22x22/actions/player_start.png
 share/kde/icons/crystalsvg/22x22/actions/player_stop.png
@@ -3393,6 +3396,7 @@ share/kde/icons/crystalsvg/32x32/actions/player_end.png
 share/kde/icons/crystalsvg/32x32/actions/player_fwd.png
 share/kde/icons/crystalsvg/32x32/actions/player_pause.png
 share/kde/icons/crystalsvg/32x32/actions/player_play.png
+share/kde/icons/crystalsvg/32x32/actions/player_playlist.png
 share/kde/icons/crystalsvg/32x32/actions/player_rew.png
 share/kde/icons/crystalsvg/32x32/actions/player_start.png
 share/kde/icons/crystalsvg/32x32/actions/player_stop.png
@@ -3624,6 +3628,7 @@ share/kde/icons/crystalsvg/48x48/actions/gear.png
 share/kde/icons/crystalsvg/48x48/actions/indent.png
 share/kde/icons/crystalsvg/48x48/actions/lock.png
 share/kde/icons/crystalsvg/48x48/actions/misc.png
+share/kde/icons/crystalsvg/48x48/actions/player_playlist.png
 share/kde/icons/crystalsvg/48x48/actions/share.png
 share/kde/icons/crystalsvg/48x48/actions/unindent.png
 share/kde/icons/crystalsvg/48x48/actions/up.png
@@ -3797,6 +3802,7 @@ share/kde/icons/crystalsvg/48x48/mimetypes/wordprocessing.png
 share/kde/icons/crystalsvg/48x48/mimetypes/zip.png
 share/kde/icons/crystalsvg/64x64/actions/favorites.png
 share/kde/icons/crystalsvg/64x64/actions/knewstuff.png
+share/kde/icons/crystalsvg/64x64/actions/player_playlist.png
 share/kde/icons/crystalsvg/64x64/apps/password.png
 share/kde/icons/crystalsvg/64x64/devices/3floppy_mount.png
 share/kde/icons/crystalsvg/64x64/devices/3floppy_unmount.png
@@ -4226,6 +4232,7 @@ share/kde/mimelnk/application/x-iso.desktop
 share/kde/mimelnk/application/x-jar.desktop
 share/kde/mimelnk/application/x-java-applet.desktop
 share/kde/mimelnk/application/x-java.desktop
+share/kde/mimelnk/application/x-javascript.desktop
 share/kde/mimelnk/application/x-karbon.desktop
 share/kde/mimelnk/application/x-kchart.desktop
 share/kde/mimelnk/application/x-kcsrc.desktop
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index e456e9cf9d5..fc19ae57238 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.43 2004/09/13 13:52:12 markd Exp $
+$NetBSD: distinfo,v 1.44 2004/10/13 11:47:51 markd Exp $
 
-SHA1 (kdelibs-3.3.0.tar.bz2) = 5016734fea03055fbf8331d6c262289cff18b880
-Size (kdelibs-3.3.0.tar.bz2) = 15703843 bytes
+SHA1 (kdelibs-3.3.1.tar.bz2) = 4411a1822d23c2ef5d0492d7fe609961d183af2c
+Size (kdelibs-3.3.1.tar.bz2) = 15573765 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
 SHA1 (patch-ae) = 8395dd9f24fb9cad91c1c04951dfc982cc8068f4