Update to kde 3.3.2

Changes:
* kdecore: recognize known names for the MacRoman charset
* khtml: only disallow fixed positioning on body, not relative/absolute
* khtml: added Javascript-support for HTMLDocument.compatMode
* khtml: fixed textarea manipulation by DOM
* khtml: paged media support (page-break-before and -after)
* khtml: correctly handle text-transform on first-letter
* khtml: fixed display: block on pseudo-elements
* khtml: return Undefined instead of Null for out-of-range indices
* khtml: fixed stopPropagation when called from the target node itself
* khtml: fixed htmlCompat mode for documents served as text/html
* khtml: fixed display: compact
* khtml: support z-order for text areas and list boxes
* khtml: don't set assume <select> got items when we calculate a height
  for items
* khtml: changed default horizontal margins for H1-H6 from auto to 0
* khtml: escape otherwise unencodable characters in form submits
* khtml: merged min,max-height fixes
* khtml: merged handling of event handlers
* khtml: implemented CSS 2.1 compliant parsing of background-position
* khtml: fixed m_value vs ATTR_VALUE problem which didn't allow sending
  mail on gmail
* khtml: make use of the suggested filename for images
* khtml: tons of bidi fixes
* khtml: enable strict CSS parsing also for transitional doctypes
* khtml: ignore height element for input elements that are not image
* khtml: form widget fixes for plastik (and others)
* khtml: make sure we are layouted before scrolling if we are still
  loading
* khtml: add compensated font scale from Todd Fahrner's "Toward a
  standard font size interval system"
* khtml: avoid triggering full repaints of the view before the first
  layout is done
* khtml: implement CSS3 property box-sizing to match MacIE, Opera and
  Mozilla
* khtml: fix globeandmail.com famlily of crashes
* khtml: floats and flowing around floats improvements
* khtml: fix textarea scrolling positions
* khtml: tons of fixes for tables
* khtml: remove hidden widgets from the painting
* khtml: avoid crashes on XML documents
* khtml: ignore relative positioning on table sections
* khtml: fix static position calculation for positioned elements
* khtml: support insertAdjacentHTML
* khtml: fix crash in sites manipulating frames
* khtml: async kwallet support
* khtml: fix selectorText() when no namespace is specified
* khtml: update the layout before fetching the computed values
* khtml: color 'http://foo' links as visited if 'http://foo/' is in
  history
* khtml: corrected ref-counting error leading to segfault/invalid
  memory usage
* khtml: fixed some memory corruptions with garbage HTML
* khtml: account for scrollbar height when sizing variable
  overflow:scroll/auto boxes

6 files changed, 388 insertions, 273 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 49fb419e735..ad78ab729b9 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2004/10/13 11:47:51 markd Exp $
+# $NetBSD: Makefile,v 1.70 2004/12/10 06:02:57 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -19,30 +20,31 @@ SGML_CATALOGS=		${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog
 SGML_CATALOGS+=		${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat
 SGML_CATALOGS+=		${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat
 
+.include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-LIBS+=			${EXPORT_SYMBOLS_LDFLAGS}
-.endif
+LIBS.NetBSD+=			${EXPORT_SYMBOLS_LDFLAGS}
+
+_SORTED!=	${ECHO} ${KDE3_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
+MAKE_DIRS+=	${_SORTED:S/^/${PREFIX}\//}
 
 REPLACE_PERL= \
 	kio/proxytype.pl \
 	kio/useragent.pl \
+	kio/misc/fileshareset \
 	kdeui/preparetips
 
-PLIST_SRC=		${WRKDIR}/PLIST
 UNLIMIT_RESOURCES=	datasize memorysize
 
-FIXUP_FILES= \
+SUBST_CLASSES+=			kdelibsfix
+SUBST_STAGE.kdelibsfix=		pre-configure
+SUBST_MESSAGE.kdelibsfix=	"Fixing hardcoded paths."
+SUBST_FILES.kdelibsfix= \
+	kdecore/kstandarddirs.cpp \
 	kdeui/ksconfig.cpp \
 	kio/kssl/kopenssl.cc
-
-pre-configure:
-	@for i in ${FIXUP_FILES}; do \
-		${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
-		     ${WRKSRC}/$${i} > ${WRKSRC}/$${i}.fixup && \
-		${MV} ${WRKSRC}/$${i}.fixup ${WRKSRC}/$${i}; \
-	done
+SUBST_SED.kdelibsfix=		-e 's:@LOCALBASE@:${LOCALBASE}:g' \
+	-e 's:@PKGLOCALEDIR@:${PKGLOCALEDIR}:g'
 
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
 PKG_DEFAULT_OPTIONS+=	cups
@@ -72,38 +74,14 @@ PLIST_SUBST+=		KDED_WORKAROUND=""
 .include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gssapi=yes
 
-# We will create the complete icon directory tree for use by other KDE3
-# packages at post-install time.
-#
-ICONCOLORS=	crystalsvg hicolor locolor
-ICONSIZES=	16x16 22x22 32x32 48x48 64x64 128x128
-ICONDIRS=	actions/kde actions apps devices filesystems mimetypes
+
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kde/locale
 .if ${OPSYS} == "NetBSD"
 .  if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
 	@${RM} ${PREFIX}/lib/kded.*
 .  endif
 .endif
-	@( ${CAT} ${PKGDIR}/PLIST;					\
-	   for color in ${ICONCOLORS}; do				\
-		colordir=share/kde/icons/$${color};			\
-		for size in ${ICONSIZES}; do				\
-			sizedir=$${colordir}/$${size};			\
-			for dir in ${ICONDIRS}; do			\
-				icondir=$${sizedir}/$${dir};		\
-				${INSTALL_DATA_DIR} ${PREFIX}/$${icondir}; \
-				${ECHO} "@exec ${MKDIR} %D/$${icondir}"; \
-				${ECHO} "@dirrm $${icondir}";		\
-			done;						\
-			${ECHO} "@dirrm $${sizedir}";			\
-		done;							\
-		${ECHO} "@dirrm $${colordir}";				\
-	  done;								\
-	  ${ECHO} "@dirrm share/kde/icons";				\
-	  ${ECHO} "@dirrm share/kde";					\
-	) > ${PLIST_SRC}
 
 .if ${MACHINE_ARCH} == "alpha"
 GCC_REQD+=		2.95
@@ -147,6 +125,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
 # 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_getservbyport_r='no'
 CONFIGURE_ENV+= ac_cv_func_getprotobyname_r='no'
 .endif
 
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index 6bfc41c0a18..0fd8d04c3ca 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2004/11/18 11:48:36 markd Exp $
+@comment $NetBSD: PLIST,v 1.20 2004/12/10 06:02:57 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -383,6 +383,7 @@ include/kio/tcpslavebase.h
 include/kio/thumbcreator.h
 include/kio/uiserver.h
 include/kio/uiserver_stub.h
+include/kiobuffer.h
 include/kipc.h
 include/kjanuswidget.h
 include/kjs/completion.h
@@ -681,6 +682,7 @@ include/kuser.h
 include/kuserprofile.h
 include/kvmallocator.h
 include/kwallet.h
+include/kwallettypes.h
 include/kwin.h
 include/kwindowinfo.h
 include/kwindowlistmenu.h
@@ -1269,6 +1271,7 @@ share/kde/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/cs/lang.entities
@@ -4139,10 +4142,10 @@ share/kde/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/kde/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/kde/icons/default.kde
 share/kde/icons/hicolor/index.theme
-share/kde/locale/all_languages
 share/kde/mimelnk/all/all.desktop
 share/kde/mimelnk/all/allfiles.desktop
 share/kde/mimelnk/application/illustrator.desktop
+share/kde/mimelnk/application/java.desktop
 share/kde/mimelnk/application/mathml+xml.desktop
 share/kde/mimelnk/application/msexcel.desktop
 share/kde/mimelnk/application/mspowerpoint.desktop
@@ -4293,6 +4296,7 @@ share/kde/mimelnk/application/x-zerosize.desktop
 share/kde/mimelnk/application/x-zip.desktop
 share/kde/mimelnk/application/x-zoo.desktop
 share/kde/mimelnk/application/xhtml+xml.desktop
+share/kde/mimelnk/application/xml.desktop
 share/kde/mimelnk/audio/aac.desktop
 share/kde/mimelnk/audio/ac3.desktop
 share/kde/mimelnk/audio/basic.desktop
@@ -4505,221 +4509,139 @@ share/kde/servicetypes/ktexteditorplugin.desktop
 share/kde/servicetypes/kurifilterplugin.desktop
 share/kde/servicetypes/renamedlgplugin.desktop
 share/kde/servicetypes/scriptinterface.desktop
+${PKGLOCALEDIR}/locale/all_languages
 @comment in xmlcatmgr: share/sgml/catalog
-@dirrm share/kde/servicetypes
-@dirrm share/kde/services/kresources/kabc
-@dirrm share/kde/services/kresources
-@dirrm share/kde/services/kded
-@exec ${MKDIR} %D/share/kde/services/kconfiguredialog
-@dirrm share/kde/services/kconfiguredialog
-@dirrm share/kde/services
-@dirrm share/kde/mimelnk/video
-@dirrm share/kde/mimelnk/text
-@dirrm share/kde/mimelnk/multipart
-@dirrm share/kde/mimelnk/model
-@dirrm share/kde/mimelnk/message
-@dirrm share/kde/mimelnk/inode
-@dirrm share/kde/mimelnk/image
-@dirrm share/kde/mimelnk/audio
-@dirrm share/kde/mimelnk/application
-@dirrm share/kde/mimelnk/all
-@dirrm share/kde/mimelnk
-@dirrm share/kde/locale
-@exec ${MKDIR} %D/share/kde/icons/locolor/64x64/mimetypes
-@dirrm share/kde/icons/locolor/64x64/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/locolor/64x64/filesystems
-@dirrm share/kde/icons/locolor/64x64/filesystems
-@exec ${MKDIR} %D/share/kde/icons/locolor/64x64/devices
-@dirrm share/kde/icons/locolor/64x64/devices
-@exec ${MKDIR} %D/share/kde/icons/locolor/64x64/apps
-@dirrm share/kde/icons/locolor/64x64/apps
-@exec ${MKDIR} %D/share/kde/icons/locolor/64x64/actions/kde
-@dirrm share/kde/icons/locolor/64x64/actions/kde
-@dirrm share/kde/icons/locolor/64x64/actions
-@dirrm share/kde/icons/locolor/64x64
-@exec ${MKDIR} %D/share/kde/icons/locolor/48x48/mimetypes
-@dirrm share/kde/icons/locolor/48x48/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/locolor/48x48/filesystems
-@dirrm share/kde/icons/locolor/48x48/filesystems
-@exec ${MKDIR} %D/share/kde/icons/locolor/48x48/devices
-@dirrm share/kde/icons/locolor/48x48/devices
-@exec ${MKDIR} %D/share/kde/icons/locolor/48x48/apps
-@dirrm share/kde/icons/locolor/48x48/apps
-@exec ${MKDIR} %D/share/kde/icons/locolor/48x48/actions/kde
-@dirrm share/kde/icons/locolor/48x48/actions/kde
-@dirrm share/kde/icons/locolor/48x48/actions
-@dirrm share/kde/icons/locolor/48x48
-@exec ${MKDIR} %D/share/kde/icons/locolor/32x32/mimetypes
-@dirrm share/kde/icons/locolor/32x32/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/locolor/32x32/filesystems
-@dirrm share/kde/icons/locolor/32x32/filesystems
-@exec ${MKDIR} %D/share/kde/icons/locolor/32x32/devices
-@dirrm share/kde/icons/locolor/32x32/devices
-@exec ${MKDIR} %D/share/kde/icons/locolor/32x32/actions/kde
-@dirrm share/kde/icons/locolor/32x32/actions/kde
-@dirrm share/kde/icons/locolor/32x32/actions
-@dirrm share/kde/icons/locolor/32x32
-@exec ${MKDIR} %D/share/kde/icons/locolor/22x22/mimetypes
-@dirrm share/kde/icons/locolor/22x22/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/locolor/22x22/filesystems
-@dirrm share/kde/icons/locolor/22x22/filesystems
-@exec ${MKDIR} %D/share/kde/icons/locolor/22x22/devices
-@dirrm share/kde/icons/locolor/22x22/devices
-@exec ${MKDIR} %D/share/kde/icons/locolor/22x22/actions/kde
-@dirrm share/kde/icons/locolor/22x22/actions/kde
-@dirrm share/kde/icons/locolor/22x22/actions
-@dirrm share/kde/icons/locolor/22x22
-@exec ${MKDIR} %D/share/kde/icons/locolor/16x16/mimetypes
-@dirrm share/kde/icons/locolor/16x16/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/locolor/16x16/filesystems
-@dirrm share/kde/icons/locolor/16x16/filesystems
-@exec ${MKDIR} %D/share/kde/icons/locolor/16x16/devices
-@dirrm share/kde/icons/locolor/16x16/devices
-@exec ${MKDIR} %D/share/kde/icons/locolor/16x16/actions/kde
-@dirrm share/kde/icons/locolor/16x16/actions/kde
-@dirrm share/kde/icons/locolor/16x16/actions
-@dirrm share/kde/icons/locolor/16x16
-@exec ${MKDIR} %D/share/kde/icons/locolor/128x128/mimetypes
-@dirrm share/kde/icons/locolor/128x128/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/locolor/128x128/filesystems
-@dirrm share/kde/icons/locolor/128x128/filesystems
-@exec ${MKDIR} %D/share/kde/icons/locolor/128x128/devices
-@dirrm share/kde/icons/locolor/128x128/devices
-@exec ${MKDIR} %D/share/kde/icons/locolor/128x128/apps
-@dirrm share/kde/icons/locolor/128x128/apps
-@exec ${MKDIR} %D/share/kde/icons/locolor/128x128/actions/kde
-@dirrm share/kde/icons/locolor/128x128/actions/kde
-@dirrm share/kde/icons/locolor/128x128/actions
-@dirrm share/kde/icons/locolor/128x128
-@dirrm share/kde/icons/locolor
-@exec ${MKDIR} %D/share/kde/icons/hicolor/64x64/mimetypes
-@dirrm share/kde/icons/hicolor/64x64/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/hicolor/64x64/filesystems
-@dirrm share/kde/icons/hicolor/64x64/filesystems
-@exec ${MKDIR} %D/share/kde/icons/hicolor/64x64/devices
-@dirrm share/kde/icons/hicolor/64x64/devices
-@exec ${MKDIR} %D/share/kde/icons/hicolor/64x64/actions/kde
-@dirrm share/kde/icons/hicolor/64x64/actions/kde
-@dirrm share/kde/icons/hicolor/64x64/actions
-@dirrm share/kde/icons/hicolor/64x64
-@exec ${MKDIR} %D/share/kde/icons/hicolor/48x48/mimetypes
-@dirrm share/kde/icons/hicolor/48x48/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/hicolor/48x48/filesystems
-@dirrm share/kde/icons/hicolor/48x48/filesystems
-@exec ${MKDIR} %D/share/kde/icons/hicolor/48x48/devices
-@dirrm share/kde/icons/hicolor/48x48/devices
-@exec ${MKDIR} %D/share/kde/icons/hicolor/48x48/actions/kde
-@dirrm share/kde/icons/hicolor/48x48/actions/kde
-@dirrm share/kde/icons/hicolor/48x48/actions
-@dirrm share/kde/icons/hicolor/48x48
-@exec ${MKDIR} %D/share/kde/icons/hicolor/32x32/mimetypes
-@dirrm share/kde/icons/hicolor/32x32/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/hicolor/32x32/filesystems
-@dirrm share/kde/icons/hicolor/32x32/filesystems
-@exec ${MKDIR} %D/share/kde/icons/hicolor/32x32/devices
-@dirrm share/kde/icons/hicolor/32x32/devices
-@exec ${MKDIR} %D/share/kde/icons/hicolor/32x32/actions/kde
-@dirrm share/kde/icons/hicolor/32x32/actions/kde
-@dirrm share/kde/icons/hicolor/32x32/actions
-@dirrm share/kde/icons/hicolor/32x32
-@exec ${MKDIR} %D/share/kde/icons/hicolor/22x22/mimetypes
-@dirrm share/kde/icons/hicolor/22x22/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/hicolor/22x22/filesystems
-@dirrm share/kde/icons/hicolor/22x22/filesystems
-@exec ${MKDIR} %D/share/kde/icons/hicolor/22x22/devices
-@dirrm share/kde/icons/hicolor/22x22/devices
-@exec ${MKDIR} %D/share/kde/icons/hicolor/22x22/actions/kde
-@dirrm share/kde/icons/hicolor/22x22/actions/kde
-@dirrm share/kde/icons/hicolor/22x22/actions
-@dirrm share/kde/icons/hicolor/22x22
-@exec ${MKDIR} %D/share/kde/icons/hicolor/16x16/mimetypes
-@dirrm share/kde/icons/hicolor/16x16/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/hicolor/16x16/filesystems
-@dirrm share/kde/icons/hicolor/16x16/filesystems
-@exec ${MKDIR} %D/share/kde/icons/hicolor/16x16/devices
-@dirrm share/kde/icons/hicolor/16x16/devices
-@exec ${MKDIR} %D/share/kde/icons/hicolor/16x16/actions/kde
-@dirrm share/kde/icons/hicolor/16x16/actions/kde
-@dirrm share/kde/icons/hicolor/16x16/actions
-@dirrm share/kde/icons/hicolor/16x16
-@exec ${MKDIR} %D/share/kde/icons/hicolor/128x128/mimetypes
-@dirrm share/kde/icons/hicolor/128x128/mimetypes
-@exec ${MKDIR} %D/share/kde/icons/hicolor/128x128/filesystems
-@dirrm share/kde/icons/hicolor/128x128/filesystems
-@exec ${MKDIR} %D/share/kde/icons/hicolor/128x128/devices
-@dirrm share/kde/icons/hicolor/128x128/devices
-@exec ${MKDIR} %D/share/kde/icons/hicolor/128x128/apps
-@dirrm share/kde/icons/hicolor/128x128/apps
-@exec ${MKDIR} %D/share/kde/icons/hicolor/128x128/actions/kde
-@dirrm share/kde/icons/hicolor/128x128/actions/kde
-@dirrm share/kde/icons/hicolor/128x128/actions
-@dirrm share/kde/icons/hicolor/128x128
-@dirrm share/kde/icons/hicolor
-@dirrm share/kde/icons/crystalsvg/scalable/mimetypes
-@dirrm share/kde/icons/crystalsvg/scalable/filesystems
-@dirrm share/kde/icons/crystalsvg/scalable/devices
-@dirrm share/kde/icons/crystalsvg/scalable/apps
-@dirrm share/kde/icons/crystalsvg/scalable/actions
-@dirrm share/kde/icons/crystalsvg/scalable
-@dirrm share/kde/icons/crystalsvg/64x64/mimetypes
-@dirrm share/kde/icons/crystalsvg/64x64/filesystems
-@dirrm share/kde/icons/crystalsvg/64x64/devices
-@dirrm share/kde/icons/crystalsvg/64x64/apps
-@exec ${MKDIR} %D/share/kde/icons/crystalsvg/64x64/actions/kde
-@dirrm share/kde/icons/crystalsvg/64x64/actions/kde
-@dirrm share/kde/icons/crystalsvg/64x64/actions
-@dirrm share/kde/icons/crystalsvg/64x64
-@dirrm share/kde/icons/crystalsvg/48x48/mimetypes
-@dirrm share/kde/icons/crystalsvg/48x48/filesystems
-@dirrm share/kde/icons/crystalsvg/48x48/devices
-@dirrm share/kde/icons/crystalsvg/48x48/apps
-@exec ${MKDIR} %D/share/kde/icons/crystalsvg/48x48/actions/kde
-@dirrm share/kde/icons/crystalsvg/48x48/actions/kde
-@dirrm share/kde/icons/crystalsvg/48x48/actions
-@dirrm share/kde/icons/crystalsvg/32x32/mimetypes
-@dirrm share/kde/icons/crystalsvg/32x32/filesystems
-@dirrm share/kde/icons/crystalsvg/32x32/devices
-@dirrm share/kde/icons/crystalsvg/32x32/apps
-@exec ${MKDIR} %D/share/kde/icons/crystalsvg/32x32/actions/kde
-@dirrm share/kde/icons/crystalsvg/32x32/actions/kde
-@dirrm share/kde/icons/crystalsvg/32x32/actions
-@dirrm share/kde/icons/crystalsvg/22x22/mimetypes
-@dirrm share/kde/icons/crystalsvg/22x22/filesystems
-@dirrm share/kde/icons/crystalsvg/22x22/devices
-@exec ${MKDIR} %D/share/kde/icons/crystalsvg/22x22/actions/kde
-@dirrm share/kde/icons/crystalsvg/22x22/actions/kde
-@dirrm share/kde/icons/crystalsvg/22x22/actions
-@dirrm share/kde/icons/crystalsvg/22x22
-@dirrm share/kde/icons/crystalsvg/16x16/mimetypes
-@dirrm share/kde/icons/crystalsvg/16x16/filesystems
-@dirrm share/kde/icons/crystalsvg/16x16/devices
-@dirrm share/kde/icons/crystalsvg/16x16/apps
-@exec ${MKDIR} %D/share/kde/icons/crystalsvg/16x16/actions/kde
-@dirrm share/kde/icons/crystalsvg/16x16/actions/kde
-@dirrm share/kde/icons/crystalsvg/16x16/actions
-@dirrm share/kde/icons/crystalsvg/128x128/mimetypes
-@dirrm share/kde/icons/crystalsvg/128x128/filesystems
-@dirrm share/kde/icons/crystalsvg/128x128/devices
-@dirrm share/kde/icons/crystalsvg/128x128/apps
-@exec ${MKDIR} %D/share/kde/icons/crystalsvg/128x128/actions/kde
-@dirrm share/kde/icons/crystalsvg/128x128/actions/kde
-@dirrm share/kde/icons/crystalsvg/128x128/actions
-@dirrm share/kde/icons/crystalsvg/128x128
-@dirrm share/kde/icons/crystalsvg
-@dirrm share/kde/icons
+@comment in kde: @dirrm share/kde/servicetypes
+@comment in kde: @dirrm share/kde/services/kresources/kabc
+@comment in kde: @dirrm share/kde/services/kresources
+@comment in kde: @dirrm share/kde/services/kded
+@comment in kde: @dirrm share/kde/services
+@comment in kde: @dirrm share/kde/mimelnk/video
+@comment in kde: @dirrm share/kde/mimelnk/text
+@comment in kde: @dirrm share/kde/mimelnk/multipart
+@comment in kde: @dirrm share/kde/mimelnk/model
+@comment in kde: @dirrm share/kde/mimelnk/message
+@comment in kde: @dirrm share/kde/mimelnk/inode
+@comment in kde: @dirrm share/kde/mimelnk/image
+@comment in kde: @dirrm share/kde/mimelnk/audio
+@comment in kde: @dirrm share/kde/mimelnk/application
+@comment in kde: @dirrm share/kde/mimelnk/all
+@comment in kde: @dirrm share/kde/mimelnk
+@comment in kde: @dirrm share/kde/icons/locolor/64x64/mimetypes
+@comment in kde: @dirrm share/kde/icons/locolor/64x64/filesystems
+@comment in kde: @dirrm share/kde/icons/locolor/64x64/devices
+@comment in kde: @dirrm share/kde/icons/locolor/64x64/apps
+@comment in kde: @dirrm share/kde/icons/locolor/64x64/actions
+@comment in kde: @dirrm share/kde/icons/locolor/64x64
+@comment in kde: @dirrm share/kde/icons/locolor/48x48/mimetypes
+@comment in kde: @dirrm share/kde/icons/locolor/48x48/filesystems
+@comment in kde: @dirrm share/kde/icons/locolor/48x48/devices
+@comment in kde: @dirrm share/kde/icons/locolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/locolor/48x48/actions
+@comment in kde: @dirrm share/kde/icons/locolor/48x48
+@comment in kde: @dirrm share/kde/icons/locolor/32x32/filesystems
+@comment in kde: @dirrm share/kde/icons/locolor/32x32/devices
+@comment in kde: @dirrm share/kde/icons/locolor/32x32/actions
+@comment in kde: @dirrm share/kde/icons/locolor/32x32
+@comment in kde: @dirrm share/kde/icons/locolor/22x22/mimetypes
+@comment in kde: @dirrm share/kde/icons/locolor/22x22/filesystems
+@comment in kde: @dirrm share/kde/icons/locolor/22x22/devices
+@comment in kde: @dirrm share/kde/icons/locolor/22x22/actions
+@comment in kde: @dirrm share/kde/icons/locolor/22x22
+@comment in kde: @dirrm share/kde/icons/locolor/16x16/filesystems
+@comment in kde: @dirrm share/kde/icons/locolor/16x16/devices
+@comment in kde: @dirrm share/kde/icons/locolor/16x16/actions
+@comment in kde: @dirrm share/kde/icons/locolor/16x16
+@comment in kde: @dirrm share/kde/icons/locolor/128x128/mimetypes
+@comment in kde: @dirrm share/kde/icons/locolor/128x128/filesystems
+@comment in kde: @dirrm share/kde/icons/locolor/128x128/devices
+@comment in kde: @dirrm share/kde/icons/locolor/128x128/apps
+@comment in kde: @dirrm share/kde/icons/locolor/128x128/actions
+@comment in kde: @dirrm share/kde/icons/locolor/128x128
+@comment in kde: @dirrm share/kde/icons/locolor
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/mimetypes
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/filesystems
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/devices
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/actions
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/mimetypes
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/filesystems
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/devices
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/actions
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/filesystems
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/devices
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/actions
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/mimetypes
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/filesystems
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/devices
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/actions
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/filesystems
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/devices
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/actions
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/mimetypes
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/filesystems
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/devices
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/actions
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128
+@comment in kde: @dirrm share/kde/icons/hicolor
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions/kde
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions/kde
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/mimetypes
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/filesystems
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/devices
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128
+@comment in kde: @dirrm share/kde/icons/crystalsvg
+@comment in kde: @dirrm share/kde/icons
 @dirrm share/kde/config/ui
 @dirrm share/kde/config/colors
-@dirrm share/kde/config
-@dirrm share/kde/autostart
+@comment in kde: @dirrm share/kde/config
+@comment in kde: @dirrm share/kde/autostart
 @dirrm share/kde/apps/proxyscout
 @dirrm share/kde/apps/ktexteditor_kdatatool
 @dirrm share/kde/apps/ktexteditor_isearch
 @dirrm share/kde/apps/ktexteditor_insertfile
 @dirrm share/kde/apps/ktexteditor_docwordcompletion
-@dirrm share/kde/apps/kstyle/themes
+@comment in kde: @dirrm share/kde/apps/kstyle/themes
 @dirrm share/kde/apps/kstyle/pixmaps/riscos
 @dirrm share/kde/apps/kstyle/pixmaps
-@dirrm share/kde/apps/kstyle
+@comment in kde: @dirrm share/kde/apps/kstyle
 @dirrm share/kde/apps/kssl
 @dirrm share/kde/apps/ksgmltools2/docbook/xsl/tools/profile
 @dirrm share/kde/apps/ksgmltools2/docbook/xsl/tools/olink
@@ -4828,8 +4750,6 @@ share/kde/servicetypes/scriptinterface.desktop
 @dirrm share/kde/apps/kio_uiserver/icons/crystalsvg
 @dirrm share/kde/apps/kio_uiserver/icons
 @dirrm share/kde/apps/kio_uiserver
-@exec ${MKDIR} %D/share/kde/apps/khtml/kpartplugins
-@dirrm share/kde/apps/khtml/kpartplugins
 @dirrm share/kde/apps/khtml/icons/crystalsvg/64x64/actions
 @dirrm share/kde/apps/khtml/icons/crystalsvg/64x64
 @dirrm share/kde/apps/khtml/icons/crystalsvg/48x48/actions
@@ -4845,7 +4765,7 @@ share/kde/servicetypes/scriptinterface.desktop
 @dirrm share/kde/apps/khtml/icons/crystalsvg
 @dirrm share/kde/apps/khtml/icons
 @dirrm share/kde/apps/khtml/css
-@dirrm share/kde/apps/khtml
+@comment in kde: @dirrm share/kde/apps/khtml
 @dirrm share/kde/apps/kdewidgets/pics
 @dirrm share/kde/apps/kdewidgets
 @dirrm share/kde/apps/kdeui/pics
@@ -4869,30 +4789,83 @@ share/kde/servicetypes/scriptinterface.desktop
 @dirrm share/kde/apps/kdeprint/icons/crystalsvg
 @dirrm share/kde/apps/kdeprint/icons
 @dirrm share/kde/apps/kdeprint/filters
-@dirrm share/kde/apps/kdeprint
-@dirrm share/kde/apps/kconf_update
-@dirrm share/kde/apps/kcm_componentchooser
+@comment in kde: @dirrm share/kde/apps/kdeprint
+@comment in kde: @dirrm share/kde/apps/kconf_update
+@comment in kde: @dirrm share/kde/apps/kcm_componentchooser
 @dirrm share/kde/apps/kcertpart
-@dirrm share/kde/apps/katepart/syntax
-@dirrm share/kde/apps/katepart
-@dirrm share/kde/apps/kabc/formats
-@dirrm share/kde/apps/kabc
+@comment in kde: @dirrm share/kde/apps/katepart/syntax
+@comment in kde: @dirrm share/kde/apps/katepart
+@comment in kde: @dirrm share/kde/apps/kabc/formats
+@comment in kde: @dirrm share/kde/apps/kabc
 @dirrm share/kde/apps/dcopidlng
 @dirrm share/kde/apps/LICENSES
-@dirrm share/kde/apps
-@dirrm share/kde
+@comment in kde: @dirrm share/kde/apps
 @dirrm share/doc/kde/HTML/en/kspell
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/libkmid/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/libkmid/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/libkmid
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kwallet/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kwallet/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kwallet
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kutils/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kutils/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kutils
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kresources/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kresources/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kresources
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kparts/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kparts/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kparts
 @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/knewstuff/html
 @dirrm share/doc/kde/HTML/en/kdelibs-apidocs/knewstuff/html
 @dirrm share/doc/kde/HTML/en/kdelibs-apidocs/knewstuff
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kmdi/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kmdi/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kmdi
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kjs/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kjs/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kjs
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kio/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kio/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kio
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/khtml/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/khtml/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/khtml
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kdeui/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdeui/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdeui
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kdeprint/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdeprint/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdeprint
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kdefx/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdefx/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdefx
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kdecore/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdecore/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kdecore
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kate/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kate/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kate
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/kabc/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kabc/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/kabc
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/interfaces/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/interfaces/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/interfaces
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/dcop/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/dcop/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/dcop
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/arts/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/arts/html
+@dirrm share/doc/kde/HTML/en/kdelibs-apidocs/arts
 @dirrm share/doc/kde/HTML/en/kdelibs-apidocs
-@dirrm share/doc/kde/HTML/en/common
-@dirrm share/doc/kde/HTML/en
-@dirrm share/applications/kde
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins/designer
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
+@comment in kde: @dirrm share/doc/kde/HTML/en/common
+@comment in kde: @dirrm share/doc/kde/HTML/en
+@comment in kde: @dirrm share/applications/kde
+@comment in kde: @dirrm lib/kde3/plugins/styles
+@comment in kde: @dirrm lib/kde3/plugins/designer
+@comment in kde: @dirrm lib/kde3/plugins
+@comment in kde: @dirrm lib/kde3
 @dirrm include/libkmid
 @dirrm include/ktexteditor
 @dirrm include/kspell2
@@ -4907,8 +4880,8 @@ share/kde/servicetypes/scriptinterface.desktop
 @dirrm include/kdesu
 @dirrm include/kdeprint/lpr
 @dirrm include/kdeprint
-@dirrm include/kate
-@dirrm include/kabc
-@dirrm include/dom
-@comment dirrm include/arts
+@comment in kde: @dirrm include/kate
+@comment in kde: @dirrm include/kabc
+@comment in kde: @dirrm include/dom
+@comment in arts: @dirrm include/arts
 @comment dirrm etc/xdg/menus
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index f1f407313ca..f2a2ca4112b 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/12/10 06:02:57 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -16,6 +16,8 @@ BUILDLINK_PACKAGES+=	kdelibs
 BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.2.0
 BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.3.0nb2
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
+
+.include "../../x11/kdelibs3/dirs.mk"
 .endif	# KDELIBS_BUILDLINK3_MK
 
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
diff --git a/x11/kdelibs3/dirs.mk b/x11/kdelibs3/dirs.mk
new file mode 100644
index 00000000000..7dfad175428
--- /dev/null
+++ b/x11/kdelibs3/dirs.mk
@@ -0,0 +1,136 @@
+# $NetBSD: dirs.mk,v 1.1 2004/12/10 06:02:57 markd Exp $
+#
+
+.if !defined(DIRS_KDE3_MK)
+DIRS_XDG_MK=	#defined
+
+KDE3_DIRS=	include/dom
+KDE3_DIRS+=	include/kabc
+KDE3_DIRS+=	include/kate
+KDE3_DIRS+=	lib/kconf_update_bin
+KDE3_DIRS+=	lib/kde3
+KDE3_DIRS+=	lib/kde3/plugins
+KDE3_DIRS+=	lib/kde3/plugins/designer
+KDE3_DIRS+=	lib/kde3/plugins/styles
+KDE3_DIRS+=	share/applications/kde
+KDE3_DIRS+=	share/desktop-directories
+KDE3_DIRS+=	share/doc/kde
+KDE3_DIRS+=	share/doc/kde/HTML
+KDE3_DIRS+=	share/doc/kde/HTML/en
+KDE3_DIRS+=	share/doc/kde/HTML/en/common
+KDE3_DIRS+=	share/doc/kde/HTML/en/kcontrol
+KDE3_DIRS+=	share/doc/kde/HTML/en/kinfocenter
+
+_LANGS= cs da de en_GB es et eu fi fr he hr hu it ja nl pt pt_BR \
+	ro ru sk sl sr sv tr uk zh_CN zh_TW
+.for dir in ${_LANGS}
+KDE3_DIRS+=	share/doc/kde/HTML/${dir}
+.endfor
+
+KDE3_DIRS+=	share/kde
+KDE3_DIRS+=	share/kde/applnk
+KDE3_DIRS+=	share/kde/applnk/.hidden
+KDE3_DIRS+=	share/kde/applnk/Applications
+KDE3_DIRS+=	share/kde/applnk/Development
+KDE3_DIRS+=	share/kde/applnk/Editors
+KDE3_DIRS+=	share/kde/applnk/Graphics
+KDE3_DIRS+=	share/kde/applnk/Internet
+KDE3_DIRS+=	share/kde/applnk/Settings
+KDE3_DIRS+=	share/kde/applnk/Settingsmenu
+KDE3_DIRS+=	share/kde/applnk/System
+KDE3_DIRS+=	share/kde/applnk/System/ScreenSavers
+KDE3_DIRS+=	share/kde/applnk/Toys
+KDE3_DIRS+=	share/kde/applnk/Utilities
+KDE3_DIRS+=	share/kde/apps
+KDE3_DIRS+=	share/kde/apps/kabc
+KDE3_DIRS+=	share/kde/apps/kabc/formats
+KDE3_DIRS+=	share/kde/apps/kaddressbook
+KDE3_DIRS+=	share/kde/apps/kate
+KDE3_DIRS+=	share/kde/apps/kate/plugins
+KDE3_DIRS+=	share/kde/apps/kate/scripts
+KDE3_DIRS+=	share/kde/apps/katepart
+KDE3_DIRS+=	share/kde/apps/katepart/syntax
+KDE3_DIRS+=	share/kde/apps/kcm_componentchooser
+KDE3_DIRS+=	share/kde/apps/kconf_update
+KDE3_DIRS+=	share/kde/apps/kcontrol
+KDE3_DIRS+=	share/kde/apps/kcontrol/pics
+KDE3_DIRS+=	share/kde/apps/kdeprint
+KDE3_DIRS+=	share/kde/apps/kdesktop
+KDE3_DIRS+=	share/kde/apps/kdesktop/programs
+KDE3_DIRS+=	share/kde/apps/khangman
+KDE3_DIRS+=	share/kde/apps/khangman/data
+KDE3_DIRS+=	share/kde/apps/khtml
+KDE3_DIRS+=	share/kde/apps/khtml/kpartplugins
+KDE3_DIRS+=	share/kde/apps/kicker
+KDE3_DIRS+=	share/kde/apps/kicker/applets
+KDE3_DIRS+=	share/kde/apps/kicker/extensions
+KDE3_DIRS+=	share/kde/apps/klettres
+KDE3_DIRS+=	share/kde/apps/konqsidebartng
+KDE3_DIRS+=	share/kde/apps/konqsidebartng/virtual_folders
+KDE3_DIRS+=	share/kde/apps/konqsidebartng/virtual_folders/services
+KDE3_DIRS+=	share/kde/apps/konqueror
+KDE3_DIRS+=	share/kde/apps/konqueror/dirtree
+KDE3_DIRS+=	share/kde/apps/konqueror/dirtree/remote
+KDE3_DIRS+=	share/kde/apps/konqueror/kpartplugins
+KDE3_DIRS+=	share/kde/apps/konqueror/servicemenus
+KDE3_DIRS+=	share/kde/apps/kstyle
+KDE3_DIRS+=	share/kde/apps/kstyle/themes
+KDE3_DIRS+=	share/kde/apps/ktuberling
+KDE3_DIRS+=	share/kde/apps/ktuberling/sounds
+KDE3_DIRS+=	share/kde/apps/kwin
+KDE3_DIRS+=	share/kde/apps/profiles
+KDE3_DIRS+=	share/kde/autostart
+KDE3_DIRS+=	share/kde/config
+KDE3_DIRS+=	share/kde/config/magic
+KDE3_DIRS+=	share/kde/config.kcfg
+
+_ICONCOLORS=     crystalsvg hicolor locolor
+_ICONSIZES=      16x16 22x22 32x32 48x48 64x64 128x128
+_ICONDIRS=       actions actions/kde apps devices filesystems mimetypes
+
+KDE3_DIRS+=	share/kde/icons
+.for color in ${_ICONCOLORS}
+KDE3_DIRS+=	share/kde/icons/${color}
+.  for size in ${_ICONSIZES}
+KDE3_DIRS+=	share/kde/icons/${color}/${size}
+.    for dir in ${_ICONDIRS}
+KDE3_DIRS+=	share/kde/icons/${color}/${size}/${dir}
+.    endfor
+.  endfor
+.endfor
+KDE3_DIRS+=	share/kde/icons/crystalsvg/scalable
+.for dir in ${_ICONDIRS}
+KDE3_DIRS+=	share/kde/icons/crystalsvg/scalable/${dir}
+.endfor
+
+KDE3_DIRS+=	share/kde/mimelnk
+KDE3_DIRS+=	share/kde/mimelnk/all
+KDE3_DIRS+=	share/kde/mimelnk/application
+KDE3_DIRS+=	share/kde/mimelnk/audio
+KDE3_DIRS+=	share/kde/mimelnk/fonts
+KDE3_DIRS+=	share/kde/mimelnk/image
+KDE3_DIRS+=	share/kde/mimelnk/inode
+KDE3_DIRS+=	share/kde/mimelnk/interface
+KDE3_DIRS+=	share/kde/mimelnk/kdedevice
+KDE3_DIRS+=	share/kde/mimelnk/message
+KDE3_DIRS+=	share/kde/mimelnk/model
+KDE3_DIRS+=	share/kde/mimelnk/multipart
+KDE3_DIRS+=	share/kde/mimelnk/print
+KDE3_DIRS+=	share/kde/mimelnk/text
+KDE3_DIRS+=	share/kde/mimelnk/video
+KDE3_DIRS+=	share/kde/services
+KDE3_DIRS+=	share/kde/services/kaddressbook
+KDE3_DIRS+=	share/kde/services/kconfiguredialog
+KDE3_DIRS+=	share/kde/services/kded
+KDE3_DIRS+=	share/kde/services/kresources
+KDE3_DIRS+=	share/kde/services/kresources/kabc
+KDE3_DIRS+=	share/kde/servicetypes
+KDE3_DIRS+=	share/kde/sounds
+KDE3_DIRS+=	share/kde/wallpapers
+
+.for dir in ${KDE3_DIRS}
+PRINT_PLIST_AWK+=       /^@dirrm ${dir:S|/|\\/|g}$$/ \
+                                { print "@comment in kde: " $$0; next; }
+.endfor
+
+.endif		# !defined(DIRS_KDE3_MK)
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index fc19ae57238..8df2a9c4c6f 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.44 2004/10/13 11:47:51 markd Exp $
+$NetBSD: distinfo,v 1.45 2004/12/10 06:02:57 markd Exp $
 
-SHA1 (kdelibs-3.3.1.tar.bz2) = 4411a1822d23c2ef5d0492d7fe609961d183af2c
-Size (kdelibs-3.3.1.tar.bz2) = 15573765 bytes
+SHA1 (kdelibs-3.3.2.tar.bz2) = 69325b603375d31d4d537955383f4893e4a7945f
+Size (kdelibs-3.3.2.tar.bz2) = 15623180 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
 SHA1 (patch-ae) = 8395dd9f24fb9cad91c1c04951dfc982cc8068f4
 SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
-SHA1 (patch-an) = 41d2721bd55d060cde630771dad0377dbe770d73
+SHA1 (patch-an) = 0fccfa014212073f235945732ef3a3329756f9b5
+SHA1 (patch-ao) = 5cc9be57db26a2615ae9c982eb2b894c2c193e6b
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 172e1146d4e1e49a1a61d7ddc415dbfa4e5c4088
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
diff --git a/x11/kdelibs3/patches/patch-ao b/x11/kdelibs3/patches/patch-ao
new file mode 100644
index 00000000000..ed3f7cc82a8
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ao
@@ -0,0 +1,24 @@
+$NetBSD: patch-ao,v 1.5 2004/12/10 06:02:57 markd Exp $
+
+diff -u -5 -d -p -r1.397.2.5 -r1.397.2.8
+--- kio/kio/job.cpp	9 Nov 2004 00:50:35 -0000	1.397.2.5
++++ kio/kio/job.cpp	8 Dec 2004 01:08:15 -0000	1.397.2.8
+@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
+                        if ( f.open( IO_ReadWrite ) )
+                        {
+                            f.close();
+                            KSimpleConfig config( path );
+                            config.setDesktopGroup();
+-                           config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
+-                           KURL urlName = (*it).uSource;
+-                           urlName.setPass( "" );
+-                           config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
++                           KURL url = (*it).uSource;
++                           url.setPass( "" );
++                           config.writePathEntry( QString::fromLatin1("URL"), url.url() );
++                           config.writeEntry( QString::fromLatin1("Name"), url.url() );
+                            config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
+                            QString protocol = (*it).uSource.protocol();
+                            if ( protocol == QString::fromLatin1("ftp") )
+                                config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
+                            else if ( protocol == QString::fromLatin1("http") )