Update "kdelibs" package to version 1.1.

4 files changed, 147 insertions, 42 deletions

diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index e65401f4049..1835fbbbd1f 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,30 +1,33 @@
-# $NetBSD: Makefile,v 1.24 1999/01/30 23:18:56 agc Exp $
+# $NetBSD: Makefile,v 1.25 1999/02/15 21:33:34 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
-DISTNAME=	kdelibs-1.0
+DISTNAME=	kdelibs-1.1
 CATEGORIES=	x11 kde
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.0/distribution/tar/generic/source/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/1.0/distribution/tar/generic/source/
+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
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=       http://www.kde.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
+DEPENDS+=	png-1.0.2:../../graphics/png
 DEPENDS+=	qt-1.42:../../x11/qt
-DEPENDS+=	giflib-3.0:../../graphics/giflib
+DEPENDS+=	tiff-3.4:../../graphics/tiff
 
-CONFLICTS=	kdelibs-2.1b kdelibs-3.1b kdelibs-4.1b
+CONFLICTS=	kdelibs-*
 
 USE_X11BASE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+LIBTOOL_FLAGS=	 --cplusplus --install-la
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+CONFIGURE_ARGS=	"--x-inc=${X11BASE}/include -I${LOCALBASE}/include" \
 		"--x-lib=${X11BASE}/lib -L${LOCALBASE}/lib" \
 		"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-dir=${PREFIX}" \
 		"--with-qt-includes=${PREFIX}/include/qt"
-USE_LIBTOOL=	yes
-LIBTOOL_FLAGS=	 --install-la
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdelibs/files/md5 b/x11/kdelibs/files/md5
index b6b3f28f29a..928ad88db24 100644
--- a/x11/kdelibs/files/md5
+++ b/x11/kdelibs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/08/07 13:29:05 agc Exp $
+$NetBSD: md5,v 1.6 1999/02/15 21:33:34 tron Exp $
 
-MD5 (kdelibs-1.0.tar.gz) = b7b874f77978463b1b974996a61f49a1
+MD5 (kdelibs-1.1.tar.bz2) = c3ba5b202432222222c8e48ca142d086
diff --git a/x11/kdelibs/patches/patch-aa b/x11/kdelibs/patches/patch-aa
index 2afb7643a51..2c692f877c9 100644
--- a/x11/kdelibs/patches/patch-aa
+++ b/x11/kdelibs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 1998/11/07 10:52:30 tron Exp $
+$NetBSD: patch-aa,v 1.9 1999/02/15 21:33:34 tron Exp $
 
---- configure.orig	Fri Jul 10 20:37:57 1998
-+++ configure	Fri Nov  6 23:04:59 1998
-@@ -501,9 +501,9 @@
+--- configure.orig	Sat Feb  6 18:53:30 1999
++++ configure	Sun Feb 14 12:09:33 1999
+@@ -508,9 +508,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
@@ -14,26 +14,25 @@ $NetBSD: patch-aa,v 1.8 1998/11/07 10:52:30 tron Exp $
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1688,6 +1688,8 @@
- ac_save_cflags="$CFLAGS"
+@@ -1999,6 +1999,8 @@
+ kde_save_cflags="$CFLAGS"
  CC=$CXX
  CFLAGS="$CXXFLAGS"
 +
 +if false; then
  # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
  
-@@ -1733,6 +1735,8 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+@@ -2228,6 +2230,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; }
 +fi
-+
-  CC=$ac_save_cc
- CFLAGS="$ac_save_cflags"
  
-@@ -4691,37 +4695,37 @@
- echo "configure:4692: checking for KDE paths" >&5
+ # 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
  
    if test -z "$kde_htmldir"; then
 -    kde_htmldir="\$(prefix)/share/doc/HTML"
@@ -60,7 +59,8 @@ $NetBSD: patch-aa,v 1.8 1998/11/07 10:52:30 tron Exp $
 +    kde_locale="\$(prefix)/share/kde/locale"
    fi
    if test -z "$kde_cgidir"; then
-     kde_cgidir="\$(exec_prefix)/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"
diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST
index 57741796f21..2cb653548cb 100644
--- a/x11/kdelibs/pkg/PLIST
+++ b/x11/kdelibs/pkg/PLIST
@@ -1,4 +1,32 @@
-@comment $NetBSD: PLIST,v 1.11 1998/11/07 10:52:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 1999/02/15 21:33:34 tron Exp $
+include/kaccel.h
+include/kglobalaccel.h
+include/kckey.h
+include/kclipboard.h
+include/krect.h
+include/ksize.h
+include/kpoint.h
+include/kkeydialog.h
+include/kurllabel.h
+include/kruler.h
+include/kquickhelp.h
+include/kcursor.h
+include/kimgio.h
+include/htmltable.h
+include/htmliter.h
+include/kfilebookmark.h
+include/kfilefilter.h
+include/kspell.h
+include/ksconfig.h
+include/kprocio.h
+include/kspelldlg.h
+include/stl_headers.h
+include/kabapi.h
+include/kab.h
+include/addressbook.h
+include/configDB.h
+include/keyvaluemap.h
+include/sections.h
 include/kpixmap.h
 include/kled.h
 include/kcontainer.h
@@ -21,8 +49,6 @@ include/kapp.h
 include/kurl.h
 include/ksock.h
 include/drag.h
-include/kkeyconf.h
-include/kkeydata.h
 include/ckey.h
 include/kmisc.h
 include/kprocess.h
@@ -74,7 +100,6 @@ include/builtin.h
 include/jscript.h
 include/htmlobj.h
 include/htmlfont.h
-include/formats.h
 include/htmlform.h
 include/htmltoken.h
 include/htmlframe.h
@@ -89,7 +114,6 @@ include/kaudio.h
 include/kfileinfo.h
 include/ktmainwindow.h
 include/kfiledialog.h
-include/bookmark.h
 include/kremotefile.h
 include/kdir.h
 include/kdirlistbox.h
@@ -100,27 +124,39 @@ include/kcombiview.h
 include/kpreview.h
 include/xview.h
 include/kfilepreview.h
+lib/libjscript.a
+lib/libjscript.la
+lib/libjscript.so.2.0
+lib/libkab.a
+lib/libkab.la
+lib/libkab.so.2.0
 lib/libkdecore.a
 lib/libkdecore.la
-lib/libkdecore.so.1.0
+lib/libkdecore.so.2.0
 lib/libkdeui.a
 lib/libkdeui.la
-lib/libkdeui.so.1.0
-lib/libjscript.a
-lib/libjscript.la
-lib/libjscript.so.0.90
-lib/libkhtmlw.a
-lib/libkhtmlw.la
-lib/libkhtmlw.so.1.0
+lib/libkdeui.so.2.0
 lib/libkfile.a
 lib/libkfile.la
-lib/libkfile.so.1.0
+lib/libkfile.so.2.0
 lib/libkfm.a
 lib/libkfm.la
-lib/libkfm.so.1.0
+lib/libkfm.so.2.0
+lib/libkimgio.so.2.0
+lib/libkimgio.a
+lib/libkimgio.la
+lib/libkhtmlw.a
+lib/libkhtmlw.la
+lib/libkhtmlw.so.2.0
+lib/libkspell.so.2.0
+lib/libkspell.a
+lib/libkspell.la
 lib/libmediatool.a
 lib/libmediatool.la
-lib/libmediatool.so.1.0
+lib/libmediatool.so.2.0
+share/doc/kde/HTML/en/kspell/kspell.html
+share/doc/kde/HTML/en/kspell/ksdialog.html
+share/doc/kde/HTML/en/kspell/ksconfig.html
 share/doc/kde/HTML/en/kfiledialog/back.gif
 share/doc/kde/HTML/en/kfiledialog/bottom.gif
 share/doc/kde/HTML/en/kfiledialog/exec.gif
@@ -137,6 +173,8 @@ share/doc/kde/HTML/en/kfiledialog/viewmag.gif
 share/doc/kde/HTML/en/kdelibs/kdebug.html
 @exec /bin/ln -sf en %D/share/doc/kde/HTML/default
 @unexec /bin/rm -f %D/share/doc/kde/HTML/default
+share/kde/apps/kab/pics/dialog_background.jpg
+share/kde/apps/kab/pics/background_1.jpg
 share/kde/apps/kde/pics/arrow_up.xbm
 share/kde/apps/kde/pics/arrow_down.xbm
 share/kde/apps/kde/pics/arrow_left.xbm
@@ -148,6 +186,14 @@ share/kde/apps/kde/pics/stopsign.xpm
 share/kde/apps/kde/pics/question.xpm
 share/kde/apps/khtmlw/pics/khtmlw_dnd.xpm
 share/kde/config/charsets
+share/kde/config/kdebug.areas
+share/kde/locale/eo/LC_MESSAGES/kde.mo
+share/kde/locale/is/LC_MESSAGES/kde.mo
+share/kde/locale/br/LC_MESSAGES/kde.mo
+share/kde/locale/ko/LC_MESSAGES/kde.mo
+share/kde/locale/tr/LC_MESSAGES/kde.mo
+share/kde/locale/he/LC_MESSAGES/kde.mo
+share/kde/locale/et/LC_MESSAGES/kde.mo
 share/kde/locale/zh_TW.Big5/LC_MESSAGES/kde.mo
 share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kde.mo
 share/kde/locale/sl/LC_MESSAGES/kde.mo
@@ -186,6 +232,45 @@ share/kde/locale/pt/charset
 share/kde/locale/sv/charset
 share/kde/locale/es/charset
 share/kde/locale/sk/charset
+share/kde/locale/it/charset
+share/kde/locale/no/charset
+share/kde/locale/hr/charset
+share/kde/locale/ca/charset
+share/kde/locale/sl/charset
+share/kde/locale/pt_BR/charset
+share/kde/locale/eo/charset
+share/kde/locale/is/charset
+share/kde/locale/he/charset
+share/kde/locale/et/charset
+share/kde/locale/br/charset
+share/kde/toolbar/add_point.xpm
+share/kde/toolbar/airbrush.xpm
+share/kde/toolbar/blend.xpm
+share/kde/toolbar/centrejust.xpm
+share/kde/toolbar/circle_select.xpm
+share/kde/toolbar/context_help.xpm
+share/kde/toolbar/delete.xpm
+share/kde/toolbar/droplet.xpm
+share/kde/toolbar/dropper.xpm
+share/kde/toolbar/edit_point.xpm
+share/kde/toolbar/eraser.xpm
+share/kde/toolbar/find.xpm
+share/kde/toolbar/knife.xpm
+share/kde/toolbar/lassoo.xpm
+share/kde/toolbar/leftjust.xpm
+share/kde/toolbar/move.xpm
+share/kde/toolbar/paintbrush.xpm
+share/kde/toolbar/pencil.xpm
+share/kde/toolbar/print_preview.xpm
+share/kde/toolbar/rectangle_select.xpm
+share/kde/toolbar/redo.xpm
+share/kde/toolbar/search.xpm
+share/kde/toolbar/smart_select.xpm
+share/kde/toolbar/spellcheck.xpm
+share/kde/toolbar/stamp.xpm
+share/kde/toolbar/text.xpm
+share/kde/toolbar/transform.xpm
+share/kde/toolbar/undo.xpm
 share/kde/toolbar/back.xpm
 share/kde/toolbar/bottom.xpm
 share/kde/toolbar/contents.xpm
@@ -277,14 +362,31 @@ share/kde/toolbar/configure.xpm
 @dirrm share/kde/locale/cs
 @dirrm share/kde/locale/ca/LC_MESSAGES
 @dirrm share/kde/locale/ca
+@dirrm share/kde/locale/eo/LC_MESSAGES
+@dirrm share/kde/locale/eo
+@dirrm share/kde/locale/is/LC_MESSAGES
+@dirrm share/kde/locale/is
+@dirrm share/kde/locale/ko/LC_MESSAGES
+@dirrm share/kde/locale/ko
+@dirrm share/kde/locale/tr/LC_MESSAGES
+@dirrm share/kde/locale/tr
+@dirrm share/kde/locale/he/LC_MESSAGES
+@dirrm share/kde/locale/he
+@dirrm share/kde/locale/et/LC_MESSAGES
+@dirrm share/kde/locale/et
+@dirrm share/kde/locale/br/LC_MESSAGES
+@dirrm share/kde/locale/br
 @dirrm share/kde/locale
 @dirrm share/kde/config
 @dirrm share/kde/apps/khtmlw/pics
 @dirrm share/kde/apps/khtmlw
 @dirrm share/kde/apps/kde/pics
 @dirrm share/kde/apps/kde
+@dirrm share/kde/apps/kab/pics
+@dirrm share/kde/apps/kab
 @dirrm share/kde/apps
 @dirrm share/kde
+@dirrm share/doc/kde/HTML/en/kspell
 @dirrm share/doc/kde/HTML/en/kfiledialog
 @dirrm share/doc/kde/HTML/en/kdelibs
 @dirrm share/doc/kde/HTML/en