Update to KDE Beta 3 'Huesten'.

6 files changed, 98 insertions, 95 deletions

diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index b6802762f13..2a36a12888d 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,43 +1,48 @@
 # New ports collection makefile for:   kdenetwork
-# 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:46 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/03/21 01:54:50 tron Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
-DISTNAME=	kdenetwork-Beta2-1
-PKGNAME=	kdenetwork-2.1b
+DISTNAME=	kdenetwork-Beta3-1
+PKGNAME=	kdenetwork-3.1b
 CATEGORIES=	net 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
 
 BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
-		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+		${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	qt.1.3[0-9]:${PORTSDIR}/x11/qt \
 		gif.[23].:${PORTSDIR}/graphics/giflib \
 		jpeg.[67].:${PORTSDIR}/graphics/jpeg \
 		mimelib.1.:${PORTSDIR}/converters/kdesupport \
-		uulib.0.:${PORTSDIR}/converters/kdesupport \
-		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
+		uu.1.:${PORTSDIR}/converters/uulib \
+		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=	"--x-inc=${X11BASE}/include -I${PREFIX}/include -I${PREFIX}/include/giflib" \
-		"--x-lib=${X11BASE}/lib -L${PREFIX}/lib" \
+CONFIGURE_ARGS=	"--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+		"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
 		"--prefix=${PREFIX}" \
 		"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${X11BASE}/include/qt"
+		"--with-qt-includes=${PREFIX}/include/qt"
+CONFIGURE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
diff --git a/net/kdenetwork/files/md5 b/net/kdenetwork/files/md5
index 214a9c476cc..691f699b87f 100644
--- a/net/kdenetwork/files/md5
+++ b/net/kdenetwork/files/md5
@@ -1 +1 @@
-MD5 (kdenetwork-Beta2-1.src.tgz) = 23127871d2cc461c420fcb0f4f65b40e
+MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
diff --git a/net/kdenetwork/patches/patch-aa b/net/kdenetwork/patches/patch-aa
index 576a1c066d0..6467a1f5983 100644
--- a/net/kdenetwork/patches/patch-aa
+++ b/net/kdenetwork/patches/patch-aa
@@ -1,28 +1,11 @@
-*** configure~	Sun Oct 26 01:04:56 1997
---- configure	Sat Nov  1 23:03:17 1997
-***************
-*** 913,917 ****
-  
-  
-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-  
-  
---- 913,917 ----
-  
-  
-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
-  
-  
-***************
-*** 2039,2043 ****
-  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
---- 2039,2043 ----
-  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
+--- krn/kdecode.cpp.old	Wed Nov 12 21:56:57 1997
++++ krn/kdecode.cpp	Fri Mar 20 23:15:21 1998
+@@ -9,7 +9,7 @@
+ #include <qstrlist.h>
+ #include <kconfig.h>
+ #include <kapp.h>
+-#include <uudeview.h>
++#include <uu.h>
+ #include <mimelib/mimepp.h>
+ #include "ktempfile.h"
+ #include <kapp.h>
diff --git a/net/kdenetwork/patches/patch-ab b/net/kdenetwork/patches/patch-ab
index 351b6b44883..9dc3d21a2c5 100644
--- a/net/kdenetwork/patches/patch-ab
+++ b/net/kdenetwork/patches/patch-ab
@@ -1,28 +1,11 @@
---- krn/Makefile.in.orig	Thu Dec 18 22:07:32 1997
-+++ krn/Makefile.in	Thu Dec 18 22:19:33 1997
-@@ -46,6 +46,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
+--- krn/Makefile.in.orig	Sun Feb  1 02:07:48 1998
++++ krn/Makefile.in	Fri Mar 20 23:23:43 1998
+@@ -122,7 +122,7 @@
  
-@@ -126,7 +127,7 @@
- ICONDIR = $(kde_icondir)
- MINIDIR =  $(kde_minidir)
- # better would be Internet
--UTILSDIR = $(kde_appsdir)/Utilities
-+UTILSDIR = $(kde_appsdir)/Internet
+ INCLUDES = $(all_includes)
  
- BUILTSOURCES =	groupdlg.moc \
- 		NNTP.moc \
-@@ -434,7 +435,7 @@
- install-data: install-data-recursive
- 	@$(NORMAL_INSTALL)
+-LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore $(LIBJPEG) -lgif -lqt -lXext -lX11 -lmimelib -luulib -lgdbm $(KDE_RPATH)
++LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore $(LIBJPEG) -lgif -lqt -lXext -lX11 -lmimelib -luu -lgdbm $(KDE_RPATH)
  
--install: install-recursive install-exec-am
-+install: install-recursive install-exec-am install-local-data 
- 	@:
-  
- uninstall: uninstall-recursive uninstall-am
+ ICONDIR = $(kde_icondir)
+ MINIDIR =  $(kde_minidir)
diff --git a/net/kdenetwork/patches/patch-ac b/net/kdenetwork/patches/patch-ac
deleted file mode 100644
index 69b2fd86f3e..00000000000
--- a/net/kdenetwork/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- kmail/pics/Makefile.in.orig	Sun Dec 28 19:50:59 1997
-+++ kmail/pics/Makefile.in	Sun Dec 28 19:51:17 1997
-@@ -124,7 +124,8 @@
- 	kminsorgmsg.xpm kmmsgdel.xpm kmmsgnew.xpm kmmsgunseen.xpm \
- 	kmmsgold.xpm kmmsgreplied.xpm kmtrash.xpm red-bullet.xpm \
- 	kmfldsent.xpm closed.xpm green-bullet.xpm \
--	stopwatch.xbm stopwatchMask.xbm kdelogo.xpm
-+	stopwatch.xbm stopwatchMask.xbm kdelogo.xpm \
-+	kmmsgsent.xpm kmmsgqueued.xpm
- 
- datadir = $(prefix)/share/apps/kmail/pics
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/net/kdenetwork/pkg/PLIST b/net/kdenetwork/pkg/PLIST
index 2c0ec886076..33d2353cc00 100644
--- a/net/kdenetwork/pkg/PLIST
+++ b/net/kdenetwork/pkg/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 1997/12/29 03:52:16 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/03/21 01:54:51 tron Exp $
+bin/kmail
+bin/knu
+bin/korn
+bin/krn
+share/apps/kmail/pics/feather_white.xpm
+share/apps/kmail/pics/pub_key_red.xpm
 share/apps/kmail/pics/attach.xpm
 share/apps/kmail/pics/filedel2.xpm
 share/apps/kmail/pics/filereply.xpm
@@ -24,6 +30,9 @@ share/apps/kmail/pics/closed.xpm
 share/apps/kmail/pics/stopwatch.xbm
 share/apps/kmail/pics/stopwatchMask.xbm
 share/apps/kmail/pics/kdelogo.xpm
+share/apps/krn/toolbar/find.xpm
+share/apps/krn/toolbar/feather_white.xpm
+share/apps/krn/toolbar/pub_key_red.xpm
 share/apps/krn/toolbar/black-bullet.xpm
 share/apps/krn/toolbar/filemail.xpm
 share/apps/krn/toolbar/previous.xpm
@@ -59,6 +68,13 @@ share/doc/HTML/en/kmail/index-4.html
 share/doc/HTML/en/kmail/index-5.html
 share/doc/HTML/en/kmail/index-6.html
 share/doc/HTML/en/kmail/index-7.html
+share/doc/HTML/en/kmail/logotp3.gif
+share/doc/HTML/en/knu/knu-host.gif
+share/doc/HTML/en/knu/knu-traceroute.gif
+share/doc/HTML/en/knu/knu-config.gif
+share/doc/HTML/en/knu/knu-ping.gif
+share/doc/HTML/en/knu/index.html
+share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/krn/index.html
 share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
@@ -67,22 +83,50 @@ share/doc/HTML/en/krn/overview.html
 share/applnk/Internet/KMail.kdelnk
 share/applnk/Internet/Krn.kdelnk
 share/applnk/Network/knu.kdelnk
+share/applnk/Network/KOrn.kdelnk
+share/icons/mini/kmail.xpm
+share/icons/mini/krn.xpm
+share/icons/kmail.xpm
+share/icons/knu.xpm
+share/icons/korn.xpm
+share/icons/krn.xpm
 share/locale/de/LC_MESSAGES/kmail.mo
+share/locale/de/LC_MESSAGES/krn.mo
+share/locale/de/LC_MESSAGES/knu.mo
+share/locale/de/LC_MESSAGES/kppp.mo
 share/locale/pt/LC_MESSAGES/kmail.mo
 share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/fr/LC_MESSAGES/knu.mo
+share/locale/fr/LC_MESSAGES/krn.mo
 share/locale/fi/LC_MESSAGES/kmail.mo
-bin/kmail
-bin/krn
-@dirrm share/icons
+share/locale/fi/LC_MESSAGES/knu.mo
+share/locale/fi/LC_MESSAGES/kppp.mo
+share/locale/fi/LC_MESSAGES/krn.mo
+share/locale/cs/LC_MESSAGES/kmail.mo
+share/locale/cs/LC_MESSAGES/krn.mo
+share/locale/cs/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kppp.mo
+share/locale/es/LC_MESSAGES/krn.mo
+share/locale/es/LC_MESSAGES/knu.mo
+share/locale/es/LC_MESSAGES/kmail.mo
+share/locale/es/LC_MESSAGES/kppp.mo
+share/locale/hu/LC_MESSAGES/kmail.mo
+share/locale/hu/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kmail.mo
+share/locale/pt/LC_MESSAGES/knu.mo
+share/locale/pt/LC_MESSAGES/kppp.mo
+share/locale/pl/LC_MESSAGES/kppp.mo
+share/locale/pl/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/krn.mo
+share/locale/pl/LC_MESSAGES/knu.mo
+share/locale/cr/LC_MESSAGES/kmail.mo
+share/locale/cr/LC_MESSAGES/knu.mo
 @dirrm share/doc/HTML/en/krn
 @dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/doc
+@dirrm share/doc/HTML/en/knu
+@dirrm share/doc/HTML/en/korn
+@dirrm share/applnk/Network
 @dirrm share/apps/krn/toolbar
 @dirrm share/apps/krn
 @dirrm share/apps/kmail/pics
 @dirrm share/apps/kmail
-@dirrm share/apps
-@dirrm share/applnk/Utilities
-@dirrm share/applnk