Update to KDE Beta 3 'Huesten'.

7 files changed, 85 insertions, 185 deletions

diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index a51f2a17a57..c49d23db765 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:   kdeutils
-# Version required:    Beta2
+# Version required:    Beta3
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $NetBSD: Makefile,v 1.5 1998/02/23 23:36:45 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/03/21 01:54:30 tron Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
-DISTNAME=	kdeutils-Beta2-1
-PKGNAME=	kdeutils-2.1b
+DISTNAME=	kdeutils-Beta3-1
+PKGNAME=	kdeutils-3.1b
 CATEGORIES=	misc kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+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
 
 MAINTAINER=	se@freebsd.org
 
@@ -21,19 +21,24 @@ BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt.1.3[0-9]:${PORTSDIR}/x11/qt \
 		gif.[23].:${PORTSDIR}/graphics/giflib \
 		jpeg.[67].:${PORTSDIR}/graphics/jpeg \
-		kdecore.0.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui.0.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript.0.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw.0.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm.0.[1-9]:${PORTSDIR}/x11/kdelibs \
-		mediatool.0.[6-9]:${PORTSDIR}/x11/kdelibs
+		kdecore.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		jscript.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool.0.9[0-9]:${PORTSDIR}/x11/kdelibs
+RUN_DEPENDS=	kappfinder:${PORTSDIR}/x11/kdebase
 
+USE_X11=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=${PREFIX}" \
-		"--x-inc=${X11BASE}/include -I${PREFIX}/include -I${PREFIX}/include/giflib" \
-		"--x-lib=${X11BASE}/lib -L${PREFIX}/lib" \
+		"--x-inc=${PREFX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+		"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
 		"--with-qt-dir=${PREFIX}" \
 		"--with-qt-includes=${X11BASE}/include/qt"
+CONFIGURE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 WRKSRC=		${WRKDIR}/kdeutils
 
diff --git a/misc/kdeutils/files/md5 b/misc/kdeutils/files/md5
index 3fea4807ac4..575709da0ac 100644
--- a/misc/kdeutils/files/md5
+++ b/misc/kdeutils/files/md5
@@ -1 +1 @@
-MD5 (kdeutils-Beta2-1.src.tgz) = 1a56688809ac05fb41eba3388a2cda2c
+MD5 (kdeutils-Beta3-1.src.tar.gz) = 123bcd61a7de4d6df215a5c33041eede
diff --git a/misc/kdeutils/patches/patch-aa b/misc/kdeutils/patches/patch-aa
index 7c5da082d7d..2661f0b4cb3 100644
--- a/misc/kdeutils/patches/patch-aa
+++ b/misc/kdeutils/patches/patch-aa
@@ -1,41 +1,11 @@
-*** configure~	Sun Nov 23 01:07:57 1997
---- configure	Fri Nov 28 00:46:14 1997
-***************
-*** 722,726 ****
-  
-  
-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-  
-  
---- 722,726 ----
-  
-  
-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
-  
-  
-***************
-*** 1664,1668 ****
-  
-  # Always use our own libtool.
-! LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-  
-  
---- 1664,1668 ----
-  
-  # Always use our own libtool.
-! LIBTOOL='$(top_builddir)/libtool'
-  
-  
-***************
-*** 2049,2053 ****
-  do
-    for ac_extension in a so sl; do
-!     if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-        ac_x_libraries=$ac_dir
-        break 2
---- 2049,2053 ----
-  do
-    for ac_extension in a so sl; do
-!     if test -r $ac_dir/lib${x_direct_test_library}.*$ac_extension; then
-        ac_x_libraries=$ac_dir
-        break 2
+--- configure.orig	Sat Jan 31 01:53:34 1998
++++ configure	Thu Mar 19 23:21:34 1998
+@@ -1664,7 +1664,7 @@
+ 
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(top_builddir)/libtool'
+ 
+ 
+ libtool_enable_shared=no
diff --git a/misc/kdeutils/patches/patch-ab b/misc/kdeutils/patches/patch-ab
deleted file mode 100644
index 5806f89ca7d..00000000000
--- a/misc/kdeutils/patches/patch-ab
+++ /dev/null
@@ -1,83 +0,0 @@
---- karm/Makefile.in.orig	Thu Dec 18 17:29:26 1997
-+++ karm/Makefile.in	Thu Dec 18 17:30:49 1997
-@@ -1,5 +1,7 @@
- # This file was autogenerated by kmake 0.2.
- 
-+SHELL=/bin/sh
-+
- # this variables are needed for rpath support
- kde_libraries = @kde_libraries@
- qt_libraries = @qt_libraries@
-@@ -16,7 +18,7 @@
- install = @INSTALL@
- INSTALL = $(install) -m 0755
- INSTALL_DATA = $(install) -m 0644
--INSTALL_DIR = $(install) -d -m 0755
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- INSTALL_DIR_PRIVATE = $(install) -d -m 0700
- 
- prefix = @prefix@
---- kcalc/Makefile.in.orig	Thu Dec 18 17:29:26 1997
-+++ kcalc/Makefile.in	Thu Dec 18 17:31:50 1997
-@@ -2,6 +2,8 @@
- # Makefile for kcalc
- #
- 
-+SHELL=/bin/sh
-+
- # this variables are needed for rpath support
- kde_libraries = @kde_libraries@
- qt_libraries = @qt_libraries@
-@@ -36,7 +38,7 @@
- 
- INSTALL      = @INSTALL@ -m 0755
- INSTALL_DATA = @INSTALL@ -m 0644
--INSTALL_DIR  = @INSTALL@ -d -m 0755
-+INSTALL_DIR  = $(SHELL) @top_srcdir@/mkinstalldirs
- 
- prefix       = @prefix@
- BINDIR       = $(prefix)/bin
---- kjots/Makefile.in.orig	Thu Dec 18 17:29:26 1997
-+++ kjots/Makefile.in	Thu Dec 18 17:32:42 1997
-@@ -1,3 +1,4 @@
-+SHELL=/bin/sh
- 
- # this variables are needed for rpath support
- kde_libraries = @kde_libraries@
-@@ -17,7 +18,7 @@
- INSTALL = $(install) -m 0755
- INSTALL_SHELL = $(install) -m 0755
- INSTALL_DATA = $(install) -m 0644
--INSTALL_DIR = $(install) -d -m 0755
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- INSTALL_DIR_PRIVATE = $(install) -d -m 0700
- 
- prefix = @prefix@
---- kedit/docs/Makefile.in.orig	Thu Dec 18 17:29:26 1997
-+++ kedit/docs/Makefile.in	Thu Dec 18 17:33:40 1997
-@@ -1,9 +1,11 @@
-+SHELL=/bin/sh
-+
- prefix = @prefix@
- 
- FILES = index.html index-1.html index-2.html index-3.html index-4.html index-5.html
- 
- DOCDIR = $(prefix)/share/doc/HTML/en/kedit
--INSTALL_DIR = @INSTALL@ -d -m 0755
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- INSTALL_DATA = @INSTALL@ -m 644
- 
- all:
---- kjots/icons/Makefile.in.orig	Thu Dec 18 17:29:26 1997
-+++ kjots/icons/Makefile.in	Thu Dec 18 17:33:59 1997
-@@ -1,7 +1,9 @@
-+SHELL=/bin/sh
-+
- prefix = @prefix@
- 
- INSTALL_DATA = @INSTALL@ -m 0644
--INSTALL_DIR = @INSTALL@ -d -m 0755
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- PICS = OpenBook.xpm filedel.xpm
- ICONDIR= $(prefix)/share/icons
- DESTDIR = $(prefix)/share/apps/kjots/toolbar
diff --git a/misc/kdeutils/patches/patch-ac b/misc/kdeutils/patches/patch-ac
deleted file mode 100644
index 018cc8dca0d..00000000000
--- a/misc/kdeutils/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- kedit/Makefile.in.orig	Sun Nov 16 01:06:47 1997
-+++ kedit/Makefile.in	Mon Dec 29 04:34:05 1997
-@@ -7,4 +7,6 @@
- #
- 
-+SHELL=/bin/sh
-+
- # this variables are needed for rpath support
- kde_libraries = @kde_libraries@
-@@ -24,5 +26,5 @@
- INSTALL = @INSTALL@ -m 0755
- INSTALL_DATA = @INSTALL@ -m 0644
--INSTALL_DIR = @INSTALL@ -d -m 0755
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- 
- prefix = @prefix@
diff --git a/misc/kdeutils/patches/patch-ad b/misc/kdeutils/patches/patch-ad
deleted file mode 100644
index 59cc1887f5c..00000000000
--- a/misc/kdeutils/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- knotes/Makefile.in.orig	Sun Nov 23 13:12:10 1997
-+++ knotes/Makefile.in	Mon Dec 29 04:34:05 1997
-@@ -2,2 +2,4 @@
- 
-+SHELL=/bin/sh
-+
- # this variables are needed for rpath support
-@@ -20,3 +22,3 @@
- INSTALL_DATA = $(install) -m 0644
--INSTALL_DIR = $(install) -d -m 0755   
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- 
diff --git a/misc/kdeutils/pkg/PLIST b/misc/kdeutils/pkg/PLIST
index 40076c0e379..558a7bda3c0 100644
--- a/misc/kdeutils/pkg/PLIST
+++ b/misc/kdeutils/pkg/PLIST
@@ -1,11 +1,25 @@
-@comment $NetBSD: PLIST,v 1.2 1997/12/29 03:31:48 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/03/21 01:54:30 tron Exp $
 bin/kcalc
 bin/kedit
 bin/khexdit
 bin/karm
 bin/kjots
+bin/kljettool
 bin/knotes
 bin/kzip
+share/doc/HTML/en/kljettool/kljettool-1.html
+share/doc/HTML/en/kljettool/kljettool-2.html
+share/doc/HTML/en/kljettool/kljettool-3.html
+share/doc/HTML/en/kljettool/kljettool-4.html
+share/doc/HTML/en/kljettool/kljettool-5.html
+share/doc/HTML/en/kljettool/kljettool-6.html
+share/doc/HTML/en/kljettool/kljettool.html
+share/doc/HTML/en/kljettool/kljettool.nif
+share/doc/HTML/en/kljettool/kljettool.sgml
+share/doc/HTML/en/kljettool/logotp3.gif
+share/doc/HTML/en/kljettool/magic
+share/doc/HTML/en/kljettool/filter
+share/doc/HTML/en/kljettool/README
 share/doc/HTML/de/kcalc/index-1.html
 share/doc/HTML/de/kcalc/index-2.html
 share/doc/HTML/de/kcalc/index-3.html
@@ -14,6 +28,8 @@ share/doc/HTML/de/kcalc/index-5.html
 share/doc/HTML/de/kcalc/index-6.html
 share/doc/HTML/de/kcalc/index-7.html
 share/doc/HTML/de/kcalc/index-8.html
+share/doc/HTML/de/kcalc/index-9.html
+share/doc/HTML/de/kcalc/logotp3.gif
 share/doc/HTML/de/kcalc/index.html
 share/doc/HTML/en/kcalc/index-1.html
 share/doc/HTML/en/kcalc/index-2.html
@@ -23,7 +39,9 @@ share/doc/HTML/en/kcalc/index-5.html
 share/doc/HTML/en/kcalc/index-6.html
 share/doc/HTML/en/kcalc/index-7.html
 share/doc/HTML/en/kcalc/index-8.html
+share/doc/HTML/en/kcalc/index-9.html
 share/doc/HTML/en/kcalc/index.html
+share/doc/HTML/en/kcalc/logotp3.gif
 share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
 share/doc/HTML/en/kedit/index.html
@@ -32,15 +50,17 @@ share/doc/HTML/en/kedit/index-2.html
 share/doc/HTML/en/kedit/index-3.html
 share/doc/HTML/en/kedit/index-4.html
 share/doc/HTML/en/kedit/index-5.html
+share/doc/HTML/en/kedit/logotp3.gif 
 share/doc/HTML/en/khexdit/index.html
 share/doc/HTML/en/karm/index-1.html
 share/doc/HTML/en/karm/index-2.html
 share/doc/HTML/en/karm/index-3.html
 share/doc/HTML/en/karm/index-4.html
-share/doc/HTML/en/karm/karm.gif
 share/doc/HTML/en/karm/index.html
-share/doc/HTML/en/karm/scrn.html
 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
@@ -53,7 +73,9 @@ share/doc/HTML/en/kzip/index-1.html
 share/doc/HTML/en/kzip/index-2.html
 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
@@ -72,6 +94,7 @@ share/icons/khexdit.xpm
 share/icons/kjots.xpm
 share/icons/knotes.xpm
 share/icons/kzip.xpm
+share/applnk/Utilities/KLJetTool.kdelnk
 share/applnk/Utilities/kcalc.kdelnk
 share/applnk/Utilities/khexdit.kdelnk
 share/applnk/Utilities/KArm.kdelnk
@@ -79,9 +102,29 @@ share/applnk/Utilities/Kjots.kdelnk
 share/applnk/Utilities/knotes.kdelnk
 share/applnk/Utilities/kzip.kdelnk
 share/applnk/Applications/kedit.kdelnk
-share/mimelnk/application/x-zip.kdelnk
-share/mimelnk/application/x-lha.kdelnk
-share/mimelnk/application/x-ar.kdelnk
+share/locale/de/LC_MESSAGES/knotes.mo
+share/locale/de/LC_MESSAGES/kzip.mo
+share/locale/de/LC_MESSAGES/karm.mo
+share/locale/cs/LC_MESSAGES/knotes.mo
+share/locale/cs/LC_MESSAGES/kzip.mo
+share/locale/es/LC_MESSAGES/kzip.mo
+share/locale/es/LC_MESSAGES/knotes.mo
+share/locale/hu/LC_MESSAGES/kzip.mo
+share/locale/hu/LC_MESSAGES/knotes.mo
+share/locale/it/LC_MESSAGES/knotes.mo
+share/locale/it/LC_MESSAGES/kzip.mo
+share/locale/pt/LC_MESSAGES/knotes.mo
+share/locale/pt/LC_MESSAGES/karm.mo
+share/locale/pl/LC_MESSAGES/knotes.mo
+share/locale/pl/LC_MESSAGES/kzip.mo
+share/locale/el/LC_MESSAGES/khexdit.mo
+share/locale/fi/LC_MESSAGES/knotes.mo
+share/locale/fi/LC_MESSAGES/kzip.mo
+share/locale/hr/LC_MESSAGES/kedit.mo
+share/locale/hr/LC_MESSAGES/khexdit.mo
+share/locale/hr/LC_MESSAGES/kzip.mo
+share/locale/hr/LC_MESSAGES/knotes.mo
+share/locale/ro/LC_MESSAGES/khexdit.mo
 share/locale/de/LC_MESSAGES/kedit.mo
 share/locale/de/LC_MESSAGES/khexdit.mo
 share/locale/fr/LC_MESSAGES/khexdit.mo
@@ -109,12 +152,9 @@ share/locale/pt/LC_MESSAGES/khexdit.mo
 share/locale/pt/LC_MESSAGES/kzip.mo
 share/locale/fi/LC_MESSAGES/khexdit.mo
 share/locale/fi/LC_MESSAGES/kedit.mo
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/mini
-@dirrm share/icons
 @dirrm share/doc/HTML/it/khexdit
 @dirrm share/doc/HTML/it
+@dirrm share/doc/HTML/en/kljettool
 @dirrm share/doc/HTML/en/kzip
 @dirrm share/doc/HTML/en/knotes
 @dirrm share/doc/HTML/en/kjots
@@ -122,10 +162,10 @@ share/locale/fi/LC_MESSAGES/kedit.mo
 @dirrm share/doc/HTML/en/kedit
 @dirrm share/doc/HTML/en/kcalc
 @dirrm share/doc/HTML/en/karm
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcalc
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/kljettool
 @dirrm share/apps/knotes/pics
 @dirrm share/apps/knotes
 @dirrm share/apps/kjots/toolbar
@@ -135,7 +175,3 @@ share/locale/fi/LC_MESSAGES/kedit.mo
 @dirrm share/apps/kedit
 @dirrm share/apps/kcalc/pics
 @dirrm share/apps/kcalc
-@dirrm share/apps
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Applications
-@dirrm share/applnk