Update "kdenetwork" to version 1.0.

5 files changed, 41 insertions, 37 deletions

diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index d29a4112001..398f19c0bca 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,31 +1,22 @@
-# $NetBSD: Makefile,v 1.13 1998/07/04 05:11:14 mycroft Exp $
+# $NetBSD: Makefile,v 1.14 1998/07/14 21:47:15 tron Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
-DISTNAME=	kdenetwork-beta4-1
-PKGNAME=	kdenetwork-4.1b
+DISTNAME=	kdenetwork-1.0
 CATEGORIES=	net kde
-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
+MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/stable/1.0/distribution/tar/generic/source/ \
+		ftp://ftp.kde.org/pub/kde/stable/1.0/distribution/tar/generic/source/
 
 MAINTAINER=	tron@netbsd.org
 
-BUILD_DEPENDS=	bzip2:../../archivers/bzip2 \
-		moc:../../x11/qt \
-		${LOCALBASE}/lib/libgdbm.a:../../databases/gdbm
+DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	uulib-0.5.13:../../converters/uulib
-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
+DEPENDS+=	kdelibs-1.0:../../x11/kdelibs
+DEPENDS+=	kdesupport-1.0:../../converters/kdesupport
+DEPENDS+=	kdebase-1.0:../../x11/kdebase
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
@@ -39,6 +30,4 @@ CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-WRKSRC=		${WRKDIR}/kdenetwork
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/files/md5 b/net/kdenetwork/files/md5
index a2584d9bff7..7bd638acc2e 100644
--- a/net/kdenetwork/files/md5
+++ b/net/kdenetwork/files/md5
@@ -1 +1 @@
-MD5 (kdenetwork-beta4-1.src.tar.bz2) = c44e534e75e4a95f7964e85ec60b6a4e
+MD5 (kdenetwork-1.0.tar.gz) = 0879ee6ac8077878c928c3ab48d021ce
diff --git a/net/kdenetwork/patches/patch-aa b/net/kdenetwork/patches/patch-aa
index 6467a1f5983..26c6834debb 100644
--- a/net/kdenetwork/patches/patch-aa
+++ b/net/kdenetwork/patches/patch-aa
@@ -1,11 +1,11 @@
---- 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 @@
+--- krn/kdecode.cpp.orig	Tue Apr 28 22:17:41 1998
++++ krn/kdecode.cpp	Tue Jul 14 23:22:25 1998
+@@ -13,7 +13,7 @@
  #include <qstrlist.h>
  #include <kconfig.h>
  #include <kapp.h>
 -#include <uudeview.h>
 +#include <uu.h>
- #include <mimelib/mimepp.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 82d2bcedef5..2df97985905 100644
--- a/net/kdenetwork/patches/patch-ab
+++ b/net/kdenetwork/patches/patch-ab
@@ -1,11 +1,11 @@
---- 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 @@
+--- krn/Makefile.in.orig	Fri Jul 10 20:38:48 1998
++++ krn/Makefile.in	Tue Jul 14 23:24:59 1998
+@@ -141,7 +141,7 @@
+ 	-lqt -lXext -lX11 -lmimelib -lgdbm $(LIBCOMPAT) $(LIBSOCKET)
  
- INCLUDES = $(all_includes)
- 
--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)
+ kdecode_LDADD = -lkfile -lkfm -lkdeui -lkdecore -lqt -lXext \
+-	-lX11 -luulib $(KDE_RPATH) $(LIBCOMPAT) $(LIBSOCKET)
++	-lX11 -luu $(KDE_RPATH) $(LIBCOMPAT) $(LIBSOCKET)
  
  ICONDIR = $(kde_icondir)
  MINIDIR =  $(kde_minidir)
diff --git a/net/kdenetwork/pkg/PLIST b/net/kdenetwork/pkg/PLIST
index de5e4f131a5..5f6ef6d403d 100644
--- a/net/kdenetwork/pkg/PLIST
+++ b/net/kdenetwork/pkg/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 1998/04/28 22:55:14 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/07/14 21:47:15 tron Exp $
+bin/kdecode
 bin/kmail
 bin/knu
 bin/korn
 bin/krn
+share/apps/kmail/pics/kmmsgforwarded.xpm
+share/apps/kmail/pics/kmmsgqueued.xpm
+share/apps/kmail/pics/kmmsgsent.xpm
 share/apps/kmail/pics/feather_white.xpm
 share/apps/kmail/pics/pub_key_red.xpm
 share/apps/kmail/pics/attach.xpm
@@ -67,7 +71,6 @@ share/doc/HTML/en/kmail/index-3.html
 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/index-1.html
 share/doc/HTML/en/knu/index-2.html
@@ -75,6 +78,8 @@ 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/knu-finger.gif
+share/doc/HTML/en/knu/index-7.html
 share/doc/HTML/en/knu/logotp3.gif
 share/doc/HTML/en/knu/knu-host.gif
 share/doc/HTML/en/knu/knu-traceroute.gif
@@ -123,8 +128,6 @@ 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
@@ -154,8 +157,20 @@ 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
+share/locale/hr/LC_MESSAGES/kmail.mo
+share/locale/hr/LC_MESSAGES/knu.mo
+share/locale/hr/LC_MESSAGES/kppp.mo
+share/locale/hr/LC_MESSAGES/krn.mo
+share/locale/ro/LC_MESSAGES/krn.mo
+share/locale/ca/LC_MESSAGES/kppp.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kmail.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/krn.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/knu.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kppp.mo
+share/locale/pt_BR/LC_MESSAGES/kmail.mo
+share/locale/pt_BR/LC_MESSAGES/krn.mo
+share/locale/pt_BR/LC_MESSAGES/knu.mo
+share/locale/pt_BR/LC_MESSAGES/kppp.mo
 @dirrm share/doc/HTML/en/krn
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en/knu