Upgrade to KDE Release 1.0

12 files changed, 132 insertions, 232 deletions

diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile
index 8529aeacea4f..ece72905a50a 100644
--- a/graphics/kdegraphics11/Makefile
+++ b/graphics/kdegraphics11/Makefile
@@ -3,35 +3,26 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1998/05/09 18:07:17 se Exp $
+# $Id: Makefile,v 1.7 1998/07/13 23:31:49 se Exp $
 #
 
-DISTNAME=	kdegraphics-beta4-1
-PKGNAME=	kdegraphics-4.1b
+DISTNAME=	kdegraphics-1.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source 
-EXTRACT_SUFX=	.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source 
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade to 1.0 will be committed within the next few days
-
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt133
+LIB_DEPENDS=	qt\\.1\\.3[3-9]:${PORTSDIR}/x11/qt133 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.1\\.[0-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\\.9[1-9]:${PORTSDIR}/x11/kdelibs
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
+		khtmlw\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -40,7 +31,6 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-WRKSRC=		${WRKDIR}/kdegraphics
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics11/distinfo b/graphics/kdegraphics11/distinfo
index 4987951f7f0e..3d3fb9199bec 100644
--- a/graphics/kdegraphics11/distinfo
+++ b/graphics/kdegraphics11/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-beta4-1.src.tar.bz2) = 114294dbe3a96c5fdc9f08a247ff2d6c
+MD5 (kdegraphics-1.0.tar.gz) = b11846f8aadce2d21861017e287a0953
diff --git a/graphics/kdegraphics11/pkg-plist b/graphics/kdegraphics11/pkg-plist
index 7c318935eafd..dd6ce62f31d7 100644
--- a/graphics/kdegraphics11/pkg-plist
+++ b/graphics/kdegraphics11/pkg-plist
@@ -15,6 +15,7 @@ share/apps/kdvi/toolbar/largetext.xpm
 share/apps/kdvi/toolbar/smalltext.xpm
 share/apps/kfax/pics/kfax.tif
 share/apps/kfax/pics/kfaxlogo.xpm
+share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/circle.xpm
 share/apps/kpaint/toolbar/editcopy.xpm
 share/apps/kpaint/toolbar/editcut.xpm
@@ -26,6 +27,7 @@ share/apps/kpaint/toolbar/fileopen.xpm
 share/apps/kpaint/toolbar/line.xpm
 share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
+share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
 share/apps/kpaint/toolbar/viewmag+.xpm
 share/apps/kpaint/toolbar/viewmag-.xpm
@@ -76,12 +78,14 @@ share/locale/cs/LC_MESSAGES/kfax.mo
 share/locale/cs/LC_MESSAGES/kghostview.mo
 share/locale/cs/LC_MESSAGES/kpaint.mo
 share/locale/de/LC_MESSAGES/kdvi.mo
+share/locale/de/LC_MESSAGES/kfax.mo
 share/locale/de/LC_MESSAGES/kghostview.mo
 share/locale/de/LC_MESSAGES/kpaint.mo
 share/locale/el/LC_MESSAGES/kdvi.mo
 share/locale/el/LC_MESSAGES/kghostview.mo
 share/locale/el/LC_MESSAGES/kpaint.mo
 share/locale/es/LC_MESSAGES/kdvi.mo
+share/locale/es/LC_MESSAGES/kfax.mo
 share/locale/es/LC_MESSAGES/kghostview.mo
 share/locale/es/LC_MESSAGES/kpaint.mo
 share/locale/fi/LC_MESSAGES/kdvi.mo
@@ -92,6 +96,7 @@ share/locale/fr/LC_MESSAGES/kdvi.mo
 share/locale/fr/LC_MESSAGES/kghostview.mo
 share/locale/fr/LC_MESSAGES/kpaint.mo
 share/locale/hr/LC_MESSAGES/kdvi.mo
+share/locale/hr/LC_MESSAGES/kfax.mo
 share/locale/hr/LC_MESSAGES/kghostview.mo
 share/locale/hr/LC_MESSAGES/kpaint.mo
 share/locale/hu/LC_MESSAGES/kdvi.mo
@@ -100,60 +105,41 @@ share/locale/hu/LC_MESSAGES/kpaint.mo
 share/locale/it/LC_MESSAGES/kdvi.mo
 share/locale/it/LC_MESSAGES/kghostview.mo
 share/locale/it/LC_MESSAGES/kpaint.mo
+share/locale/mk/LC_MESSAGES/kghostview.mo
+share/locale/nl/LC_MESSAGES/kdvi.mo
 share/locale/nl/LC_MESSAGES/kghostview.mo
 share/locale/nl/LC_MESSAGES/kpaint.mo
 share/locale/no/LC_MESSAGES/kdvi.mo
+share/locale/no/LC_MESSAGES/kfax.mo
 share/locale/no/LC_MESSAGES/kghostview.mo
 share/locale/no/LC_MESSAGES/kpaint.mo
 share/locale/pl/LC_MESSAGES/kdvi.mo
+share/locale/pl/LC_MESSAGES/kfax.mo
 share/locale/pl/LC_MESSAGES/kghostview.mo
 share/locale/pl/LC_MESSAGES/kpaint.mo
 share/locale/pt/LC_MESSAGES/kdvi.mo
+share/locale/pt/LC_MESSAGES/kfax.mo
 share/locale/pt/LC_MESSAGES/kghostview.mo
 share/locale/pt/LC_MESSAGES/kpaint.mo
+share/locale/pt_BR/LC_MESSAGES/kdvi.mo
+share/locale/pt_BR/LC_MESSAGES/kfax.mo
+share/locale/pt_BR/LC_MESSAGES/kghostview.mo
+share/locale/pt_BR/LC_MESSAGES/kpaint.mo
 share/locale/ru/LC_MESSAGES/kghostview.mo
 share/locale/ru/LC_MESSAGES/kpaint.mo
 share/locale/sk/LC_MESSAGES/kdvi.mo
+share/locale/sk/LC_MESSAGES/kfax.mo
 share/locale/sk/LC_MESSAGES/kghostview.mo
 share/locale/sk/LC_MESSAGES/kpaint.mo
 share/locale/sv/LC_MESSAGES/kghostview.mo
 share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/zh/LC_MESSAGES/kghostview.mo
-share/locale/zh/LC_MESSAGES/kpaint.mo
-@dirrm share/locale/zh/LC_MESSAGES
-@dirrm share/locale/zh
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@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/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
+share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/fi/kdvi
 @dirrm share/doc/HTML/fi
 @dirrm share/doc/HTML/en/kview
@@ -163,7 +149,6 @@ share/locale/zh/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
 @dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kview/toolbar
 @dirrm share/apps/kview
 @dirrm share/apps/kpaint/toolbar
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 8529aeacea4f..ece72905a50a 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -3,35 +3,26 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1998/05/09 18:07:17 se Exp $
+# $Id: Makefile,v 1.7 1998/07/13 23:31:49 se Exp $
 #
 
-DISTNAME=	kdegraphics-beta4-1
-PKGNAME=	kdegraphics-4.1b
+DISTNAME=	kdegraphics-1.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source 
-EXTRACT_SUFX=	.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source 
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade to 1.0 will be committed within the next few days
-
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt133
+LIB_DEPENDS=	qt\\.1\\.3[3-9]:${PORTSDIR}/x11/qt133 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.1\\.[0-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\\.9[1-9]:${PORTSDIR}/x11/kdelibs
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
+		khtmlw\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -40,7 +31,6 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-WRKSRC=		${WRKDIR}/kdegraphics
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo
index 4987951f7f0e..3d3fb9199bec 100644
--- a/graphics/kdegraphics2/distinfo
+++ b/graphics/kdegraphics2/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-beta4-1.src.tar.bz2) = 114294dbe3a96c5fdc9f08a247ff2d6c
+MD5 (kdegraphics-1.0.tar.gz) = b11846f8aadce2d21861017e287a0953
diff --git a/graphics/kdegraphics2/pkg-plist b/graphics/kdegraphics2/pkg-plist
index 7c318935eafd..dd6ce62f31d7 100644
--- a/graphics/kdegraphics2/pkg-plist
+++ b/graphics/kdegraphics2/pkg-plist
@@ -15,6 +15,7 @@ share/apps/kdvi/toolbar/largetext.xpm
 share/apps/kdvi/toolbar/smalltext.xpm
 share/apps/kfax/pics/kfax.tif
 share/apps/kfax/pics/kfaxlogo.xpm
+share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/circle.xpm
 share/apps/kpaint/toolbar/editcopy.xpm
 share/apps/kpaint/toolbar/editcut.xpm
@@ -26,6 +27,7 @@ share/apps/kpaint/toolbar/fileopen.xpm
 share/apps/kpaint/toolbar/line.xpm
 share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
+share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
 share/apps/kpaint/toolbar/viewmag+.xpm
 share/apps/kpaint/toolbar/viewmag-.xpm
@@ -76,12 +78,14 @@ share/locale/cs/LC_MESSAGES/kfax.mo
 share/locale/cs/LC_MESSAGES/kghostview.mo
 share/locale/cs/LC_MESSAGES/kpaint.mo
 share/locale/de/LC_MESSAGES/kdvi.mo
+share/locale/de/LC_MESSAGES/kfax.mo
 share/locale/de/LC_MESSAGES/kghostview.mo
 share/locale/de/LC_MESSAGES/kpaint.mo
 share/locale/el/LC_MESSAGES/kdvi.mo
 share/locale/el/LC_MESSAGES/kghostview.mo
 share/locale/el/LC_MESSAGES/kpaint.mo
 share/locale/es/LC_MESSAGES/kdvi.mo
+share/locale/es/LC_MESSAGES/kfax.mo
 share/locale/es/LC_MESSAGES/kghostview.mo
 share/locale/es/LC_MESSAGES/kpaint.mo
 share/locale/fi/LC_MESSAGES/kdvi.mo
@@ -92,6 +96,7 @@ share/locale/fr/LC_MESSAGES/kdvi.mo
 share/locale/fr/LC_MESSAGES/kghostview.mo
 share/locale/fr/LC_MESSAGES/kpaint.mo
 share/locale/hr/LC_MESSAGES/kdvi.mo
+share/locale/hr/LC_MESSAGES/kfax.mo
 share/locale/hr/LC_MESSAGES/kghostview.mo
 share/locale/hr/LC_MESSAGES/kpaint.mo
 share/locale/hu/LC_MESSAGES/kdvi.mo
@@ -100,60 +105,41 @@ share/locale/hu/LC_MESSAGES/kpaint.mo
 share/locale/it/LC_MESSAGES/kdvi.mo
 share/locale/it/LC_MESSAGES/kghostview.mo
 share/locale/it/LC_MESSAGES/kpaint.mo
+share/locale/mk/LC_MESSAGES/kghostview.mo
+share/locale/nl/LC_MESSAGES/kdvi.mo
 share/locale/nl/LC_MESSAGES/kghostview.mo
 share/locale/nl/LC_MESSAGES/kpaint.mo
 share/locale/no/LC_MESSAGES/kdvi.mo
+share/locale/no/LC_MESSAGES/kfax.mo
 share/locale/no/LC_MESSAGES/kghostview.mo
 share/locale/no/LC_MESSAGES/kpaint.mo
 share/locale/pl/LC_MESSAGES/kdvi.mo
+share/locale/pl/LC_MESSAGES/kfax.mo
 share/locale/pl/LC_MESSAGES/kghostview.mo
 share/locale/pl/LC_MESSAGES/kpaint.mo
 share/locale/pt/LC_MESSAGES/kdvi.mo
+share/locale/pt/LC_MESSAGES/kfax.mo
 share/locale/pt/LC_MESSAGES/kghostview.mo
 share/locale/pt/LC_MESSAGES/kpaint.mo
+share/locale/pt_BR/LC_MESSAGES/kdvi.mo
+share/locale/pt_BR/LC_MESSAGES/kfax.mo
+share/locale/pt_BR/LC_MESSAGES/kghostview.mo
+share/locale/pt_BR/LC_MESSAGES/kpaint.mo
 share/locale/ru/LC_MESSAGES/kghostview.mo
 share/locale/ru/LC_MESSAGES/kpaint.mo
 share/locale/sk/LC_MESSAGES/kdvi.mo
+share/locale/sk/LC_MESSAGES/kfax.mo
 share/locale/sk/LC_MESSAGES/kghostview.mo
 share/locale/sk/LC_MESSAGES/kpaint.mo
 share/locale/sv/LC_MESSAGES/kghostview.mo
 share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/zh/LC_MESSAGES/kghostview.mo
-share/locale/zh/LC_MESSAGES/kpaint.mo
-@dirrm share/locale/zh/LC_MESSAGES
-@dirrm share/locale/zh
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@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/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
+share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/fi/kdvi
 @dirrm share/doc/HTML/fi
 @dirrm share/doc/HTML/en/kview
@@ -163,7 +149,6 @@ share/locale/zh/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
 @dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kview/toolbar
 @dirrm share/apps/kview
 @dirrm share/apps/kpaint/toolbar
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 8529aeacea4f..ece72905a50a 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -3,35 +3,26 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1998/05/09 18:07:17 se Exp $
+# $Id: Makefile,v 1.7 1998/07/13 23:31:49 se Exp $
 #
 
-DISTNAME=	kdegraphics-beta4-1
-PKGNAME=	kdegraphics-4.1b
+DISTNAME=	kdegraphics-1.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source 
-EXTRACT_SUFX=	.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source 
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade to 1.0 will be committed within the next few days
-
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt133
+LIB_DEPENDS=	qt\\.1\\.3[3-9]:${PORTSDIR}/x11/qt133 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.1\\.[0-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\\.9[1-9]:${PORTSDIR}/x11/kdelibs
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
+		khtmlw\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -40,7 +31,6 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-WRKSRC=		${WRKDIR}/kdegraphics
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 4987951f7f0e..3d3fb9199bec 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-beta4-1.src.tar.bz2) = 114294dbe3a96c5fdc9f08a247ff2d6c
+MD5 (kdegraphics-1.0.tar.gz) = b11846f8aadce2d21861017e287a0953
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 7c318935eafd..dd6ce62f31d7 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -15,6 +15,7 @@ share/apps/kdvi/toolbar/largetext.xpm
 share/apps/kdvi/toolbar/smalltext.xpm
 share/apps/kfax/pics/kfax.tif
 share/apps/kfax/pics/kfaxlogo.xpm
+share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/circle.xpm
 share/apps/kpaint/toolbar/editcopy.xpm
 share/apps/kpaint/toolbar/editcut.xpm
@@ -26,6 +27,7 @@ share/apps/kpaint/toolbar/fileopen.xpm
 share/apps/kpaint/toolbar/line.xpm
 share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
+share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
 share/apps/kpaint/toolbar/viewmag+.xpm
 share/apps/kpaint/toolbar/viewmag-.xpm
@@ -76,12 +78,14 @@ share/locale/cs/LC_MESSAGES/kfax.mo
 share/locale/cs/LC_MESSAGES/kghostview.mo
 share/locale/cs/LC_MESSAGES/kpaint.mo
 share/locale/de/LC_MESSAGES/kdvi.mo
+share/locale/de/LC_MESSAGES/kfax.mo
 share/locale/de/LC_MESSAGES/kghostview.mo
 share/locale/de/LC_MESSAGES/kpaint.mo
 share/locale/el/LC_MESSAGES/kdvi.mo
 share/locale/el/LC_MESSAGES/kghostview.mo
 share/locale/el/LC_MESSAGES/kpaint.mo
 share/locale/es/LC_MESSAGES/kdvi.mo
+share/locale/es/LC_MESSAGES/kfax.mo
 share/locale/es/LC_MESSAGES/kghostview.mo
 share/locale/es/LC_MESSAGES/kpaint.mo
 share/locale/fi/LC_MESSAGES/kdvi.mo
@@ -92,6 +96,7 @@ share/locale/fr/LC_MESSAGES/kdvi.mo
 share/locale/fr/LC_MESSAGES/kghostview.mo
 share/locale/fr/LC_MESSAGES/kpaint.mo
 share/locale/hr/LC_MESSAGES/kdvi.mo
+share/locale/hr/LC_MESSAGES/kfax.mo
 share/locale/hr/LC_MESSAGES/kghostview.mo
 share/locale/hr/LC_MESSAGES/kpaint.mo
 share/locale/hu/LC_MESSAGES/kdvi.mo
@@ -100,60 +105,41 @@ share/locale/hu/LC_MESSAGES/kpaint.mo
 share/locale/it/LC_MESSAGES/kdvi.mo
 share/locale/it/LC_MESSAGES/kghostview.mo
 share/locale/it/LC_MESSAGES/kpaint.mo
+share/locale/mk/LC_MESSAGES/kghostview.mo
+share/locale/nl/LC_MESSAGES/kdvi.mo
 share/locale/nl/LC_MESSAGES/kghostview.mo
 share/locale/nl/LC_MESSAGES/kpaint.mo
 share/locale/no/LC_MESSAGES/kdvi.mo
+share/locale/no/LC_MESSAGES/kfax.mo
 share/locale/no/LC_MESSAGES/kghostview.mo
 share/locale/no/LC_MESSAGES/kpaint.mo
 share/locale/pl/LC_MESSAGES/kdvi.mo
+share/locale/pl/LC_MESSAGES/kfax.mo
 share/locale/pl/LC_MESSAGES/kghostview.mo
 share/locale/pl/LC_MESSAGES/kpaint.mo
 share/locale/pt/LC_MESSAGES/kdvi.mo
+share/locale/pt/LC_MESSAGES/kfax.mo
 share/locale/pt/LC_MESSAGES/kghostview.mo
 share/locale/pt/LC_MESSAGES/kpaint.mo
+share/locale/pt_BR/LC_MESSAGES/kdvi.mo
+share/locale/pt_BR/LC_MESSAGES/kfax.mo
+share/locale/pt_BR/LC_MESSAGES/kghostview.mo
+share/locale/pt_BR/LC_MESSAGES/kpaint.mo
 share/locale/ru/LC_MESSAGES/kghostview.mo
 share/locale/ru/LC_MESSAGES/kpaint.mo
 share/locale/sk/LC_MESSAGES/kdvi.mo
+share/locale/sk/LC_MESSAGES/kfax.mo
 share/locale/sk/LC_MESSAGES/kghostview.mo
 share/locale/sk/LC_MESSAGES/kpaint.mo
 share/locale/sv/LC_MESSAGES/kghostview.mo
 share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/zh/LC_MESSAGES/kghostview.mo
-share/locale/zh/LC_MESSAGES/kpaint.mo
-@dirrm share/locale/zh/LC_MESSAGES
-@dirrm share/locale/zh
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@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/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
+share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/fi/kdvi
 @dirrm share/doc/HTML/fi
 @dirrm share/doc/HTML/en/kview
@@ -163,7 +149,6 @@ share/locale/zh/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
 @dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kview/toolbar
 @dirrm share/apps/kview
 @dirrm share/apps/kpaint/toolbar
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 8529aeacea4f..ece72905a50a 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -3,35 +3,26 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1998/05/09 18:07:17 se Exp $
+# $Id: Makefile,v 1.7 1998/07/13 23:31:49 se Exp $
 #
 
-DISTNAME=	kdegraphics-beta4-1
-PKGNAME=	kdegraphics-4.1b
+DISTNAME=	kdegraphics-1.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source 
-EXTRACT_SUFX=	.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source 
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade to 1.0 will be committed within the next few days
-
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt133
+LIB_DEPENDS=	qt\\.1\\.3[3-9]:${PORTSDIR}/x11/qt133 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.1\\.[0-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\\.9[1-9]:${PORTSDIR}/x11/kdelibs
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
+		khtmlw\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -40,7 +31,6 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-WRKSRC=		${WRKDIR}/kdegraphics
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 4987951f7f0e..3d3fb9199bec 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-beta4-1.src.tar.bz2) = 114294dbe3a96c5fdc9f08a247ff2d6c
+MD5 (kdegraphics-1.0.tar.gz) = b11846f8aadce2d21861017e287a0953
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 7c318935eafd..dd6ce62f31d7 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -15,6 +15,7 @@ share/apps/kdvi/toolbar/largetext.xpm
 share/apps/kdvi/toolbar/smalltext.xpm
 share/apps/kfax/pics/kfax.tif
 share/apps/kfax/pics/kfaxlogo.xpm
+share/apps/kpaint/toolbar/areaselect.xpm
 share/apps/kpaint/toolbar/circle.xpm
 share/apps/kpaint/toolbar/editcopy.xpm
 share/apps/kpaint/toolbar/editcut.xpm
@@ -26,6 +27,7 @@ share/apps/kpaint/toolbar/fileopen.xpm
 share/apps/kpaint/toolbar/line.xpm
 share/apps/kpaint/toolbar/pen.xpm
 share/apps/kpaint/toolbar/rectangle.xpm
+share/apps/kpaint/toolbar/roundangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
 share/apps/kpaint/toolbar/viewmag+.xpm
 share/apps/kpaint/toolbar/viewmag-.xpm
@@ -76,12 +78,14 @@ share/locale/cs/LC_MESSAGES/kfax.mo
 share/locale/cs/LC_MESSAGES/kghostview.mo
 share/locale/cs/LC_MESSAGES/kpaint.mo
 share/locale/de/LC_MESSAGES/kdvi.mo
+share/locale/de/LC_MESSAGES/kfax.mo
 share/locale/de/LC_MESSAGES/kghostview.mo
 share/locale/de/LC_MESSAGES/kpaint.mo
 share/locale/el/LC_MESSAGES/kdvi.mo
 share/locale/el/LC_MESSAGES/kghostview.mo
 share/locale/el/LC_MESSAGES/kpaint.mo
 share/locale/es/LC_MESSAGES/kdvi.mo
+share/locale/es/LC_MESSAGES/kfax.mo
 share/locale/es/LC_MESSAGES/kghostview.mo
 share/locale/es/LC_MESSAGES/kpaint.mo
 share/locale/fi/LC_MESSAGES/kdvi.mo
@@ -92,6 +96,7 @@ share/locale/fr/LC_MESSAGES/kdvi.mo
 share/locale/fr/LC_MESSAGES/kghostview.mo
 share/locale/fr/LC_MESSAGES/kpaint.mo
 share/locale/hr/LC_MESSAGES/kdvi.mo
+share/locale/hr/LC_MESSAGES/kfax.mo
 share/locale/hr/LC_MESSAGES/kghostview.mo
 share/locale/hr/LC_MESSAGES/kpaint.mo
 share/locale/hu/LC_MESSAGES/kdvi.mo
@@ -100,60 +105,41 @@ share/locale/hu/LC_MESSAGES/kpaint.mo
 share/locale/it/LC_MESSAGES/kdvi.mo
 share/locale/it/LC_MESSAGES/kghostview.mo
 share/locale/it/LC_MESSAGES/kpaint.mo
+share/locale/mk/LC_MESSAGES/kghostview.mo
+share/locale/nl/LC_MESSAGES/kdvi.mo
 share/locale/nl/LC_MESSAGES/kghostview.mo
 share/locale/nl/LC_MESSAGES/kpaint.mo
 share/locale/no/LC_MESSAGES/kdvi.mo
+share/locale/no/LC_MESSAGES/kfax.mo
 share/locale/no/LC_MESSAGES/kghostview.mo
 share/locale/no/LC_MESSAGES/kpaint.mo
 share/locale/pl/LC_MESSAGES/kdvi.mo
+share/locale/pl/LC_MESSAGES/kfax.mo
 share/locale/pl/LC_MESSAGES/kghostview.mo
 share/locale/pl/LC_MESSAGES/kpaint.mo
 share/locale/pt/LC_MESSAGES/kdvi.mo
+share/locale/pt/LC_MESSAGES/kfax.mo
 share/locale/pt/LC_MESSAGES/kghostview.mo
 share/locale/pt/LC_MESSAGES/kpaint.mo
+share/locale/pt_BR/LC_MESSAGES/kdvi.mo
+share/locale/pt_BR/LC_MESSAGES/kfax.mo
+share/locale/pt_BR/LC_MESSAGES/kghostview.mo
+share/locale/pt_BR/LC_MESSAGES/kpaint.mo
 share/locale/ru/LC_MESSAGES/kghostview.mo
 share/locale/ru/LC_MESSAGES/kpaint.mo
 share/locale/sk/LC_MESSAGES/kdvi.mo
+share/locale/sk/LC_MESSAGES/kfax.mo
 share/locale/sk/LC_MESSAGES/kghostview.mo
 share/locale/sk/LC_MESSAGES/kpaint.mo
 share/locale/sv/LC_MESSAGES/kghostview.mo
 share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/zh/LC_MESSAGES/kghostview.mo
-share/locale/zh/LC_MESSAGES/kpaint.mo
-@dirrm share/locale/zh/LC_MESSAGES
-@dirrm share/locale/zh
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@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/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
+share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/fi/kdvi
 @dirrm share/doc/HTML/fi
 @dirrm share/doc/HTML/en/kview
@@ -163,7 +149,6 @@ share/locale/zh/LC_MESSAGES/kpaint.mo
 @dirrm share/doc/HTML/en/kfax
 @dirrm share/doc/HTML/en/kdvi
 @dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kview/toolbar
 @dirrm share/apps/kview
 @dirrm share/apps/kpaint/toolbar