Upgrade to Beta3

14 files changed, 519 insertions, 277 deletions

diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index ababa6e101e6..2ebcd054fef5 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -1,40 +1,45 @@
 # New ports collection makefile for:   kdenetwork
-# Version required:    Beta1
+# Version required:    Beta3
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.4 1998/02/16 11:57:59 asami Exp $
+# $Id: Makefile,v 1.5 1998/02/22 21:16:58 se Exp $
 #
 
-DISTNAME=	kdenetwork-Beta1-2
-PKGNAME=	kdenetwork-1.2b
+DISTNAME=	kdenetwork-Beta3-1
+PKGNAME=	kdenetwork-3.1b
 CATEGORIES=	net kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/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
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+LIB_DEPENDS=	qt\\.1\\.3[1-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
-
-BROKEN=		needs to be updated to beta3
+		uu\\.1\\.:${PORTSDIR}/converters/uulib \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs \
+		mimelib\\.1\\.[0-9]:${PORTSDIR}/converters/kdesupport
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
-		"--prefix=$(PREFIX)" \
-		"--datadir=$(PREFIX)/share/kde"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
+pre-configure:
+		ln -s $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
+
 .include <bsd.port.mk>
diff --git a/net/kdenetwork11/distinfo b/net/kdenetwork11/distinfo
index 735f58974bfa..691f699b87f9 100644
--- a/net/kdenetwork11/distinfo
+++ b/net/kdenetwork11/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-Beta1-2.src.tgz) = e836ce6574dd357bfc0d9d3a054331b6
+MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
diff --git a/net/kdenetwork11/files/patch-ab b/net/kdenetwork11/files/patch-ab
deleted file mode 100644
index 61b5d55c327e..000000000000
--- a/net/kdenetwork11/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-*** krn/Makefile.in~	Sun Nov  2 14:38:17 1997
---- krn/Makefile.in	Sun Nov  2 14:38:20 1997
-***************
-*** 35,44 ****
-  ########### File Formats ###########
-  
-! .SUFFIXES: .cpp
-  
-  .cpp.o:
-  	$(CXX) -c $(CXXFLAGS) $<
-  
-! %.moc: %.h
-  	$(MOC) $< -o $@
-  
---- 35,44 ----
-  ########### File Formats ###########
-  
-! .SUFFIXES: .cpp .moc
-  
-  .cpp.o:
-  	$(CXX) -c $(CXXFLAGS) $<
-  
-! .h.moc:
-  	$(MOC) $< -o $@
-  
diff --git a/net/kdenetwork11/files/patch-ac b/net/kdenetwork11/files/patch-ac
new file mode 100644
index 000000000000..523d9c7362d2
--- /dev/null
+++ b/net/kdenetwork11/files/patch-ac
@@ -0,0 +1,15 @@
+*** krn/Makefile.in~	Sun Feb 22 17:19:33 1998
+--- krn/Makefile.in	Sun Feb 22 17:19:43 1998
+***************
+*** 123,127 ****
+  INCLUDES = $(all_includes)
+  
+! LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore $(LIBJPEG) -lgif -lqt -lXext -lX11 -lmimelib -luulib -lgdbm $(KDE_RPATH)
+  
+  ICONDIR = $(kde_icondir)
+--- 123,127 ----
+  INCLUDES = $(all_includes)
+  
+! LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore $(LIBJPEG) -lgif -lqt -lXext -lX11 -lmimelib -luu -lgdbm $(KDE_RPATH)
+  
+  ICONDIR = $(kde_icondir)
diff --git a/net/kdenetwork11/pkg-plist b/net/kdenetwork11/pkg-plist
index 355ba1ed5127..8cc123371871 100644
--- a/net/kdenetwork11/pkg-plist
+++ b/net/kdenetwork11/pkg-plist
@@ -1,56 +1,68 @@
+bin/kmail
+bin/knu
+bin/korn
+bin/krn
+share/applnk/Internet/KMail.kdelnk
+share/applnk/Internet/Krn.kdelnk
+share/applnk/Network/KOrn.kdelnk
+share/applnk/Network/knu.kdelnk
 share/apps/kmail/pics/attach.xpm
-share/apps/kmail/pics/filedel2.xpm
-share/apps/kmail/pics/filereply.xpm
-share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/checkmail.xpm
+share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/feather_white.xpm
+share/apps/kmail/pics/filedel2.xpm
 share/apps/kmail/pics/fileforward.xpm
+share/apps/kmail/pics/filereply.xpm
 share/apps/kmail/pics/filereplyall.xpm
-share/apps/kmail/pics/thumb_up.xpm
 share/apps/kmail/pics/green-bullet.xpm
+share/apps/kmail/pics/kdelogo.xpm
 share/apps/kmail/pics/kmfldin.xpm
 share/apps/kmail/pics/kmfldout.xpm
+share/apps/kmail/pics/kmfldsent.xpm
 share/apps/kmail/pics/kmfolder.xpm
 share/apps/kmail/pics/kminsorgmsg.xpm
 share/apps/kmail/pics/kmmsgdel.xpm
 share/apps/kmail/pics/kmmsgnew.xpm
-share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmmsgold.xpm
 share/apps/kmail/pics/kmmsgreplied.xpm
+share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmtrash.xpm
+share/apps/kmail/pics/pub_key_red.xpm
 share/apps/kmail/pics/red-bullet.xpm
-share/apps/kmail/pics/kmfldsent.xpm
-share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/stopwatch.xbm
 share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/kmail/pics/kdelogo.xpm
+share/apps/kmail/pics/thumb_up.xpm
+share/apps/krn/toolbar/attach.xpm
 share/apps/krn/toolbar/black-bullet.xpm
-share/apps/krn/toolbar/filemail.xpm
-share/apps/krn/toolbar/previous.xpm
-share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/catch.xpm
 share/apps/krn/toolbar/closed.xpm
-share/apps/krn/toolbar/krnfolder.xpm
-share/apps/krn/toolbar/read.xpm
-share/apps/krn/toolbar/subscr.xpm
 share/apps/krn/toolbar/connected.xpm
-share/apps/krn/toolbar/green-bullet.xpm
-share/apps/krn/toolbar/red-bullet.xpm
-share/apps/krn/toolbar/followup.xpm
-share/apps/krn/toolbar/disconnected.xpm
-share/apps/krn/toolbar/left.xpm
-share/apps/krn/toolbar/reload.xpm
-share/apps/krn/toolbar/tagged.xpm
 share/apps/krn/toolbar/deco.xpm
-share/apps/krn/toolbar/logo.xpm
-share/apps/krn/toolbar/save.xpm
+share/apps/krn/toolbar/disconnected.xpm
+share/apps/krn/toolbar/feather_white.xpm
+share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/filemail.xpm
 share/apps/krn/toolbar/fileprint.xpm
+share/apps/krn/toolbar/find.xpm
+share/apps/krn/toolbar/followup.xpm
+share/apps/krn/toolbar/green-bullet.xpm
+share/apps/krn/toolbar/krnfolder.xpm
+share/apps/krn/toolbar/left.xpm
 share/apps/krn/toolbar/locked.xpm
-share/apps/krn/toolbar/catch.xpm
-share/apps/krn/toolbar/thumb_up.xpm
-share/apps/krn/toolbar/attach.xpm
+share/apps/krn/toolbar/logo.xpm
 share/apps/krn/toolbar/mailpost.xpm
-share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/previous.xpm
+share/apps/krn/toolbar/pub_key_red.xpm
+share/apps/krn/toolbar/read.xpm
+share/apps/krn/toolbar/red-bullet.xpm
+share/apps/krn/toolbar/reload.xpm
+share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/save.xpm
 share/apps/krn/toolbar/send.xpm
-share/doc/HTML/en/kmail/index.html
+share/apps/krn/toolbar/subscr.xpm
+share/apps/krn/toolbar/tagged.xpm
+share/apps/krn/toolbar/thumb_up.xpm
 share/doc/HTML/en/kmail/index-1.html
 share/doc/HTML/en/kmail/index-2.html
 share/doc/HTML/en/kmail/index-3.html
@@ -58,39 +70,85 @@ 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/krn/index.html
+share/doc/HTML/en/kmail/index.html
+share/doc/HTML/en/kmail/logotp3.gif
+share/doc/HTML/en/knu/index.html
+share/doc/HTML/en/knu/knu-config.gif
+share/doc/HTML/en/knu/knu-host.gif
+share/doc/HTML/en/knu/knu-ping.gif
+share/doc/HTML/en/knu/knu-traceroute.gif
+share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
+share/doc/HTML/en/krn/index.html
 share/doc/HTML/en/krn/offline.html
 share/doc/HTML/en/krn/overview.html
-share/applnk/Utilities/KMail.kdelnk
-share/applnk/Utilities/Krn.kdelnk
+share/icons/kmail.xpm
+share/icons/knu.xpm
+share/icons/korn.xpm
 share/icons/krn.xpm
+share/icons/mini/kmail.xpm
+share/icons/mini/krn.xpm
+share/locale/cr/LC_MESSAGES/kmail.mo
+share/locale/cr/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kmail.mo
+share/locale/cs/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kppp.mo
+share/locale/cs/LC_MESSAGES/krn.mo
 share/locale/de/LC_MESSAGES/kmail.mo
-share/locale/pt/LC_MESSAGES/kmail.mo
-share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/de/LC_MESSAGES/knu.mo
+share/locale/de/LC_MESSAGES/kppp.mo
+share/locale/de/LC_MESSAGES/krn.mo
+share/locale/es/LC_MESSAGES/kmail.mo
+share/locale/es/LC_MESSAGES/knu.mo
+share/locale/es/LC_MESSAGES/kppp.mo
+share/locale/es/LC_MESSAGES/krn.mo
 share/locale/fi/LC_MESSAGES/kmail.mo
-bin/kmail
-bin/krn
+share/locale/fi/LC_MESSAGES/knu.mo
+share/locale/fi/LC_MESSAGES/kppp.mo
+share/locale/fi/LC_MESSAGES/krn.mo
+share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/fr/LC_MESSAGES/knu.mo
+share/locale/fr/LC_MESSAGES/krn.mo
+share/locale/hu/LC_MESSAGES/kmail.mo
+share/locale/hu/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/knu.mo
+share/locale/pl/LC_MESSAGES/kppp.mo
+share/locale/pl/LC_MESSAGES/krn.mo
+share/locale/pt/LC_MESSAGES/kmail.mo
+share/locale/pt/LC_MESSAGES/knu.mo
+share/locale/pt/LC_MESSAGES/kppp.mo
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
-@dirrm share/locale
-@dirrm share/icons
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/cr/LC_MESSAGES
+@dirrm share/locale/cr
 @dirrm share/doc/HTML/en/krn
+@dirrm share/doc/HTML/en/korn
+@dirrm share/doc/HTML/en/knu
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @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
+@dirrm share/applnk/Network
+@dirrm share/applnk/Internet
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index ababa6e101e6..2ebcd054fef5 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -1,40 +1,45 @@
 # New ports collection makefile for:   kdenetwork
-# Version required:    Beta1
+# Version required:    Beta3
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.4 1998/02/16 11:57:59 asami Exp $
+# $Id: Makefile,v 1.5 1998/02/22 21:16:58 se Exp $
 #
 
-DISTNAME=	kdenetwork-Beta1-2
-PKGNAME=	kdenetwork-1.2b
+DISTNAME=	kdenetwork-Beta3-1
+PKGNAME=	kdenetwork-3.1b
 CATEGORIES=	net kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/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
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+LIB_DEPENDS=	qt\\.1\\.3[1-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
-
-BROKEN=		needs to be updated to beta3
+		uu\\.1\\.:${PORTSDIR}/converters/uulib \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs \
+		mimelib\\.1\\.[0-9]:${PORTSDIR}/converters/kdesupport
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
-		"--prefix=$(PREFIX)" \
-		"--datadir=$(PREFIX)/share/kde"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
+pre-configure:
+		ln -s $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
+
 .include <bsd.port.mk>
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index 735f58974bfa..691f699b87f9 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-Beta1-2.src.tgz) = e836ce6574dd357bfc0d9d3a054331b6
+MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist
index 355ba1ed5127..8cc123371871 100644
--- a/net/kdenetwork2/pkg-plist
+++ b/net/kdenetwork2/pkg-plist
@@ -1,56 +1,68 @@
+bin/kmail
+bin/knu
+bin/korn
+bin/krn
+share/applnk/Internet/KMail.kdelnk
+share/applnk/Internet/Krn.kdelnk
+share/applnk/Network/KOrn.kdelnk
+share/applnk/Network/knu.kdelnk
 share/apps/kmail/pics/attach.xpm
-share/apps/kmail/pics/filedel2.xpm
-share/apps/kmail/pics/filereply.xpm
-share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/checkmail.xpm
+share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/feather_white.xpm
+share/apps/kmail/pics/filedel2.xpm
 share/apps/kmail/pics/fileforward.xpm
+share/apps/kmail/pics/filereply.xpm
 share/apps/kmail/pics/filereplyall.xpm
-share/apps/kmail/pics/thumb_up.xpm
 share/apps/kmail/pics/green-bullet.xpm
+share/apps/kmail/pics/kdelogo.xpm
 share/apps/kmail/pics/kmfldin.xpm
 share/apps/kmail/pics/kmfldout.xpm
+share/apps/kmail/pics/kmfldsent.xpm
 share/apps/kmail/pics/kmfolder.xpm
 share/apps/kmail/pics/kminsorgmsg.xpm
 share/apps/kmail/pics/kmmsgdel.xpm
 share/apps/kmail/pics/kmmsgnew.xpm
-share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmmsgold.xpm
 share/apps/kmail/pics/kmmsgreplied.xpm
+share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmtrash.xpm
+share/apps/kmail/pics/pub_key_red.xpm
 share/apps/kmail/pics/red-bullet.xpm
-share/apps/kmail/pics/kmfldsent.xpm
-share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/stopwatch.xbm
 share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/kmail/pics/kdelogo.xpm
+share/apps/kmail/pics/thumb_up.xpm
+share/apps/krn/toolbar/attach.xpm
 share/apps/krn/toolbar/black-bullet.xpm
-share/apps/krn/toolbar/filemail.xpm
-share/apps/krn/toolbar/previous.xpm
-share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/catch.xpm
 share/apps/krn/toolbar/closed.xpm
-share/apps/krn/toolbar/krnfolder.xpm
-share/apps/krn/toolbar/read.xpm
-share/apps/krn/toolbar/subscr.xpm
 share/apps/krn/toolbar/connected.xpm
-share/apps/krn/toolbar/green-bullet.xpm
-share/apps/krn/toolbar/red-bullet.xpm
-share/apps/krn/toolbar/followup.xpm
-share/apps/krn/toolbar/disconnected.xpm
-share/apps/krn/toolbar/left.xpm
-share/apps/krn/toolbar/reload.xpm
-share/apps/krn/toolbar/tagged.xpm
 share/apps/krn/toolbar/deco.xpm
-share/apps/krn/toolbar/logo.xpm
-share/apps/krn/toolbar/save.xpm
+share/apps/krn/toolbar/disconnected.xpm
+share/apps/krn/toolbar/feather_white.xpm
+share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/filemail.xpm
 share/apps/krn/toolbar/fileprint.xpm
+share/apps/krn/toolbar/find.xpm
+share/apps/krn/toolbar/followup.xpm
+share/apps/krn/toolbar/green-bullet.xpm
+share/apps/krn/toolbar/krnfolder.xpm
+share/apps/krn/toolbar/left.xpm
 share/apps/krn/toolbar/locked.xpm
-share/apps/krn/toolbar/catch.xpm
-share/apps/krn/toolbar/thumb_up.xpm
-share/apps/krn/toolbar/attach.xpm
+share/apps/krn/toolbar/logo.xpm
 share/apps/krn/toolbar/mailpost.xpm
-share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/previous.xpm
+share/apps/krn/toolbar/pub_key_red.xpm
+share/apps/krn/toolbar/read.xpm
+share/apps/krn/toolbar/red-bullet.xpm
+share/apps/krn/toolbar/reload.xpm
+share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/save.xpm
 share/apps/krn/toolbar/send.xpm
-share/doc/HTML/en/kmail/index.html
+share/apps/krn/toolbar/subscr.xpm
+share/apps/krn/toolbar/tagged.xpm
+share/apps/krn/toolbar/thumb_up.xpm
 share/doc/HTML/en/kmail/index-1.html
 share/doc/HTML/en/kmail/index-2.html
 share/doc/HTML/en/kmail/index-3.html
@@ -58,39 +70,85 @@ 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/krn/index.html
+share/doc/HTML/en/kmail/index.html
+share/doc/HTML/en/kmail/logotp3.gif
+share/doc/HTML/en/knu/index.html
+share/doc/HTML/en/knu/knu-config.gif
+share/doc/HTML/en/knu/knu-host.gif
+share/doc/HTML/en/knu/knu-ping.gif
+share/doc/HTML/en/knu/knu-traceroute.gif
+share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
+share/doc/HTML/en/krn/index.html
 share/doc/HTML/en/krn/offline.html
 share/doc/HTML/en/krn/overview.html
-share/applnk/Utilities/KMail.kdelnk
-share/applnk/Utilities/Krn.kdelnk
+share/icons/kmail.xpm
+share/icons/knu.xpm
+share/icons/korn.xpm
 share/icons/krn.xpm
+share/icons/mini/kmail.xpm
+share/icons/mini/krn.xpm
+share/locale/cr/LC_MESSAGES/kmail.mo
+share/locale/cr/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kmail.mo
+share/locale/cs/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kppp.mo
+share/locale/cs/LC_MESSAGES/krn.mo
 share/locale/de/LC_MESSAGES/kmail.mo
-share/locale/pt/LC_MESSAGES/kmail.mo
-share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/de/LC_MESSAGES/knu.mo
+share/locale/de/LC_MESSAGES/kppp.mo
+share/locale/de/LC_MESSAGES/krn.mo
+share/locale/es/LC_MESSAGES/kmail.mo
+share/locale/es/LC_MESSAGES/knu.mo
+share/locale/es/LC_MESSAGES/kppp.mo
+share/locale/es/LC_MESSAGES/krn.mo
 share/locale/fi/LC_MESSAGES/kmail.mo
-bin/kmail
-bin/krn
+share/locale/fi/LC_MESSAGES/knu.mo
+share/locale/fi/LC_MESSAGES/kppp.mo
+share/locale/fi/LC_MESSAGES/krn.mo
+share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/fr/LC_MESSAGES/knu.mo
+share/locale/fr/LC_MESSAGES/krn.mo
+share/locale/hu/LC_MESSAGES/kmail.mo
+share/locale/hu/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/knu.mo
+share/locale/pl/LC_MESSAGES/kppp.mo
+share/locale/pl/LC_MESSAGES/krn.mo
+share/locale/pt/LC_MESSAGES/kmail.mo
+share/locale/pt/LC_MESSAGES/knu.mo
+share/locale/pt/LC_MESSAGES/kppp.mo
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
-@dirrm share/locale
-@dirrm share/icons
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/cr/LC_MESSAGES
+@dirrm share/locale/cr
 @dirrm share/doc/HTML/en/krn
+@dirrm share/doc/HTML/en/korn
+@dirrm share/doc/HTML/en/knu
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @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
+@dirrm share/applnk/Network
+@dirrm share/applnk/Internet
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index ababa6e101e6..2ebcd054fef5 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,40 +1,45 @@
 # New ports collection makefile for:   kdenetwork
-# Version required:    Beta1
+# Version required:    Beta3
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.4 1998/02/16 11:57:59 asami Exp $
+# $Id: Makefile,v 1.5 1998/02/22 21:16:58 se Exp $
 #
 
-DISTNAME=	kdenetwork-Beta1-2
-PKGNAME=	kdenetwork-1.2b
+DISTNAME=	kdenetwork-Beta3-1
+PKGNAME=	kdenetwork-3.1b
 CATEGORIES=	net kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/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
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+LIB_DEPENDS=	qt\\.1\\.3[1-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
-
-BROKEN=		needs to be updated to beta3
+		uu\\.1\\.:${PORTSDIR}/converters/uulib \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs \
+		mimelib\\.1\\.[0-9]:${PORTSDIR}/converters/kdesupport
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
-		"--prefix=$(PREFIX)" \
-		"--datadir=$(PREFIX)/share/kde"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
+pre-configure:
+		ln -s $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
+
 .include <bsd.port.mk>
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 735f58974bfa..691f699b87f9 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-Beta1-2.src.tgz) = e836ce6574dd357bfc0d9d3a054331b6
+MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
index 355ba1ed5127..8cc123371871 100644
--- a/net/kdenetwork3/pkg-plist
+++ b/net/kdenetwork3/pkg-plist
@@ -1,56 +1,68 @@
+bin/kmail
+bin/knu
+bin/korn
+bin/krn
+share/applnk/Internet/KMail.kdelnk
+share/applnk/Internet/Krn.kdelnk
+share/applnk/Network/KOrn.kdelnk
+share/applnk/Network/knu.kdelnk
 share/apps/kmail/pics/attach.xpm
-share/apps/kmail/pics/filedel2.xpm
-share/apps/kmail/pics/filereply.xpm
-share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/checkmail.xpm
+share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/feather_white.xpm
+share/apps/kmail/pics/filedel2.xpm
 share/apps/kmail/pics/fileforward.xpm
+share/apps/kmail/pics/filereply.xpm
 share/apps/kmail/pics/filereplyall.xpm
-share/apps/kmail/pics/thumb_up.xpm
 share/apps/kmail/pics/green-bullet.xpm
+share/apps/kmail/pics/kdelogo.xpm
 share/apps/kmail/pics/kmfldin.xpm
 share/apps/kmail/pics/kmfldout.xpm
+share/apps/kmail/pics/kmfldsent.xpm
 share/apps/kmail/pics/kmfolder.xpm
 share/apps/kmail/pics/kminsorgmsg.xpm
 share/apps/kmail/pics/kmmsgdel.xpm
 share/apps/kmail/pics/kmmsgnew.xpm
-share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmmsgold.xpm
 share/apps/kmail/pics/kmmsgreplied.xpm
+share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmtrash.xpm
+share/apps/kmail/pics/pub_key_red.xpm
 share/apps/kmail/pics/red-bullet.xpm
-share/apps/kmail/pics/kmfldsent.xpm
-share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/stopwatch.xbm
 share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/kmail/pics/kdelogo.xpm
+share/apps/kmail/pics/thumb_up.xpm
+share/apps/krn/toolbar/attach.xpm
 share/apps/krn/toolbar/black-bullet.xpm
-share/apps/krn/toolbar/filemail.xpm
-share/apps/krn/toolbar/previous.xpm
-share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/catch.xpm
 share/apps/krn/toolbar/closed.xpm
-share/apps/krn/toolbar/krnfolder.xpm
-share/apps/krn/toolbar/read.xpm
-share/apps/krn/toolbar/subscr.xpm
 share/apps/krn/toolbar/connected.xpm
-share/apps/krn/toolbar/green-bullet.xpm
-share/apps/krn/toolbar/red-bullet.xpm
-share/apps/krn/toolbar/followup.xpm
-share/apps/krn/toolbar/disconnected.xpm
-share/apps/krn/toolbar/left.xpm
-share/apps/krn/toolbar/reload.xpm
-share/apps/krn/toolbar/tagged.xpm
 share/apps/krn/toolbar/deco.xpm
-share/apps/krn/toolbar/logo.xpm
-share/apps/krn/toolbar/save.xpm
+share/apps/krn/toolbar/disconnected.xpm
+share/apps/krn/toolbar/feather_white.xpm
+share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/filemail.xpm
 share/apps/krn/toolbar/fileprint.xpm
+share/apps/krn/toolbar/find.xpm
+share/apps/krn/toolbar/followup.xpm
+share/apps/krn/toolbar/green-bullet.xpm
+share/apps/krn/toolbar/krnfolder.xpm
+share/apps/krn/toolbar/left.xpm
 share/apps/krn/toolbar/locked.xpm
-share/apps/krn/toolbar/catch.xpm
-share/apps/krn/toolbar/thumb_up.xpm
-share/apps/krn/toolbar/attach.xpm
+share/apps/krn/toolbar/logo.xpm
 share/apps/krn/toolbar/mailpost.xpm
-share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/previous.xpm
+share/apps/krn/toolbar/pub_key_red.xpm
+share/apps/krn/toolbar/read.xpm
+share/apps/krn/toolbar/red-bullet.xpm
+share/apps/krn/toolbar/reload.xpm
+share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/save.xpm
 share/apps/krn/toolbar/send.xpm
-share/doc/HTML/en/kmail/index.html
+share/apps/krn/toolbar/subscr.xpm
+share/apps/krn/toolbar/tagged.xpm
+share/apps/krn/toolbar/thumb_up.xpm
 share/doc/HTML/en/kmail/index-1.html
 share/doc/HTML/en/kmail/index-2.html
 share/doc/HTML/en/kmail/index-3.html
@@ -58,39 +70,85 @@ 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/krn/index.html
+share/doc/HTML/en/kmail/index.html
+share/doc/HTML/en/kmail/logotp3.gif
+share/doc/HTML/en/knu/index.html
+share/doc/HTML/en/knu/knu-config.gif
+share/doc/HTML/en/knu/knu-host.gif
+share/doc/HTML/en/knu/knu-ping.gif
+share/doc/HTML/en/knu/knu-traceroute.gif
+share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
+share/doc/HTML/en/krn/index.html
 share/doc/HTML/en/krn/offline.html
 share/doc/HTML/en/krn/overview.html
-share/applnk/Utilities/KMail.kdelnk
-share/applnk/Utilities/Krn.kdelnk
+share/icons/kmail.xpm
+share/icons/knu.xpm
+share/icons/korn.xpm
 share/icons/krn.xpm
+share/icons/mini/kmail.xpm
+share/icons/mini/krn.xpm
+share/locale/cr/LC_MESSAGES/kmail.mo
+share/locale/cr/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kmail.mo
+share/locale/cs/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kppp.mo
+share/locale/cs/LC_MESSAGES/krn.mo
 share/locale/de/LC_MESSAGES/kmail.mo
-share/locale/pt/LC_MESSAGES/kmail.mo
-share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/de/LC_MESSAGES/knu.mo
+share/locale/de/LC_MESSAGES/kppp.mo
+share/locale/de/LC_MESSAGES/krn.mo
+share/locale/es/LC_MESSAGES/kmail.mo
+share/locale/es/LC_MESSAGES/knu.mo
+share/locale/es/LC_MESSAGES/kppp.mo
+share/locale/es/LC_MESSAGES/krn.mo
 share/locale/fi/LC_MESSAGES/kmail.mo
-bin/kmail
-bin/krn
+share/locale/fi/LC_MESSAGES/knu.mo
+share/locale/fi/LC_MESSAGES/kppp.mo
+share/locale/fi/LC_MESSAGES/krn.mo
+share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/fr/LC_MESSAGES/knu.mo
+share/locale/fr/LC_MESSAGES/krn.mo
+share/locale/hu/LC_MESSAGES/kmail.mo
+share/locale/hu/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/knu.mo
+share/locale/pl/LC_MESSAGES/kppp.mo
+share/locale/pl/LC_MESSAGES/krn.mo
+share/locale/pt/LC_MESSAGES/kmail.mo
+share/locale/pt/LC_MESSAGES/knu.mo
+share/locale/pt/LC_MESSAGES/kppp.mo
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
-@dirrm share/locale
-@dirrm share/icons
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/cr/LC_MESSAGES
+@dirrm share/locale/cr
 @dirrm share/doc/HTML/en/krn
+@dirrm share/doc/HTML/en/korn
+@dirrm share/doc/HTML/en/knu
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @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
+@dirrm share/applnk/Network
+@dirrm share/applnk/Internet
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index ababa6e101e6..2ebcd054fef5 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,40 +1,45 @@
 # New ports collection makefile for:   kdenetwork
-# Version required:    Beta1
+# Version required:    Beta3
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.4 1998/02/16 11:57:59 asami Exp $
+# $Id: Makefile,v 1.5 1998/02/22 21:16:58 se Exp $
 #
 
-DISTNAME=	kdenetwork-Beta1-2
-PKGNAME=	kdenetwork-1.2b
+DISTNAME=	kdenetwork-Beta3-1
+PKGNAME=	kdenetwork-3.1b
 CATEGORIES=	net kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/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
-LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
+LIB_DEPENDS=	qt\\.1\\.3[1-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
-
-BROKEN=		needs to be updated to beta3
+		uu\\.1\\.:${PORTSDIR}/converters/uulib \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs \
+		mimelib\\.1\\.[0-9]:${PORTSDIR}/converters/kdesupport
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
-		"--prefix=$(PREFIX)" \
-		"--datadir=$(PREFIX)/share/kde"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-extra-includes=$(PREFIX)/include/giflib"
+
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
+		INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
+pre-configure:
+		ln -s $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
+
 .include <bsd.port.mk>
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 735f58974bfa..691f699b87f9 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-Beta1-2.src.tgz) = e836ce6574dd357bfc0d9d3a054331b6
+MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index 355ba1ed5127..8cc123371871 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -1,56 +1,68 @@
+bin/kmail
+bin/knu
+bin/korn
+bin/krn
+share/applnk/Internet/KMail.kdelnk
+share/applnk/Internet/Krn.kdelnk
+share/applnk/Network/KOrn.kdelnk
+share/applnk/Network/knu.kdelnk
 share/apps/kmail/pics/attach.xpm
-share/apps/kmail/pics/filedel2.xpm
-share/apps/kmail/pics/filereply.xpm
-share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/checkmail.xpm
+share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/feather_white.xpm
+share/apps/kmail/pics/filedel2.xpm
 share/apps/kmail/pics/fileforward.xpm
+share/apps/kmail/pics/filereply.xpm
 share/apps/kmail/pics/filereplyall.xpm
-share/apps/kmail/pics/thumb_up.xpm
 share/apps/kmail/pics/green-bullet.xpm
+share/apps/kmail/pics/kdelogo.xpm
 share/apps/kmail/pics/kmfldin.xpm
 share/apps/kmail/pics/kmfldout.xpm
+share/apps/kmail/pics/kmfldsent.xpm
 share/apps/kmail/pics/kmfolder.xpm
 share/apps/kmail/pics/kminsorgmsg.xpm
 share/apps/kmail/pics/kmmsgdel.xpm
 share/apps/kmail/pics/kmmsgnew.xpm
-share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmmsgold.xpm
 share/apps/kmail/pics/kmmsgreplied.xpm
+share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmtrash.xpm
+share/apps/kmail/pics/pub_key_red.xpm
 share/apps/kmail/pics/red-bullet.xpm
-share/apps/kmail/pics/kmfldsent.xpm
-share/apps/kmail/pics/closed.xpm
+share/apps/kmail/pics/send.xpm
 share/apps/kmail/pics/stopwatch.xbm
 share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/kmail/pics/kdelogo.xpm
+share/apps/kmail/pics/thumb_up.xpm
+share/apps/krn/toolbar/attach.xpm
 share/apps/krn/toolbar/black-bullet.xpm
-share/apps/krn/toolbar/filemail.xpm
-share/apps/krn/toolbar/previous.xpm
-share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/catch.xpm
 share/apps/krn/toolbar/closed.xpm
-share/apps/krn/toolbar/krnfolder.xpm
-share/apps/krn/toolbar/read.xpm
-share/apps/krn/toolbar/subscr.xpm
 share/apps/krn/toolbar/connected.xpm
-share/apps/krn/toolbar/green-bullet.xpm
-share/apps/krn/toolbar/red-bullet.xpm
-share/apps/krn/toolbar/followup.xpm
-share/apps/krn/toolbar/disconnected.xpm
-share/apps/krn/toolbar/left.xpm
-share/apps/krn/toolbar/reload.xpm
-share/apps/krn/toolbar/tagged.xpm
 share/apps/krn/toolbar/deco.xpm
-share/apps/krn/toolbar/logo.xpm
-share/apps/krn/toolbar/save.xpm
+share/apps/krn/toolbar/disconnected.xpm
+share/apps/krn/toolbar/feather_white.xpm
+share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/filemail.xpm
 share/apps/krn/toolbar/fileprint.xpm
+share/apps/krn/toolbar/find.xpm
+share/apps/krn/toolbar/followup.xpm
+share/apps/krn/toolbar/green-bullet.xpm
+share/apps/krn/toolbar/krnfolder.xpm
+share/apps/krn/toolbar/left.xpm
 share/apps/krn/toolbar/locked.xpm
-share/apps/krn/toolbar/catch.xpm
-share/apps/krn/toolbar/thumb_up.xpm
-share/apps/krn/toolbar/attach.xpm
+share/apps/krn/toolbar/logo.xpm
 share/apps/krn/toolbar/mailpost.xpm
-share/apps/krn/toolbar/fileforward.xpm
+share/apps/krn/toolbar/previous.xpm
+share/apps/krn/toolbar/pub_key_red.xpm
+share/apps/krn/toolbar/read.xpm
+share/apps/krn/toolbar/red-bullet.xpm
+share/apps/krn/toolbar/reload.xpm
+share/apps/krn/toolbar/right.xpm
+share/apps/krn/toolbar/save.xpm
 share/apps/krn/toolbar/send.xpm
-share/doc/HTML/en/kmail/index.html
+share/apps/krn/toolbar/subscr.xpm
+share/apps/krn/toolbar/tagged.xpm
+share/apps/krn/toolbar/thumb_up.xpm
 share/doc/HTML/en/kmail/index-1.html
 share/doc/HTML/en/kmail/index-2.html
 share/doc/HTML/en/kmail/index-3.html
@@ -58,39 +70,85 @@ 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/krn/index.html
+share/doc/HTML/en/kmail/index.html
+share/doc/HTML/en/kmail/logotp3.gif
+share/doc/HTML/en/knu/index.html
+share/doc/HTML/en/knu/knu-config.gif
+share/doc/HTML/en/knu/knu-host.gif
+share/doc/HTML/en/knu/knu-ping.gif
+share/doc/HTML/en/knu/knu-traceroute.gif
+share/doc/HTML/en/korn/index.html
 share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
+share/doc/HTML/en/krn/index.html
 share/doc/HTML/en/krn/offline.html
 share/doc/HTML/en/krn/overview.html
-share/applnk/Utilities/KMail.kdelnk
-share/applnk/Utilities/Krn.kdelnk
+share/icons/kmail.xpm
+share/icons/knu.xpm
+share/icons/korn.xpm
 share/icons/krn.xpm
+share/icons/mini/kmail.xpm
+share/icons/mini/krn.xpm
+share/locale/cr/LC_MESSAGES/kmail.mo
+share/locale/cr/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kmail.mo
+share/locale/cs/LC_MESSAGES/knu.mo
+share/locale/cs/LC_MESSAGES/kppp.mo
+share/locale/cs/LC_MESSAGES/krn.mo
 share/locale/de/LC_MESSAGES/kmail.mo
-share/locale/pt/LC_MESSAGES/kmail.mo
-share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/de/LC_MESSAGES/knu.mo
+share/locale/de/LC_MESSAGES/kppp.mo
+share/locale/de/LC_MESSAGES/krn.mo
+share/locale/es/LC_MESSAGES/kmail.mo
+share/locale/es/LC_MESSAGES/knu.mo
+share/locale/es/LC_MESSAGES/kppp.mo
+share/locale/es/LC_MESSAGES/krn.mo
 share/locale/fi/LC_MESSAGES/kmail.mo
-bin/kmail
-bin/krn
+share/locale/fi/LC_MESSAGES/knu.mo
+share/locale/fi/LC_MESSAGES/kppp.mo
+share/locale/fi/LC_MESSAGES/krn.mo
+share/locale/fr/LC_MESSAGES/kmail.mo
+share/locale/fr/LC_MESSAGES/knu.mo
+share/locale/fr/LC_MESSAGES/krn.mo
+share/locale/hu/LC_MESSAGES/kmail.mo
+share/locale/hu/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/kmail.mo
+share/locale/pl/LC_MESSAGES/knu.mo
+share/locale/pl/LC_MESSAGES/kppp.mo
+share/locale/pl/LC_MESSAGES/krn.mo
+share/locale/pt/LC_MESSAGES/kmail.mo
+share/locale/pt/LC_MESSAGES/knu.mo
+share/locale/pt/LC_MESSAGES/kppp.mo
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
-@dirrm share/locale
-@dirrm share/icons
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/cr/LC_MESSAGES
+@dirrm share/locale/cr
 @dirrm share/doc/HTML/en/krn
+@dirrm share/doc/HTML/en/korn
+@dirrm share/doc/HTML/en/knu
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @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
+@dirrm share/applnk/Network
+@dirrm share/applnk/Internet