Update to KDE Beta 4 'Kirkland'.

4 files changed, 70 insertions, 156 deletions

diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 1120af66784..ca24f32ec9e 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:36 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/28 22:54:07 tron Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
-DISTNAME=	kdeutils-Beta3-1
-PKGNAME=	kdeutils-3.1b
+DISTNAME=	kdeutils-beta4-1
+PKGNAME=	kdeutils-4.1b
 CATEGORIES=	misc kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tar.gz
+MASTER_SITES=	ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+		ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX=	.src.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 
-BUILD_DEPENDS=	moc:../../x11/qt
+BUILD_DEPENDS=	bzip2:../../archivers/bzip2 \
+		moc:../../x11/qt
+DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
-DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
-DEPENDS+=	giflib-3.0:../../graphics/giflib
-RUN_DEPENDS=	kappfinder:../../x11/kdebase
+DEPENDS+=	kdelibs-4.1b:../../x11/kdelibs
+DEPENDS+=	kdebase-4.1b:../../x11/kdebase
+
+EXTRACT_CMD=		bzip2
+EXTRACT_BEFORE_ARGS=	-d <
+EXTRACT_AFTER_ARGS=	| pax -r
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/misc/kdeutils/files/md5 b/misc/kdeutils/files/md5
index 575709da0ac..85c66befe4f 100644
--- a/misc/kdeutils/files/md5
+++ b/misc/kdeutils/files/md5
@@ -1 +1 @@
-MD5 (kdeutils-Beta3-1.src.tar.gz) = 123bcd61a7de4d6df215a5c33041eede
+MD5 (kdeutils-beta4-1.src.tar.bz2) = 82adffb50693252c3be9aa4bde33b678
diff --git a/misc/kdeutils/patches/patch-ab b/misc/kdeutils/patches/patch-ab
deleted file mode 100644
index 58728f986b4..00000000000
--- a/misc/kdeutils/patches/patch-ab
+++ /dev/null
@@ -1,128 +0,0 @@
---- config.h.in.orig	Fri Jan 30 19:53:24 1998
-+++ config.h.in	Thu Apr 23 06:25:01 1998
-@@ -31,8 +31,8 @@
- /* Define to 1 if NLS is requested.  */
- #undef ENABLE_NLS
- 
--/* Define if you have the fabsl function.  */
--#undef HAVE_FABSL
-+/* Define if you have the sqrtl function.  */
-+#undef HAVE_SQRTL
- 
- /* Define if you have the socket function.  */
- #undef HAVE_SOCKET
---- configure.in.orig	Sat Jan 24 19:51:01 1998
-+++ configure.in	Thu Apr 23 06:24:18 1998
-@@ -56,7 +56,7 @@
- AC_C_LONG_DOUBLE  
- 
- dnl Checks for library functions. MISCOBJS is for kdecore
--AC_CHECK_FUNCS(socket fabsl strdup) 
-+AC_CHECK_FUNCS(socket sqrtl strdup) 
- AC_CHECK_KSIZE_T
- AC_CHECK_SETENV
- 
---- configure.orig	Thu Apr 23 06:14:22 1998
-+++ configure	Thu Apr 23 06:24:15 1998
-@@ -3501,7 +3501,7 @@
- fi
-   
- 
--for ac_func in socket fabsl strdup
-+for ac_func in socket sqrtl strdup
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:3508: checking for $ac_func" >&5
---- kcalc/configdlg.cpp.orig	Fri Dec 12 19:14:04 1997
-+++ kcalc/configdlg.cpp	Thu Apr 23 06:26:37 1998
-@@ -86,7 +86,7 @@
-   label5->setText("Precision:");
- 
-   int maxprec;
--#ifdef HAVE_FABSL 
-+#ifdef HAVE_SQRTL 
-   maxprec = 16 ;
- #else 
-   maxprec = 12 ;
-@@ -109,7 +109,7 @@
-     cb->setChecked(true);
- 
-   int fixprec;
--#ifdef HAVE_FABSL 
-+#ifdef HAVE_SQRTL 
-   fixprec = 14 ;
- #else 
-   fixprec = 10 ;
---- kcalc/kcalc.cpp.orig	Fri Dec 12 19:14:07 1997
-+++ kcalc/kcalc.cpp	Thu Apr 23 06:26:40 1998
-@@ -1528,7 +1528,7 @@
-     "\n\n";
- 
-    labelstring +=
--#ifdef HAVE_FABSL 
-+#ifdef HAVE_SQRTL 
- 		 "Base type: long double\n";
- #else 
- 		 "Base type: double\n";
-@@ -1635,7 +1635,7 @@
- 
-   config->setGroup("Precision");
- 
--#ifdef HAVE_FABSL  
-+#ifdef HAVE_SQRTL  
-   kcalcdefaults.precision =  config->readNumEntry("precision",(int)14);
- #else
-   kcalcdefaults.precision =  config->readNumEntry("precision",(int)10);
---- kcalc/kcalc_core.cpp.orig	Fri Dec 12 19:14:10 1997
-+++ kcalc/kcalc_core.cpp	Thu Apr 23 06:26:45 1998
-@@ -1446,7 +1446,7 @@
- 		    
- 		    str_size = sprintf(display_str, 
- 
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- 				     "%.*Lg", // was *Lg
- 				  
- 				     kcalcdefaults.precision  +1, 
-@@ -1461,7 +1461,7 @@
- 
- 		  str_size = sprintf(display_str, 
- 
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- 				     "%.*Lf", // was *Lg
- 				  
- 				     kcalcdefaults.fixedprecision  , 
-@@ -1478,7 +1478,7 @@
- 		  if ( input_count > 0 && !strpbrk(display_str,"e") &&
- 					   last_input == DIGIT   ) {
- 
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- 		    str_size = sprintf(display_str, 
- 					   "%.*Lf",
- 			    (kcalcdefaults.precision +1 > input_count)? 
---- kcalc/kcalctype.h.orig	Sat Jan 10 19:59:04 1998
-+++ kcalc/kcalctype.h	Thu Apr 23 06:26:50 1998
-@@ -34,10 +34,10 @@
- // I guess it's time to switch to LINUX guys .....
- 
- 
--#ifdef HAVE_FABSL 
-+#ifdef HAVE_SQRTL 
- 
- /* should be detected by autoconf and defined in config.h
--   Be carefull when modifying these lines. HAVE_FABSL
-+   Be carefull when modifying these lines. HAVE_SQRTL
-    is used all over kcalc's sources to determine whether 
-    long double of double is the fundamental data type for kcalc*/
- 
-@@ -49,7 +49,7 @@
- #endif
- 
- 
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- #define FABS(X)   	fabsl(X)
- #define MODF(X,Y)       modfl(X,Y)
- #define FMOD(X,Y)   	fmodl(X,Y)
diff --git a/misc/kdeutils/pkg/PLIST b/misc/kdeutils/pkg/PLIST
index 1d7973799eb..b8a21450ed2 100644
--- a/misc/kdeutils/pkg/PLIST
+++ b/misc/kdeutils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/03/26 23:01:42 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/04/28 22:54:08 tron Exp $
 bin/kcalc
 bin/kedit
 bin/khexdit
@@ -61,13 +61,13 @@ share/doc/HTML/en/karm/index.sgml
 share/doc/HTML/en/karm/karm.gif
 share/doc/HTML/en/karm/logotp3.gif
 share/doc/HTML/en/karm/scrn.html
-share/doc/HTML/en/kjots/index.html
 share/doc/HTML/en/knotes/index.html
 share/doc/HTML/en/knotes/index-1.html
 share/doc/HTML/en/knotes/index-2.html
 share/doc/HTML/en/knotes/index-3.html
 share/doc/HTML/en/knotes/index-4.html
 share/doc/HTML/en/knotes/index-5.html
+share/doc/HTML/en/knotes/logotp3.gif
 share/doc/HTML/en/kzip/index.html
 share/doc/HTML/en/kzip/index-1.html
 share/doc/HTML/en/kzip/index-2.html
@@ -75,25 +75,27 @@ share/doc/HTML/en/kzip/index-3.html
 share/doc/HTML/en/kzip/index-4.html
 share/doc/HTML/en/kzip/logotp3.gif
 share/doc/HTML/it/khexdit/index.html
-share/apps/kljettool/pics/kljetlogo.xpm
 share/apps/kcalc/pics/kcalclogo.xpm
 share/apps/kedit/toolbar/filenew2.xpm
 share/apps/kedit/toolbar/send.xpm
 share/apps/kedit/pics/keditlogo.xpm
-share/apps/kjots/toolbar/OpenBook.xpm
-share/apps/kjots/toolbar/filedel.xpm
 share/apps/knotes/pics/knoteslogo.xpm
 share/apps/knotes/pics/knotesclose.xpm
-share/icons/kcalc.xpm
+share/icons/mini/karm.xpm
+share/icons/mini/kljettool.xpm
+share/icons/mini/knotes.xpm
 share/icons/mini/kcalc.xpm
 share/icons/mini/kedit.xpm
 share/icons/mini/khexdit.xpm
 share/icons/mini/kzip.xpm
 share/icons/kedit.xpm
 share/icons/khexdit.xpm
-share/icons/kjots.xpm
-share/icons/knotes.xpm
 share/icons/kzip.xpm
+share/icons/karm.xpm
+share/icons/kljetlogo.xpm
+share/icons/knotes.xpm
+share/icons/kcalc.xpm
+share/applnk/Applications/KEdit.kdelnk
 share/applnk/Utilities/KLJetTool.kdelnk
 share/applnk/Utilities/kcalc.kdelnk
 share/applnk/Utilities/khexdit.kdelnk
@@ -101,7 +103,48 @@ share/applnk/Utilities/KArm.kdelnk
 share/applnk/Utilities/Kjots.kdelnk
 share/applnk/Utilities/knotes.kdelnk
 share/applnk/Utilities/kzip.kdelnk
-share/applnk/Applications/kedit.kdelnk
+share/locale/de/LC_MESSAGES/kcalc.mo
+share/locale/fr/LC_MESSAGES/kzip.mo
+share/locale/fr/LC_MESSAGES/karm.mo
+share/locale/es/LC_MESSAGES/karm.mo
+share/locale/da/LC_MESSAGES/kedit.mo
+share/locale/da/LC_MESSAGES/khexdit.mo
+share/locale/da/LC_MESSAGES/knotes.mo
+share/locale/da/LC_MESSAGES/kzip.mo
+share/locale/da/LC_MESSAGES/karm.mo
+share/locale/it/LC_MESSAGES/karm.mo
+share/locale/nl/LC_MESSAGES/kfloppy.mo
+share/locale/nl/LC_MESSAGES/kcalc.mo
+share/locale/nl/LC_MESSAGES/karm.mo
+share/locale/nl/LC_MESSAGES/kljettool.mo
+share/locale/nl/LC_MESSAGES/knotes.mo
+share/locale/nl/LC_MESSAGES/kzip.mo
+share/locale/pt/LC_MESSAGES/kcalc.mo
+share/locale/no/LC_MESSAGES/kcalc.mo
+share/locale/no/LC_MESSAGES/kedit.mo
+share/locale/no/LC_MESSAGES/khexdit.mo
+share/locale/no/LC_MESSAGES/karm.mo
+share/locale/no/LC_MESSAGES/kzip.mo
+share/locale/no/LC_MESSAGES/knotes.mo
+share/locale/el/LC_MESSAGES/kcalc.mo
+share/locale/el/LC_MESSAGES/kedit.mo
+share/locale/fi/LC_MESSAGES/karm.mo
+share/locale/fi/LC_MESSAGES/kcalc.mo
+share/locale/fi/LC_MESSAGES/kfloppy.mo
+share/locale/fi/LC_MESSAGES/kljettool.mo
+share/locale/hr/LC_MESSAGES/karm.mo
+share/locale/hr/LC_MESSAGES/kcalc.mo
+share/locale/zh/LC_MESSAGES/kedit.mo
+share/locale/zh/LC_MESSAGES/khexdit.mo
+share/locale/zh/LC_MESSAGES/knotes.mo
+share/locale/zh/LC_MESSAGES/kzip.mo
+share/locale/zh/LC_MESSAGES/karm.mo
+share/locale/sk/LC_MESSAGES/kedit.mo
+share/locale/sk/LC_MESSAGES/khexdit.mo
+share/locale/sk/LC_MESSAGES/knotes.mo
+share/locale/sk/LC_MESSAGES/kzip.mo
+share/locale/sk/LC_MESSAGES/karm.mo
+share/locale/sk/LC_MESSAGES/kcalc.mo
 share/locale/de/LC_MESSAGES/knotes.mo
 share/locale/de/LC_MESSAGES/kzip.mo
 share/locale/de/LC_MESSAGES/karm.mo
@@ -157,19 +200,13 @@ share/locale/fi/LC_MESSAGES/kedit.mo
 @dirrm share/doc/HTML/en/kljettool
 @dirrm share/doc/HTML/en/kzip
 @dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/kjots
 @dirrm share/doc/HTML/en/khexdit
 @dirrm share/doc/HTML/en/kedit
 @dirrm share/doc/HTML/en/kcalc
 @dirrm share/doc/HTML/en/karm
 @dirrm share/doc/HTML/de/kcalc
-@dirrm share/doc/HTML/de
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
 @dirrm share/apps/knotes/pics
 @dirrm share/apps/knotes
-@dirrm share/apps/kjots/toolbar
-@dirrm share/apps/kjots
 @dirrm share/apps/kedit/toolbar
 @dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit