Upgrade to Beta-4.1

3 files changed, 51 insertions, 23 deletions

diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index c96f4d185632..d50829c1a72a 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -3,29 +3,33 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.4 1998/04/29 17:52:12 asami Exp $
+# $Id: Makefile,v 1.5 1998/05/04 20:22:54 jseger Exp $
 #
 
-DISTNAME=	kdegraphics-Beta3-1
-PKGNAME=	kdegraphics-3.1b
+DISTNAME=	kdegraphics-beta4-1
+PKGNAME=	kdegraphics-4.1b
 CATEGORIES=	graphics kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta3/distribution/tgz/source 
-EXTRACT_SUFX=	.src.tar.gz
+MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source 
+EXTRACT_SUFX=	.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
+BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
+		moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[1-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
+		mediatool\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs
 
-BROKEN=		upgrade
+EXTRACT_CMD=	bzip2
+EXTRACT_BEFORE_ARGS= -cd
+EXTRACT_AFTER_ARGS= | tar -xf -
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index d1a8294ca5bb..4987951f7f0e 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-Beta3-1.src.tar.gz) = 856e1fa89aa9708c67c8ee05508748ad
+MD5 (kdegraphics-beta4-1.src.tar.bz2) = 114294dbe3a96c5fdc9f08a247ff2d6c
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 2772fe20cb32..7c318935eafd 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -4,24 +4,15 @@ bin/kfract
 bin/kghostview
 bin/kpaint
 bin/kview
-share/applnk/Graphics/Fractal.kdelnk
 share/applnk/Graphics/KFax.kdelnk
-share/applnk/Graphics/Kdvi.kdelnk
-share/applnk/Graphics/Paint.kdelnk
+share/applnk/Graphics/kdvi.kdelnk
+share/applnk/Graphics/kfract.kdelnk
 share/applnk/Graphics/kghostview.kdelnk
-share/applnk/Utilities/KView.kdelnk
-share/apps/kdvi/toolbar/back.xpm
-share/apps/kdvi/toolbar/fileopen.xpm
-share/apps/kdvi/toolbar/fileprint.xpm
-share/apps/kdvi/toolbar/finish.xpm
-share/apps/kdvi/toolbar/forward.xpm
+share/applnk/Graphics/kpaint.kdelnk
+share/applnk/Graphics/kview.kdelnk
 share/apps/kdvi/toolbar/forwpage.xpm
 share/apps/kdvi/toolbar/largetext.xpm
-share/apps/kdvi/toolbar/reload.xpm
 share/apps/kdvi/toolbar/smalltext.xpm
-share/apps/kdvi/toolbar/start.xpm
-share/apps/kdvi/toolbar/viewmag+.xpm
-share/apps/kdvi/toolbar/viewmag-.xpm
 share/apps/kfax/pics/kfax.tif
 share/apps/kfax/pics/kfaxlogo.xpm
 share/apps/kpaint/toolbar/circle.xpm
@@ -38,6 +29,9 @@ share/apps/kpaint/toolbar/rectangle.xpm
 share/apps/kpaint/toolbar/spraycan.xpm
 share/apps/kpaint/toolbar/viewmag+.xpm
 share/apps/kpaint/toolbar/viewmag-.xpm
+share/apps/kview/toolbar/diashow.xpm
+share/apps/kview/toolbar/random.xpm
+share/apps/kview/toolbar/resize.xpm
 share/doc/HTML/en/kdvi/index.html
 share/doc/HTML/en/kfax/index-1.html
 share/doc/HTML/en/kfax/index-2.html
@@ -56,6 +50,7 @@ share/doc/HTML/en/kghostview/index-4.html
 share/doc/HTML/en/kghostview/index-5.html
 share/doc/HTML/en/kghostview/index-6.html
 share/doc/HTML/en/kghostview/index.html
+share/doc/HTML/en/kghostview/logotp3.gif
 share/doc/HTML/en/kpaint/Technic.gif
 share/doc/HTML/en/kpaint/index.html
 share/doc/HTML/en/kpaint/kpaint.html
@@ -69,32 +64,47 @@ share/icons/kfax.xpm
 share/icons/kfract.xpm
 share/icons/kghostview.xpm
 share/icons/kpaint.xpm
+share/icons/kview.xpm
 share/icons/mini/kdvi.xpm
 share/icons/mini/kfax.xpm
+share/icons/mini/kfract.xpm
 share/icons/mini/kghostview.xpm
 share/icons/mini/kpaint.xpm
+share/icons/mini/kview.xpm
 share/locale/cs/LC_MESSAGES/kdvi.mo
+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/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/kghostview.mo
 share/locale/es/LC_MESSAGES/kpaint.mo
 share/locale/fi/LC_MESSAGES/kdvi.mo
+share/locale/fi/LC_MESSAGES/kfax.mo
 share/locale/fi/LC_MESSAGES/kghostview.mo
 share/locale/fi/LC_MESSAGES/kpaint.mo
 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/kghostview.mo
 share/locale/hr/LC_MESSAGES/kpaint.mo
+share/locale/hu/LC_MESSAGES/kdvi.mo
+share/locale/hu/LC_MESSAGES/kghostview.mo
 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/nl/LC_MESSAGES/kghostview.mo
 share/locale/nl/LC_MESSAGES/kpaint.mo
+share/locale/no/LC_MESSAGES/kdvi.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/kghostview.mo
 share/locale/pl/LC_MESSAGES/kpaint.mo
@@ -103,16 +113,27 @@ share/locale/pt/LC_MESSAGES/kghostview.mo
 share/locale/pt/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/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
@@ -127,6 +148,8 @@ share/locale/sv/LC_MESSAGES/kpaint.mo
 @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
@@ -141,11 +164,12 @@ share/locale/sv/LC_MESSAGES/kpaint.mo
 @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
 @dirrm share/apps/kpaint
 @dirrm share/apps/kfax/pics
 @dirrm share/apps/kfax
 @dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
-@dirrm share/applnk/Utilities
 @dirrm share/applnk/Graphics