Update "kdelibs" package to version 1.1.1.

4 files changed, 39 insertions, 43 deletions

diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 062346cb442..2abb68a8386 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.31 1999/03/23 17:47:59 tron Exp $
+# $NetBSD: Makefile,v 1.32 1999/06/03 22:44:04 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
-DISTNAME=	kdelibs-1.1
+DISTNAME=	kdelibs-1.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/ \
 		ftp://ftp.de.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/
 EXTRACT_SUFX=	.tar.bz2
-PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/ \
-		ftp://ftp.de.kde.org/pub/kde/security_patches/
-PATCHFILES=	kdelibs-1.1-connect.patch
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=       http://www.kde.org/
@@ -31,7 +28,4 @@ CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}" \
 		all_libraries="-L${LOCALBASE}/lib"
 
-pre-patch:
-		@${LN} -s . ${WRKSRC}/${DISTNAME}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdelibs/files/md5 b/x11/kdelibs/files/md5
index 2263a614b8e..1ad6bbce504 100644
--- a/x11/kdelibs/files/md5
+++ b/x11/kdelibs/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.7 1999/03/06 00:00:28 tron Exp $
+$NetBSD: md5,v 1.8 1999/06/03 22:44:04 tron Exp $
 
-MD5 (kdelibs-1.1.tar.bz2) = c3ba5b202432222222c8e48ca142d086
-MD5 (kdelibs-1.1-connect.patch) = 8742ccc0fc1d2bf94e426747b9da3894
+MD5 (kdelibs-1.1.1.tar.bz2) = a2f485c7cb2e53add861898f7383258a
diff --git a/x11/kdelibs/patches/patch-aa b/x11/kdelibs/patches/patch-aa
index 2c692f877c9..6a4dee68c2e 100644
--- a/x11/kdelibs/patches/patch-aa
+++ b/x11/kdelibs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 1999/02/15 21:33:34 tron Exp $
+$NetBSD: patch-aa,v 1.10 1999/06/03 22:44:04 tron Exp $
 
---- configure.orig	Sat Feb  6 18:53:30 1999
-+++ configure	Sun Feb 14 12:09:33 1999
-@@ -508,9 +508,9 @@
+--- configure.orig	Wed Apr 28 17:24:12 1999
++++ configure	Thu Jun  3 19:26:48 1999
+@@ -507,9 +507,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.9 1999/02/15 21:33:34 tron Exp $
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1999,6 +1999,8 @@
+@@ -2034,6 +2034,8 @@
  kde_save_cflags="$CFLAGS"
  CC=$CXX
  CFLAGS="$CXXFLAGS"
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.9 1999/02/15 21:33:34 tron Exp $
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
  
-@@ -2228,6 +2230,7 @@
+@@ -2267,6 +2269,7 @@
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
@@ -31,52 +31,52 @@ $NetBSD: patch-aa,v 1.9 1999/02/15 21:33:34 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -5302,37 +5305,37 @@
- echo "configure:5303: checking for KDE paths" >&5
+@@ -5376,37 +5379,37 @@
+ if test "default" = "default"; then
  
    if test -z "$kde_htmldir"; then
--    kde_htmldir="\$(prefix)/share/doc/HTML"
-+    kde_htmldir="\$(prefix)/share/doc/kde/HTML"
+-    kde_htmldir='\$(prefix)/share/doc/HTML'
++    kde_htmldir='\$(prefix)/share/doc/kde/HTML'
    fi
    if test -z "$kde_appsdir"; then
--    kde_appsdir="\$(prefix)/share/applnk"
-+    kde_appsdir="\$(prefix)/share/kde/applnk"
+-    kde_appsdir='\$(prefix)/share/applnk'
++    kde_appsdir='\$(prefix)/share/kde/applnk'
    fi
    if test -z "$kde_icondir"; then
--    kde_icondir="\$(prefix)/share/icons"
-+    kde_icondir="\$(prefix)/share/kde/icons"
+-    kde_icondir='\$(prefix)/share/icons'
++    kde_icondir='\$(prefix)/share/kde/icons'
    fi
    if test -z "$kde_sounddir"; then
--    kde_sounddir="\$(prefix)/share/sounds"
-+    kde_sounddir="\$(prefix)/share/kde/sounds"
+-    kde_sounddir='\$(prefix)/share/sounds'
++    kde_sounddir='\$(prefix)/share/kde/sounds'
    fi
    if test -z "$kde_datadir"; then
--    kde_datadir="\$(prefix)/share/apps"
-+    kde_datadir="\$(prefix)/share/kde/apps"
+-    kde_datadir='\$(prefix)/share/apps'
++    kde_datadir='\$(prefix)/share/kde/apps'
    fi
    if test -z "$kde_locale"; then
--    kde_locale="\$(prefix)/share/locale"
-+    kde_locale="\$(prefix)/share/kde/locale"
+-    kde_locale='\$(prefix)/share/locale'
++    kde_locale='\$(prefix)/share/kde/locale'
    fi
    if test -z "$kde_cgidir"; then
--    kde_cgidir="\$(exec_prefix)/cgi-bin"
-+    kde_cgidir="\$(exec_prefix)/libexec/kde-cgi-bin"
+-    kde_cgidir='\$(exec_prefix)/cgi-bin'
++    kde_cgidir='\$(exec_prefix)/libexec/kde-cgi-bin'
    fi
    if test -z "$kde_confdir"; then
--    kde_confdir="\$(prefix)/share/config"
-+    kde_confdir="\$(prefix)/share/kde/config"
+-    kde_confdir='\$(prefix)/share/config'
++    kde_confdir='\$(prefix)/share/kde/config'
    fi
    if test -z "$kde_mimedir"; then
--    kde_mimedir="\$(prefix)/share/mimelnk"
-+    kde_mimedir="\$(prefix)/share/kde/mimelnk"
+-    kde_mimedir='\$(prefix)/share/mimelnk'
++    kde_mimedir='\$(prefix)/share/kde/mimelnk'
    fi
    if test -z "$kde_toolbardir"; then
--    kde_toolbardir="\$(prefix)/share/toolbar"
-+    kde_toolbardir="\$(prefix)/share/kde/toolbar"
+-    kde_toolbardir='\$(prefix)/share/toolbar'
++    kde_toolbardir='\$(prefix)/share/kde/toolbar'
    fi
    if test -z "$kde_wallpaperdir"; then
--    kde_wallpaperdir="\$(prefix)/share/wallpapers"
-+    kde_wallpaperdir="\$(prefix)/share/kde/wallpapers"
+-    kde_wallpaperdir='\$(prefix)/share/wallpapers'
++    kde_wallpaperdir='\$(prefix)/share/kde/wallpapers'
    fi
    if test -z "$kde_bindir"; then
-     kde_bindir="\$(exec_prefix)/bin"
+     kde_bindir='\$(exec_prefix)/bin'
diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST
index 2cb653548cb..0251391edbf 100644
--- a/x11/kdelibs/pkg/PLIST
+++ b/x11/kdelibs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 1999/02/15 21:33:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 1999/06/03 22:44:05 tron Exp $
 include/kaccel.h
 include/kglobalaccel.h
 include/kckey.h
@@ -219,6 +219,7 @@ share/kde/locale/hr/LC_MESSAGES/kde.mo
 share/kde/locale/ro/LC_MESSAGES/kde.mo
 share/kde/locale/sk/LC_MESSAGES/kde.mo
 share/kde/locale/ca/LC_MESSAGES/kde.mo
+share/kde/locale/th/LC_MESSAGES/kde.mo
 share/kde/locale/de/charset
 share/kde/locale/fr/charset
 share/kde/locale/cs/charset
@@ -316,6 +317,8 @@ share/kde/toolbar/configure.xpm
 @dirrm share/kde/locale/zh_TW.Big5
 @dirrm share/kde/locale/zh_CN.GB2312/LC_MESSAGES
 @dirrm share/kde/locale/zh_CN.GB2312
+@dirrm share/kde/locale/th/LC_MESSAGES
+@dirrm share/kde/locale/th
 @dirrm share/kde/locale/sv/LC_MESSAGES
 @dirrm share/kde/locale/sv
 @dirrm share/kde/locale/sl/LC_MESSAGES