Update to KDE Beta 4 'Kirkland'.

4 files changed, 63 insertions, 24 deletions

diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 8fad4037666..17331baf3a1 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,26 +1,31 @@
-# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:36 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/28 22:55:14 tron Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
-DISTNAME=	kdenetwork-Beta3-1
-PKGNAME=	kdenetwork-3.1b
+DISTNAME=	kdenetwork-beta4-1
+PKGNAME=	kdenetwork-4.1b
 CATEGORIES=	net 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 \
 		${LOCALBASE}/lib/libgdbm.a:../../databases/gdbm
+DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	uulib-0.5.13:../../converters/uulib
-DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
-DEPENDS+=	giflib-3.0:../../graphics/giflib
-DEPENDS+=	kdesupport-3.1b:../../converters/kdesupport
-RUN_DEPENDS=	kappfinder:../../x11/kdebase
+DEPENDS+=	kdelibs-4.1b:../../x11/kdelibs
+DEPENDS+=	kdesupport-4.1b:../../converters/kdesupport
+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/net/kdenetwork/files/md5 b/net/kdenetwork/files/md5
index 691f699b87f..a2584d9bff7 100644
--- a/net/kdenetwork/files/md5
+++ b/net/kdenetwork/files/md5
@@ -1 +1 @@
-MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
+MD5 (kdenetwork-beta4-1.src.tar.bz2) = c44e534e75e4a95f7964e85ec60b6a4e
diff --git a/net/kdenetwork/patches/patch-ab b/net/kdenetwork/patches/patch-ab
index 9dc3d21a2c5..82d2bcedef5 100644
--- a/net/kdenetwork/patches/patch-ab
+++ b/net/kdenetwork/patches/patch-ab
@@ -1,11 +1,11 @@
---- 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 @@
+--- krn/Makefile.in.orig	Sun Apr 19 01:53:41 1998
++++ krn/Makefile.in	Tue Apr 28 01:01:53 1998
+@@ -128,7 +128,7 @@
  
  INCLUDES = $(all_includes)
  
--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)
+-LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore -lkfile $(LIBJPEG) -lqt -lXext -lX11 -lmimelib -luulib -lgdbm $(KDE_RPATH)
++LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore -lkfile $(LIBJPEG) -lqt -lXext -lX11 -lmimelib -luu -lgdbm $(KDE_RPATH)
  
  ICONDIR = $(kde_icondir)
  MINIDIR =  $(kde_minidir)
diff --git a/net/kdenetwork/pkg/PLIST b/net/kdenetwork/pkg/PLIST
index 33d2353cc00..de5e4f131a5 100644
--- a/net/kdenetwork/pkg/PLIST
+++ b/net/kdenetwork/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/03/21 01:54:51 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/04/28 22:55:14 tron Exp $
 bin/kmail
 bin/knu
 bin/korn
@@ -69,6 +69,13 @@ 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/index-1.html
+share/doc/HTML/en/knu/index-2.html
+share/doc/HTML/en/knu/index-3.html
+share/doc/HTML/en/knu/index-4.html
+share/doc/HTML/en/knu/index-5.html
+share/doc/HTML/en/knu/index-6.html
+share/doc/HTML/en/knu/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
@@ -80,16 +87,44 @@ share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
 share/doc/HTML/en/krn/offline.html
 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/applnk/Internet/knu.kdelnk
+share/applnk/Internet/KOrn.kdelnk
+share/applnk/Internet/KMail.kdelnk
 share/icons/mini/kmail.xpm
 share/icons/mini/krn.xpm
+share/icons/mini/knu.xpm
+share/icons/mini/korn.xpm
 share/icons/kmail.xpm
 share/icons/knu.xpm
 share/icons/korn.xpm
 share/icons/krn.xpm
+share/locale/fr/LC_MESSAGES/kppp.mo
+share/locale/da/LC_MESSAGES/kppp.mo
+share/locale/it/LC_MESSAGES/krn.mo
+share/locale/it/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kppp.mo
+share/locale/nl/LC_MESSAGES/kmail.mo
+share/locale/nl/LC_MESSAGES/krn.mo
+share/locale/nl/LC_MESSAGES/knu.mo
+share/locale/nl/LC_MESSAGES/kppp.mo
+share/locale/pt/LC_MESSAGES/krn.mo
+share/locale/no/LC_MESSAGES/kmail.mo
+share/locale/no/LC_MESSAGES/krn.mo
+share/locale/no/LC_MESSAGES/kppp.mo
+share/locale/no/LC_MESSAGES/knu.mo
+share/locale/el/LC_MESSAGES/kmail.mo
+share/locale/el/LC_MESSAGES/krn.mo
+share/locale/el/LC_MESSAGES/kppp.mo
+share/locale/el/LC_MESSAGES/knu.mo
+share/locale/ro/LC_MESSAGES/kmail.mo
+share/locale/ro/LC_MESSAGES/kppp.mo
+share/locale/sk/LC_MESSAGES/kmail.mo
+share/locale/sk/LC_MESSAGES/krn.mo
+share/locale/sk/LC_MESSAGES/knu.mo
+share/locale/sk/LC_MESSAGES/kppp.mo
+share/locale/cr/LC_MESSAGES/kppp.mo
+share/locale/cr/LC_MESSAGES/krn.mo
 share/locale/de/LC_MESSAGES/kmail.mo
 share/locale/de/LC_MESSAGES/krn.mo
 share/locale/de/LC_MESSAGES/knu.mo
@@ -125,7 +160,6 @@ share/locale/cr/LC_MESSAGES/knu.mo
 @dirrm share/doc/HTML/en/kmail
 @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