Update to 3.0.3. Not much changed here: [1] i18n PKGNAMEs converted to

more closely conform to FreeBSD style etc, and Konqueror SSL patch merged.

Tested by:	Matt Douhan <matt@fruitsalad.org>, alane
Submitted by:	lioux [1]

6 files changed, 13 insertions, 68 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 113463fdb1ec..32857e3333d5 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -25,6 +24,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		cups.2:${PORTSDIR}/print/cups-base \
 		xslt.1:${PORTSDIR}/textproc/libxslt
+RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
+		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
@@ -38,6 +39,8 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 PREFIX?=	${KDE_PREFIX}
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
+FONTSCALE=	${X11BASE}/lib/X11/fonts/PEX/Roman.phont
+FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 
 .include "${.CURDIR}/../kde3/Makefile.kde"
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 530b93986456..e501a3a7a209 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.0.2.tar.bz2) = 0ad90a338aed63e54d073f511a99f0f2
+MD5 (KDE/kdelibs-3.0.3.tar.bz2) = f26acfafbd3a00451b6e344a7d75386d
diff --git a/x11/kdelibs3/files/patch-kopenssl.cc b/x11/kdelibs3/files/patch-kopenssl.cc
deleted file mode 100644
index 42339a3c337d..000000000000
--- a/x11/kdelibs3/files/patch-kopenssl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: kio/kssl/kopenssl.cc
-===================================================================
-RCS file: /home/kde/kdelibs/kio/kssl/kopenssl.cc,v
-retrieving revision 1.58.2.1
-retrieving revision 1.58.2.2
-diff -u -3 -p -r1.58.2.1 -r1.58.2.2
---- kio/kssl/kopenssl.cc	2002/04/10 22:00:44	1.58.2.1
-+++ kio/kssl/kopenssl.cc	2002/08/12 16:45:14	1.58.2.2
-@@ -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;
-@@ -348,6 +349,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");
-@@ -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/files/patch-kopenssl.h b/x11/kdelibs3/files/patch-kopenssl.h
deleted file mode 100644
index b123b5b54fb0..000000000000
--- a/x11/kdelibs3/files/patch-kopenssl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: kio/kssl/kopenssl.h
-===================================================================
-RCS file: /home/kde/kdelibs/kio/kssl/kopenssl.h,v
-retrieving revision 1.37.2.1
-retrieving revision 1.37.2.2
-diff -u -3 -p -r1.37.2.1 -r1.37.2.2
---- kio/kssl/kopenssl.h	2002/04/10 22:00:44	1.37.2.1
-+++ kio/kssl/kopenssl.h	2002/08/12 16:45:14	1.37.2.2
-@@ -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
diff --git a/x11/kdelibs3/files/patch-ksslcertificate.cc b/x11/kdelibs3/files/patch-ksslcertificate.cc
deleted file mode 100644
index 0c053825be23..000000000000
--- a/x11/kdelibs3/files/patch-ksslcertificate.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- kio/kssl/ksslcertificate.cc.orig	Sat Dec  1 01:30:03 2001
-+++ kio/kssl/ksslcertificate.cc	Mon Aug 12 22:28:40 2002
-@@ -544,6 +544,7 @@
-     //
- 
-     // 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/pkg-plist b/x11/kdelibs3/pkg-plist
index 70777cdbe926..15a286e565e7 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -3187,10 +3187,16 @@ share/servicetypes/ktexteditoreditor.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@comment empty dirs
+@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
-@comment directories
 @dirrm share/servicetypes
 @dirrm share/services/kded
 @dirrm share/services