Update to KDE 3.0.3.

While I'm here do the a.out dance for kuickshow and a couple of other minor clean ups. Changes are: kdelibs kprocess / kprocctrl: fix problem with hanging kdevelop. Javascript (core): more robust stack overflow check Javascript (html): allow to set a JS (non-CSS) property to a style object Javascript (html): improved result of navigator.platform using uname() Javascript (html): more aggressive garbage collection on clear, fixing many crashes Javascript (html): global object (window) has a correct object prototype now khtml: several crashes and bugs fixed kssl: Always verify the basic constraints on certificates (SECURITY) kdefx: Make the blending routine used by transparent menus work properly on big-endian platforms kdeui: Fix KDialog::setPlainCaption() kdebase Build fixes for IRIX / MipsPro (kcontrol, konqueror, konsole). Kicker: Quick browser escapes ampersand characters in file names. Konsole: Don't prepend ESC if Meta is pressed if key definition is for "+Alt". Konsole: Fixed crashes at startup related to broken font installations. Konsole: Fixed crashes when selecting in history buffer. krdb: Smarter handling of multiple and symlinked KDE and Qt installs when exporting plugin path to Qt. kdenetwork KMail: allow an ampersand as last char of an URL. KMail: Don't crash when custom drafts or sent-mail folders have been deleted or renamed. KMail: Fix auto charset detection for empty strings. KMail/KNode: Correctly handle quotes in user ids of OpenPGP keys. KMail: Make custom (global) Bcc headers work correctly with encryption and distribution list expansion. kdepim KAlarm: Fix session restoration often not occurring at login. KAlarm: Adjust wrong summer times stored by KDE 3.0.0 version of KAlarm. KAlarm: Make Close button on message window not the default button to reduce chance of accidental acknowledgement. KAlarm: Make Help button in configuration dialog display KAlarm handbook. KNotes: Compile fix for Qt 3.0.5 KOrganizer: Fixed context menu of todo list/view and event list which disappeared when using Qt 3.0.5
author: skrll <skrll@pkgsrc.org> 2002-08-28 07:15:25 +0000
committer: skrll <skrll@pkgsrc.org> 2002-08-28 07:15:25 +0000
commit: 401b5cebdddb0ac1a0d64be8853f7a9fb0706c44 (patch)
tree: dde5e00cb2a63d230256b6177f12d9fb5c764bfc /x11
parent: 1b2f7013b853025b2f8465c86775fb54a090a21a (diff)
download: pkgsrc-401b5cebdddb0ac1a0d64be8853f7a9fb0706c44.tar.gz
12 files changed, 78 insertions, 150 deletions
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index f696763ee2d..e1292912755 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:33 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/28 07:15:38 skrll Exp $
 
-DISTNAME=	kde-3.0.2
+DISTNAME=	kde-3.0.3
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,17 +9,17 @@ MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeartwork-3.0.2:../../misc/kdeartwork3
-DEPENDS+=	kdeaddons-3.0.2:../../misc/kdeaddons3
-DEPENDS+=	kdeadmin-3.0.2:../../misc/kdeadmin3
-DEPENDS+=	kdeedu-3.0.2:../../misc/kdeedu3
-DEPENDS+=	kdegames-3.0.2:../../games/kdegames3
-DEPENDS+=	kdegraphics-3.0.2:../../graphics/kdegraphics3
-DEPENDS+=	kdemultimedia-3.0.2:../../audio/kdemultimedia3
-DEPENDS+=	kdenetwork-3.0.2:../../net/kdenetwork3
-DEPENDS+=	kdepim-3.0.2:../../misc/kdepim3
-DEPENDS+=	kdetoys-3.0.2:../../games/kdetoys3
-DEPENDS+=	kdeutils-3.0.2:../../misc/kdeutils3
+DEPENDS+=	kdeartwork-3.0.3:../../misc/kdeartwork3
+DEPENDS+=	kdeaddons-3.0.3:../../misc/kdeaddons3
+DEPENDS+=	kdeadmin-3.0.3:../../misc/kdeadmin3
+DEPENDS+=	kdeedu-3.0.3:../../misc/kdeedu3
+DEPENDS+=	kdegames-3.0.3:../../games/kdegames3
+DEPENDS+=	kdegraphics-3.0.3:../../graphics/kdegraphics3
+DEPENDS+=	kdemultimedia-3.0.3:../../audio/kdemultimedia3
+DEPENDS+=	kdenetwork-3.0.3:../../net/kdenetwork3
+DEPENDS+=	kdepim-3.0.3:../../misc/kdepim3
+DEPENDS+=	kdetoys-3.0.3:../../games/kdetoys3
+DEPENDS+=	kdeutils-3.0.3:../../misc/kdeutils3
 
 EXTRACT_ONLY=	# empty
 USE_X11BASE=	yes
diff --git a/x11/kde3/Makefile.kde3 b/x11/kde3/Makefile.kde3
index e76256a0592..3818f54a924 100644
--- a/x11/kde3/Makefile.kde3
+++ b/x11/kde3/Makefile.kde3
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.kde3,v 1.3 2002/08/25 19:23:33 jlam Exp $
+# $NetBSD: Makefile.kde3,v 1.4 2002/08/28 07:15:39 skrll Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # KDE3-distributed packages (they all share common configure and build
 # settings).
 
 CATEGORIES+=	kde
-_KDE_VERSION=	3.0.2
+_KDE_VERSION=	3.0.3
 MASTER_SITES?=	ftp://ftp.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
 		ftp://ftp.us.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
 		ftp://ftp.de.kde.org/pub/kde/stable/${_KDE_VERSION}/src/
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 12dc59b48af..3ce480be588 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 19:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/28 07:15:39 skrll Exp $
 
-DISTNAME=	kdebase-3.0.2
-PKGREVISION=	2
+DISTNAME=	kdebase-3.0.3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index df57bc874be..6b0815c02be 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:23:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/28 07:15:40 skrll Exp $
 bin/appletproxy
 bin/chooser
 bin/conttest
@@ -2698,7 +2698,6 @@ share/kde/services/searchproviders/msdn.desktop
 share/kde/services/searchproviders/nl-teletekst.desktop
 share/kde/services/searchproviders/php.desktop
 share/kde/services/searchproviders/python.desktop
-share/kde/services/searchproviders/realnames.desktop
 share/kde/services/searchproviders/rfc.desktop
 share/kde/services/searchproviders/rpmfind.desktop
 share/kde/services/searchproviders/ruby_application_archive.desktop
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 0a6cc699475..38193101ad1 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2002/08/25 19:23:35 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/08/28 07:15:41 skrll Exp $
 
-SHA1 (kdebase-3.0.2.tar.bz2) = 763af0ddce718789fae3dfe2b67036dbc2d01a02
-Size (kdebase-3.0.2.tar.bz2) = 13115043 bytes
+SHA1 (kdebase-3.0.3.tar.bz2) = 075eaa470e8927fec676613080cd7944c8f7f31f
+Size (kdebase-3.0.3.tar.bz2) = 13112153 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
@@ -76,8 +76,8 @@ SHA1 (patch-co) = 7640d199e0391afe6aa9b0d917b88dfd4a213090
 SHA1 (patch-cp) = 0624d4a11fdd617309dcb711d9beabb6d7d78b36
 SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f
 SHA1 (patch-cr) = ebbd1bafaf17691084ef835ef2f08866c6815924
-SHA1 (patch-cs) = 055cb75aa6b25f6593d947d760f47b63e953af77
-SHA1 (patch-ct) = fb62a0ddffbc46dd78f6fde2d4d9c05447b71ce0
+SHA1 (patch-cs) = ddbeb2f6cb81cd01685a163cf05941f6e83c2a64
+SHA1 (patch-ct) = 22001fb43fe1eac960460549fe4a4ebf8298cf1d
 SHA1 (patch-cu) = 470db728e7853edefda9731fac174bf04c7fd5aa
 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf
 SHA1 (patch-cw) = 79703f08c6f5c1690fe23b94b26ebb8c6908b29f
diff --git a/x11/kdebase3/patches/patch-cs b/x11/kdebase3/patches/patch-cs
index 530f876c0d0..f96099d0d5b 100644
--- a/x11/kdebase3/patches/patch-cs
+++ b/x11/kdebase3/patches/patch-cs
@@ -1,8 +1,8 @@
-$NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $
+$NetBSD: patch-cs,v 1.3 2002/08/28 07:15:41 skrll Exp $
 
---- konsole/konsole/Makefile.am.orig	Wed May  8 19:22:37 2002
+--- konsole/konsole/Makefile.am.orig	Mon Aug  5 15:56:24 2002
 +++ konsole/konsole/Makefile.am
-@@ -12,7 +12,8 @@
+@@ -12,7 +12,8 @@ INCLUDES = $(all_includes)
  
  # you can add here more. This one gets installed
  bin_PROGRAMS = 	konsole konsole_grantpty kwrited #kcmkonsole
@@ -12,8 +12,8 @@ $NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $
  # libkonsolepart is a part, but konsole.la links directly to it, so we can't
  # install it under kde_module
  
-@@ -32,24 +33,34 @@
- libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @XTESTLIB@
+@@ -32,24 +33,32 @@ libkonsolepart_la_LDFLAGS = $(all_librar
+ libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS)
  
  # kwrited kdeinit module
 -kwrited_la_SOURCES = kwrited.cpp
@@ -45,18 +45,14 @@ $NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $
  konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  # konsole executable - has all the sources, doesn't link kparts, saves startup time
--konsole_SOURCES	= TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
--                  TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
+ konsole_SOURCES	= TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
+                   TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
 -                  konsole_wcwidth.cpp
-+konsole_SOURCES	= TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \
-+	session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \
-+	TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
-+	konsole_wcwidth.cpp konsole_main.cpp
-+
- konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@
++                  konsole_wcwidth.cpp konsole_main.cpp
+ konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI)
  konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
-@@ -91,9 +102,6 @@
+@@ -91,9 +100,6 @@ messages: rc.cpp
  	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot
  	rm -f schemas.cpp
  	rm -f tips.cpp
diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct
index 6b295534604..eb0d7397210 100644
--- a/x11/kdebase3/patches/patch-ct
+++ b/x11/kdebase3/patches/patch-ct
@@ -1,8 +1,8 @@
-$NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
+$NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $
 
---- konsole/konsole/Makefile.in.orig	Mon May 13 23:57:52 2002
+--- konsole/konsole/Makefile.in.orig	Wed Aug  7 18:19:54 2002
 +++ konsole/konsole/Makefile.in
-@@ -304,7 +304,9 @@
+@@ -304,7 +304,9 @@ INCLUDES = $(all_includes)
  
  # you can add here more. This one gets installed
  bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole
@@ -13,8 +13,8 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  
  # libkonsolepart is a part, but konsole.la links directly to it, so we can't
  # install it under kde_module
-@@ -337,28 +339,39 @@
- libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @XTESTLIB@
+@@ -337,18 +339,26 @@ libkonsolepart_la_LDFLAGS = $(all_librar
+ libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS)
  
  # kwrited kdeinit module
 -kwrited_la_SOURCES = kwrited.cpp
@@ -46,27 +46,16 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  # konsole executable - has all the sources, doesn't link kparts, saves startup time
--#>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
--#>- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
--#>- konsole_wcwidth.cpp
--#>+ 3
--konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
--	TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp   \
+@@ -358,7 +368,7 @@ konsole_la_LDFLAGS = $(all_libraries) -m
+ #>+ 3
+ konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \
+ 	TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp   \
 -	konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp
-+#>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \
-+#>- session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \
-+#>- TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \
-+#>- konsole_wcwidth.cpp konsole_main.cpp
-+#>+ 4
-+konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \
-+	session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \
-+	TEHistory.cpp keytrans.cpp   \
 +	konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp
-+
  
- konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@
+ konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI)
  konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-@@ -392,24 +405,25 @@
+@@ -392,24 +402,25 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -107,7 +96,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  libkonsolepart_la_DEPENDENCIES =
  am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \
  	schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \
-@@ -423,6 +437,15 @@
+@@ -423,6 +434,15 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt
  	libkonsolepart_la_meta_unload.lo 
  @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS)
@@ -123,7 +112,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \
  	kwrited$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
-@@ -431,7 +454,7 @@
+@@ -431,7 +451,7 @@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo
  	konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \
  	TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \
  	TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \
@@ -132,7 +121,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  #>- konsole_OBJECTS = $(am_konsole_OBJECTS)
  #>+ 9
  konsole_final_OBJECTS = konsole.all_cpp.o 
-@@ -439,7 +462,7 @@
+@@ -439,7 +459,7 @@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT
  	konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \
  	TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \
  	TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \
@@ -141,7 +130,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  	konsole_meta_unload.o 
  @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS)
-@@ -450,11 +473,11 @@
+@@ -450,11 +470,11 @@ am_konsole_grantpty_OBJECTS = konsole_gr
  konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT)
  konsole_grantpty_LDADD = $(LDADD)
  konsole_grantpty_DEPENDENCIES =
@@ -156,7 +145,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -469,15 +492,19 @@
+@@ -469,15 +489,19 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
  	@AMDEP_TRUE@	$(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \
  	@AMDEP_TRUE@	$(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \
  	@AMDEP_TRUE@	$(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \
@@ -182,7 +171,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -506,14 +533,15 @@
+@@ -506,14 +530,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \
@@ -200,7 +189,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -564,11 +592,15 @@
+@@ -564,11 +589,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons
  	$(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS)
  kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS)
@@ -216,7 +205,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -623,16 +655,19 @@
+@@ -623,16 +652,19 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmuVt102.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Po@am__quote@
@@ -237,7 +226,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/schema.Plo@am__quote@
-@@ -750,7 +785,7 @@
+@@ -750,7 +782,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
@@ -246,7 +235,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -892,9 +927,6 @@
+@@ -892,9 +924,6 @@ messages: rc.cpp
  	rm -f schemas.cpp
  	rm -f tips.cpp
  
@@ -256,7 +245,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  konsole.lo: konsole.o
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-@@ -978,29 +1010,16 @@
+@@ -978,29 +1007,16 @@ force-reedit:
  
  
  #>+ 12
@@ -295,7 +284,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  
  
  #>+ 12
-@@ -1017,6 +1036,19 @@
+@@ -1017,6 +1033,19 @@ libkonsolepart_la_meta_unload.cpp:  TEmu
  
  
  #>+ 12
@@ -315,7 +304,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  konsole_meta_unload.cpp:  TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc
  	@echo 'creating konsole_meta_unload.cpp'
  	@-rm -f konsole_meta_unload.cpp
-@@ -1031,14 +1063,14 @@
+@@ -1031,14 +1060,14 @@ konsole_meta_unload.cpp:  TEmulation.moc
  
  #>+ 3
  clean-moc-classes:
@@ -333,7 +322,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  	  echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \
  	done; \
-@@ -1046,11 +1078,11 @@
+@@ -1046,11 +1075,11 @@ konsole_la.all_cpp.cpp: $(srcdir)/Makefi
  	rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files
  
  #>+ 11
@@ -347,7 +336,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  	  echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \
  	done; \
-@@ -1058,6 +1090,18 @@
+@@ -1058,6 +1087,18 @@ kwrited_la.all_cpp.cpp: $(srcdir)/Makefi
  	rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files
  
  #>+ 11
@@ -366,7 +355,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp libkonsolepart_la_meta_unload.cpp  
  	@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
  	rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
-@@ -1070,11 +1114,23 @@
+@@ -1070,11 +1111,23 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir)
  	rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files
  
  #>+ 11
@@ -392,7 +381,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  	  echo "#include \"$$file\"" >> konsole.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \
  	done; \
-@@ -1082,11 +1138,11 @@
+@@ -1082,11 +1135,11 @@ konsole.all_cpp.cpp: $(srcdir)/Makefile.
  	rm -f konsole.all_cpp.final konsole.all_cpp.files
  
  #>+ 11
@@ -406,7 +395,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
  	  echo "#include \"$$file\"" >> kwrited.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \
  	done; \
-@@ -1095,20 +1151,20 @@
+@@ -1095,20 +1148,20 @@ kwrited.all_cpp.cpp: $(srcdir)/Makefile.
  
  #>+ 3
  clean-final:
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 196df2e4175..abde3f97a85 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/28 07:15:43 skrll Exp $
 
-DISTNAME=	kdelibs-3.0.2
-PKGREVISION=	1
+DISTNAME=	kdelibs-3.0.3
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 59222fb92e4..a655b48508e 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 19:23:50 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/08/28 07:15:43 skrll Exp $
 
-SHA1 (kdelibs-3.0.2.tar.bz2) = 6985e289b22a728045f829cb52412270f03b10cf
-Size (kdelibs-3.0.2.tar.bz2) = 7612798 bytes
+SHA1 (kdelibs-3.0.3.tar.bz2) = 54284f898a9f16eb0a0f14988308f20ce32d1d2c
+Size (kdelibs-3.0.3.tar.bz2) = 7623931 bytes
 SHA1 (patch-aa) = dc26c7d5f845e881d313745b25ef9e90ead5707f
 SHA1 (patch-ab) = d4f9efbd17df2ee9a5e6cbd1830e343f1b0a8abe
 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e
@@ -31,8 +31,8 @@ SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61
 SHA1 (patch-ba) = d834df468158dee2c4787e0602583d5019708197
 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
-SHA1 (patch-bd) = 3743da1e39eb09010afedc262612b8b280524088
-SHA1 (patch-be) = ac3f6b0a807e962440be86913579a6ecbcdc1fec
+SHA1 (patch-bd) = 53f6f18a93296b05f3a7f51152b37ba98c93ff2c
+SHA1 (patch-be) = 55db94a53b4a5ef10b3294b468c2844a84926d5b
 SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6
 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7
 SHA1 (patch-bh) = 92ac4dd4d340a0dd962d577300895511ea439029
@@ -53,5 +53,4 @@ SHA1 (patch-bv) = b25498d7705b1c9fae59dbe3ef68dd8bb5145419
 SHA1 (patch-bw) = 246c7123c8ec52944bd99cab1ec8b1226435f5e0
 SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019
 SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6
-SHA1 (patch-bz) = a1c226f880b66f6e126a9021fd866a6532594cdd
 SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51
diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd
index 1d821ad78eb..2bd59e82d1e 100644
--- a/x11/kdelibs3/patches/patch-bd
+++ b/x11/kdelibs3/patches/patch-bd
@@ -1,16 +1,8 @@
-$NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
+$NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $
 
---- kio/kssl/kopenssl.cc.orig	Wed Aug 14 15:37:35 2002
+--- kio/kssl/kopenssl.cc.orig	Mon Aug 12 19:33:58 2002
 +++ kio/kssl/kopenssl.cc
-@@ -105,6 +105,7 @@ static int (*K_SSL_CTX_use_certificate) 
- static int (*K_SSL_get_error) (SSL*, int) = NULL;
- static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL;
- static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL;
-+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL;
- static void (*K_sk_free) (STACK*) = NULL;
- static int (*K_sk_num) (STACK*) = NULL;
- static char* (*K_sk_pop) (STACK*) = NULL;
-@@ -173,7 +174,7 @@ void KOpenSSLProxy::destroy() {
+@@ -174,7 +174,7 @@ void KOpenSSLProxy::destroy() {
    _me = NULL;
  }
  
@@ -19,7 +11,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
  #include <qdir.h>
  #include <qstring.h>
  #include <qstringlist.h>
-@@ -236,26 +237,22 @@ KConfig *cfg;
+@@ -237,26 +237,22 @@ KConfig *cfg;
  
     delete cfg;
  
@@ -51,7 +43,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
  // FIXME: #define here for the various OS types to optimize
     libnamess 
  	     #ifdef hpux
-@@ -284,10 +281,16 @@ KConfig *cfg;
+@@ -285,10 +281,16 @@ KConfig *cfg;
  	     << "libcrypto.so.0.9.6"
               #endif
  	     ;
@@ -68,7 +60,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -299,9 +302,9 @@ KConfig *cfg;
+@@ -300,9 +302,9 @@ KConfig *cfg;
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
        }
@@ -79,15 +71,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
  
     if (_cryptoLib) {
  #ifdef HAVE_SSL 
-@@ -348,6 +351,7 @@ KConfig *cfg;
-       K_X509_REQ_free = (void (*)(X509_REQ*)) _cryptoLib->symbol("X509_REQ_free");
-       K_X509_REQ_new = (X509_REQ* (*)()) _cryptoLib->symbol("X509_REQ_new");
-       K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain");
-+      K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
-       K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
-       K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
-       K_sk_pop = (char* (*) (STACK *)) _cryptoLib->symbol("sk_pop");
-@@ -399,16 +403,14 @@ KConfig *cfg;
+@@ -401,16 +403,14 @@ KConfig *cfg;
  #endif
     }
  
@@ -109,7 +93,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -420,9 +422,9 @@ KConfig *cfg;
+@@ -422,9 +422,9 @@ KConfig *cfg;
           	_sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
        }
@@ -120,14 +104,3 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
  
     if (_sslLib) {
  #ifdef HAVE_SSL 
-@@ -930,6 +932,10 @@ char *KOpenSSLProxy::sk_value(STACK *s, 
- 
- void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
-    if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
-+}
-+
-+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
-+   if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose);
- }
- 
- 
diff --git a/x11/kdelibs3/patches/patch-be b/x11/kdelibs3/patches/patch-be
index 0f7d74a122e..a2318bf1181 100644
--- a/x11/kdelibs3/patches/patch-be
+++ b/x11/kdelibs3/patches/patch-be
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.3 2002/08/25 19:23:54 jlam Exp $
+$NetBSD: patch-be,v 1.4 2002/08/28 07:15:44 skrll Exp $
 
 --- kio/kssl/ksslcertificate.cc.orig	Wed Aug 14 15:48:38 2002
 +++ kio/kssl/ksslcertificate.cc
@@ -20,14 +20,3 @@ $NetBSD: patch-be,v 1.3 2002/08/25 19:23:54 jlam Exp $
  #ifdef HAVE_SSL
    d->m_cert = NULL;
    setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert()));
-@@ -541,9 +541,8 @@ KSSLCertificate::KSSLValidation KSSLCert
- 
-     //kdDebug(7029) << "KSSL setting CRL.............." << endl;
-     // int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
--    //
- 
--    // int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-+    d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER);
- 
-     //kdDebug(7029) << "KSSL verifying.............." << endl;
-     certStoreCTX->error = X509_V_OK;
diff --git a/x11/kdelibs3/patches/patch-bz b/x11/kdelibs3/patches/patch-bz
deleted file mode 100644
index 963f21bde93..00000000000
--- a/x11/kdelibs3/patches/patch-bz
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bz,v 1.2 2002/08/25 19:23:56 jlam Exp $
-
---- kio/kssl/kopenssl.h.orig	Wed Apr 10 23:00:44 2002
-+++ kio/kssl/kopenssl.h
-@@ -309,6 +309,10 @@ public:
-     */
-    void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
- 
-+   /*
-+    *   X509_STORE_CTX_set_purpose - set the purpose of the certificate 
-+    */
-+   void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
- 
-    /*
-     *   X509_verify_cert - verify the certificate
author	skrll <skrll@pkgsrc.org>	2002-08-28 07:15:25 +0000
committer	skrll <skrll@pkgsrc.org>	2002-08-28 07:15:25 +0000
commit	401b5cebdddb0ac1a0d64be8853f7a9fb0706c44 (patch)
tree	dde5e00cb2a63d230256b6177f12d9fb5c764bfc /x11
parent	1b2f7013b853025b2f8465c86775fb54a090a21a (diff)
download	pkgsrc-401b5cebdddb0ac1a0d64be8853f7a9fb0706c44.tar.gz