4 files changed, 24 insertions, 49 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 1444276572b3..b80d46ad87a6 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index f0631e87a0be..047845bff070 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdesdk-3.2.0.tar.bz2) = 170baf93150c231605bec047d49d0742
+MD5 (KDE/kdesdk-3.2.1.tar.bz2) = f52a69718705b32f0068fb605b604b45
+SIZE (KDE/kdesdk-3.2.1.tar.bz2) = 3970806
diff --git a/devel/kdesdk4/files/patch-cervisia-Makefile.in b/devel/kdesdk4/files/patch-cervisia-Makefile.in
index bed8323e0023..0a591c1d00b6 100644
--- a/devel/kdesdk4/files/patch-cervisia-Makefile.in
+++ b/devel/kdesdk4/files/patch-cervisia-Makefile.in
@@ -1,5 +1,5 @@
---- cervisia/Makefile.in.orig	Sat Feb  7 10:55:48 2004
-+++ cervisia/Makefile.in	Sat Feb  7 10:57:08 2004
+--- cervisia/Makefile.in.orig	Sun Feb 29 22:52:03 2004
++++ cervisia/Makefile.in	Wed Mar  3 00:16:46 2004
 @@ -351,13 +351,10 @@
  cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la
@@ -14,7 +14,7 @@
  
  xdg_apps_DATA = cervisia.desktop
  
-@@ -1185,14 +1182,6 @@
+@@ -1209,14 +1206,6 @@
  srcdoc:
  	$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts
  
@@ -29,12 +29,12 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -1398,7 +1387,7 @@
- 	-rm -f  checkoutdlg.moc tagdlg.moc logdlg.moc updatedlg.moc loglist.moc historydlg.moc cvsprogressdlg.moc updateview.moc mergedlg.moc settingsdlg.moc logtree.moc resolvedlg.moc tiplabel.moc annotateview.moc qttableview.moc cervisiapart.moc diffdlg.moc repositorydlg.moc cervisiashell.moc logplainview.moc addrepositorydlg.moc protocolview.moc progressdlg.moc diffview.moc commitdlg.moc
+@@ -1422,7 +1411,7 @@
+ 	-rm -f  cvsprogressdlg.moc updatedlg.moc cervisiashell.moc updateview.moc protocolview.moc annotateview.moc historydlg.moc tagdlg.moc diffview.moc qttableview.moc commitdlg.moc cervisiapart.moc mergedlg.moc loglist.moc settingsdlg.moc tiplabel.moc logtree.moc logplainview.moc checkoutdlg.moc repositorydlg.moc progressdlg.moc resolvedlg.moc addrepositorydlg.moc logdlg.moc diffdlg.moc
  
  #>+ 2
--KDE_DIST=LICENSE.QPL annotatectl.h diffdlg.h changelogdlg.h annotateview.h protocolview.h cervisiashellui.rc updateview_items.h move_repositories.pl tiplabel.h qttableview.h version.h logdlg.h misc.h updatedlg.h loginfo.h cervisiapart.h overview.h watchersdlg.h watchdlg.h cvsprogressdlg.h checkoutdlg.h repositorydlg.h resolvedlg.h cr32-app-cervisia.png globalconfig.h loglist.h cervisiashell.h change_colors.pl progressdlg.h cr16-app-cervisia.png logtree.h cr48-app-cervisia.png cr22-app-cervisia.png entry.h addremovedlg.h cervisiaui.rc settingsdlg.h tagdlg.h mergedlg.h historydlg.h annotatedlg.h updateview_visitors.h cervisia.upd HACKING cervisia.pod diffview.h cvsdir.h repositories.h stringmatcher.h configutils.h commitdlg.h logplainview.h cervisia.1.in updateview.h cervisia.lsm addrepositorydlg.h 
-+KDE_DIST=LICENSE.QPL annotatectl.h diffdlg.h changelogdlg.h annotateview.h protocolview.h cervisiashellui.rc updateview_items.h move_repositories.pl tiplabel.h qttableview.h version.h logdlg.h misc.h updatedlg.h loginfo.h cervisiapart.h overview.h watchersdlg.h watchdlg.h cvsprogressdlg.h checkoutdlg.h repositorydlg.h resolvedlg.h cr32-app-cervisia.png globalconfig.h loglist.h cervisiashell.h change_colors.pl progressdlg.h cr16-app-cervisia.png logtree.h cr48-app-cervisia.png cr22-app-cervisia.png entry.h addremovedlg.h cervisiaui.rc settingsdlg.h tagdlg.h mergedlg.h historydlg.h annotatedlg.h updateview_visitors.h cervisia.upd HACKING cervisia.pod diffview.h cvsdir.h repositories.h stringmatcher.h configutils.h commitdlg.h logplainview.h updateview.h cervisia.lsm addrepositorydlg.h 
+-KDE_DIST=stringmatcher.h HACKING logtree.h misc.h cervisia.1.in updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm 
++KDE_DIST=stringmatcher.h HACKING logtree.h misc.h updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm 
  
  #>+ 5
  clean-idl:
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 9a900ea84719..66de7c788916 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -644,25 +644,39 @@ share/doc/HTML/en/umbrello/pics/use-case-diagram.png
 share/doc/HTML/en/umbrello/uml_basics.docbook
 share/doc/HTML/en/umbrello/working_with_umbrello.docbook
 share/icons/crystalsvg/128x128/apps/kompare.png
+share/icons/crystalsvg/128x128/apps/umbrello.png
+share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
 share/icons/crystalsvg/16x16/apps/catalogmanager.png
 share/icons/crystalsvg/16x16/apps/cervisia.png
 share/icons/crystalsvg/16x16/apps/kbabel.png
 share/icons/crystalsvg/16x16/apps/kbabeldict.png
 share/icons/crystalsvg/16x16/apps/kbugbuster.png
 share/icons/crystalsvg/16x16/apps/kompare.png
+share/icons/crystalsvg/16x16/apps/umbrello.png
+share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
 share/icons/crystalsvg/22x22/apps/cervisia.png
+share/icons/crystalsvg/22x22/apps/umbrello.png
+share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
 share/icons/crystalsvg/32x32/apps/catalogmanager.png
 share/icons/crystalsvg/32x32/apps/cervisia.png
 share/icons/crystalsvg/32x32/apps/kbabel.png
 share/icons/crystalsvg/32x32/apps/kbabeldict.png
 share/icons/crystalsvg/32x32/apps/kbugbuster.png
 share/icons/crystalsvg/32x32/apps/kompare.png
+share/icons/crystalsvg/32x32/apps/umbrello.png
+share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
 share/icons/crystalsvg/48x48/apps/catalogmanager.png
 share/icons/crystalsvg/48x48/apps/cervisia.png
 share/icons/crystalsvg/48x48/apps/kbabel.png
 share/icons/crystalsvg/48x48/apps/kbabeldict.png
 share/icons/crystalsvg/48x48/apps/kbugbuster.png
 share/icons/crystalsvg/48x48/apps/kompare.png
+share/icons/crystalsvg/48x48/apps/umbrello.png
+share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
+share/icons/crystalsvg/64x64/apps/umbrello.png
+share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
+share/icons/crystalsvg/scalable/apps/umbrello.svgz
+share/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
 share/icons/hicolor/16x16/apps/kuiviewer.png
 share/icons/hicolor/16x16/apps/umbrello.png
 share/icons/hicolor/16x16/mimetypes/umbrellofile.png
@@ -728,38 +742,12 @@ share/servicetypes/kbabeldict_module.desktop
 share/servicetypes/kbabelfilter.desktop
 share/servicetypes/komparenavigationpart.desktop
 share/servicetypes/kompareviewpart.desktop
-@dirrm share/servicetypes
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
 @dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/16x16/mimetypes
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
 @dirrm share/doc/HTML/en/umbrello/pics
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/kompare
@@ -767,15 +755,11 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/doc/HTML/en/kbugbuster
 @dirrm share/doc/HTML/en/kbabel
 @dirrm share/doc/HTML/en/cervisia
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/umbrello/pics
 @dirrm share/apps/umbrello/headings
 @dirrm share/apps/umbrello
 @dirrm share/apps/kuiviewerpart
 @dirrm share/apps/kuiviewer
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle
 @dirrm share/apps/komparepart
 @dirrm share/apps/kompare/icons/locolor/32x32/apps
 @dirrm share/apps/kompare/icons/locolor/32x32
@@ -793,7 +777,6 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/apps/kompare/icons/crystalsvg
 @dirrm share/apps/kompare/icons
 @dirrm share/apps/kompare
-@dirrm share/apps/kconf_update
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32
 @dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions
@@ -835,15 +818,7 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/apps/kapptemplate/appframework
 @dirrm share/apps/kapptemplate/admin
 @dirrm share/apps/kapptemplate
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
 @dirrm share/apps/cervisiapart
 @dirrm share/apps/cervisia
 @dirrm share/apps/catalogmanager
-@dirrm share/apps
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
 @dirrm include/kbabel