Update to KDE 3.5.5 / KOffice 1.6.1

Approved by:	portmgr

6 files changed, 52 insertions, 16 deletions

diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 438c8d9..4532be6 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -33,13 +32,13 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/xscreensaver)
+.if exists(${X11BASE}/bin/xscreensaver)
 WITH_XS=	yes
-.endif # exists(${LOCALBASE}/bin/xscreensaver)
+.endif # exists(${X11BASE}/bin/xscreensaver)
 
-.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
 WITH_XSGNOME=	yes
-.endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet)
+.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
 
 .if defined(WITH_XS) && !defined(WITH_XSGNOME)
 RUN_DEPENDS+=	kxsconfig:${PORTSDIR}/x11/xscreensaver-kde
diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo
index 02d4059..b32d6fb 100644
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeartwork-3.5.4.tar.bz2) = c7ff9048b9b68c976de08ed418598e40
-SHA256 (KDE/kdeartwork-3.5.4.tar.bz2) = b4c9347fc515d9ff9d15465a8c5d2c8535181d7e47d2b5713010517bffba826d
-SIZE (KDE/kdeartwork-3.5.4.tar.bz2) = 16575390
+MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c
+SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1
+SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027
diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist
index e881e55..6d17b87 100644
--- a/x11-themes/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork3/pkg-plist
@@ -2219,6 +2219,7 @@ share/icons/kdeclassic/16x16/actions/series.png
 share/icons/kdeclassic/16x16/actions/servicenew_kdevelop.png
 share/icons/kdeclassic/16x16/actions/share.png
 share/icons/kdeclassic/16x16/actions/shear.png
+share/icons/kdeclassic/16x16/actions/show_side_panel.png
 share/icons/kdeclassic/16x16/actions/show_table_column.png
 share/icons/kdeclassic/16x16/actions/show_table_row.png
 share/icons/kdeclassic/16x16/actions/signature.png
@@ -2246,6 +2247,7 @@ share/icons/kdeclassic/16x16/actions/tab_left.png
 share/icons/kdeclassic/16x16/actions/tab_new.png
 share/icons/kdeclassic/16x16/actions/tab_new_bg.png
 share/icons/kdeclassic/16x16/actions/tab_remove.png
+share/icons/kdeclassic/16x16/actions/tab_remove_other.png
 share/icons/kdeclassic/16x16/actions/tab_right.png
 share/icons/kdeclassic/16x16/actions/targetnew_kdevelop.png
 share/icons/kdeclassic/16x16/actions/tcenteralign.png
@@ -2287,6 +2289,9 @@ share/icons/kdeclassic/16x16/actions/vertical_text.png
 share/icons/kdeclassic/16x16/actions/view_bottom.png
 share/icons/kdeclassic/16x16/actions/view_choose.png
 share/icons/kdeclassic/16x16/actions/view_detailed.png
+share/icons/kdeclassic/16x16/actions/view_fit_height.png
+share/icons/kdeclassic/16x16/actions/view_fit_width.png
+share/icons/kdeclassic/16x16/actions/view_fit_window.png
 share/icons/kdeclassic/16x16/actions/view_icon.png
 share/icons/kdeclassic/16x16/actions/view_left_right.png
 share/icons/kdeclassic/16x16/actions/view_multicolumn.png
@@ -2576,6 +2581,7 @@ share/icons/kdeclassic/16x16/apps/panel_settings.png
 share/icons/kdeclassic/16x16/apps/password.png
 share/icons/kdeclassic/16x16/apps/penguin.png
 share/icons/kdeclassic/16x16/apps/personal.png
+share/icons/kdeclassic/16x16/apps/photobook.png
 share/icons/kdeclassic/16x16/apps/plan.png
 share/icons/kdeclassic/16x16/apps/printmgr.png
 share/icons/kdeclassic/16x16/apps/proxy.png
@@ -3344,6 +3350,7 @@ share/icons/kdeclassic/22x22/actions/shadowR.png
 share/icons/kdeclassic/22x22/actions/shadowRB.png
 share/icons/kdeclassic/22x22/actions/shadowRU.png
 share/icons/kdeclassic/22x22/actions/shadowU.png
+share/icons/kdeclassic/22x22/actions/show_side_panel.png
 share/icons/kdeclassic/22x22/actions/show_table_column.png
 share/icons/kdeclassic/22x22/actions/show_table_row.png
 share/icons/kdeclassic/22x22/actions/showmenu.png
@@ -3371,6 +3378,7 @@ share/icons/kdeclassic/22x22/actions/tab_duplicate.png
 share/icons/kdeclassic/22x22/actions/tab_new.png
 share/icons/kdeclassic/22x22/actions/tab_new_bg.png
 share/icons/kdeclassic/22x22/actions/tab_remove.png
+share/icons/kdeclassic/22x22/actions/tab_remove_other.png
 share/icons/kdeclassic/22x22/actions/text.png
 share/icons/kdeclassic/22x22/actions/text_block.png
 share/icons/kdeclassic/22x22/actions/text_bold.png
@@ -3424,6 +3432,9 @@ share/icons/kdeclassic/22x22/actions/vertical_text.png
 share/icons/kdeclassic/22x22/actions/view_bottom.png
 share/icons/kdeclassic/22x22/actions/view_choose.png
 share/icons/kdeclassic/22x22/actions/view_detailed.png
+share/icons/kdeclassic/22x22/actions/view_fit_height.png
+share/icons/kdeclassic/22x22/actions/view_fit_width.png
+share/icons/kdeclassic/22x22/actions/view_fit_window.png
 share/icons/kdeclassic/22x22/actions/view_icon.png
 share/icons/kdeclassic/22x22/actions/view_left_right.png
 share/icons/kdeclassic/22x22/actions/view_multicolumn.png
@@ -3452,7 +3463,9 @@ share/icons/kdeclassic/22x22/apps/kivio.png
 share/icons/kdeclassic/22x22/apps/konqsidebar_mediaplayer.png
 share/icons/kdeclassic/22x22/apps/kpilot.png
 share/icons/kdeclassic/22x22/apps/kugar.png
+share/icons/kdeclassic/22x22/apps/kview.png
 share/icons/kdeclassic/22x22/apps/noatun.png
+share/icons/kdeclassic/22x22/apps/photobook.png
 share/icons/kdeclassic/22x22/mimetypes/empty.png
 share/icons/kdeclassic/22x22/mimetypes/karbon_karbon.png
 share/icons/kdeclassic/22x22/mimetypes/kchart_chrt.png
@@ -3674,6 +3687,7 @@ share/icons/kdeclassic/32x32/actions/rsub.png
 share/icons/kdeclassic/32x32/actions/rsup.png
 share/icons/kdeclassic/32x32/actions/run.png
 share/icons/kdeclassic/32x32/actions/share.png
+share/icons/kdeclassic/32x32/actions/show_side_panel.png
 share/icons/kdeclassic/32x32/actions/signature.png
 share/icons/kdeclassic/32x32/actions/sort_az.png
 share/icons/kdeclassic/32x32/actions/spellcheck.png
@@ -3689,6 +3703,7 @@ share/icons/kdeclassic/32x32/actions/tab_duplicate.png
 share/icons/kdeclassic/32x32/actions/tab_new.png
 share/icons/kdeclassic/32x32/actions/tab_new_bg.png
 share/icons/kdeclassic/32x32/actions/tab_remove.png
+share/icons/kdeclassic/32x32/actions/tab_remove_other.png
 share/icons/kdeclassic/32x32/actions/text_block.png
 share/icons/kdeclassic/32x32/actions/text_bold.png
 share/icons/kdeclassic/32x32/actions/text_center.png
@@ -3708,6 +3723,9 @@ share/icons/kdeclassic/32x32/actions/up.png
 share/icons/kdeclassic/32x32/actions/view_bottom.png
 share/icons/kdeclassic/32x32/actions/view_choose.png
 share/icons/kdeclassic/32x32/actions/view_detailed.png
+share/icons/kdeclassic/32x32/actions/view_fit_height.png
+share/icons/kdeclassic/32x32/actions/view_fit_width.png
+share/icons/kdeclassic/32x32/actions/view_fit_window.png
 share/icons/kdeclassic/32x32/actions/view_icon.png
 share/icons/kdeclassic/32x32/actions/view_left_right.png
 share/icons/kdeclassic/32x32/actions/view_multicolumn.png
@@ -3972,6 +3990,7 @@ share/icons/kdeclassic/32x32/apps/package_wordprocessing.png
 share/icons/kdeclassic/32x32/apps/password.png
 share/icons/kdeclassic/32x32/apps/penguin.png
 share/icons/kdeclassic/32x32/apps/personal.png
+share/icons/kdeclassic/32x32/apps/photobook.png
 share/icons/kdeclassic/32x32/apps/plan.png
 share/icons/kdeclassic/32x32/apps/printmgr.png
 share/icons/kdeclassic/32x32/apps/proxy.png
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 438c8d9..4532be6 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -33,13 +32,13 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/xscreensaver)
+.if exists(${X11BASE}/bin/xscreensaver)
 WITH_XS=	yes
-.endif # exists(${LOCALBASE}/bin/xscreensaver)
+.endif # exists(${X11BASE}/bin/xscreensaver)
 
-.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
 WITH_XSGNOME=	yes
-.endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet)
+.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
 
 .if defined(WITH_XS) && !defined(WITH_XSGNOME)
 RUN_DEPENDS+=	kxsconfig:${PORTSDIR}/x11/xscreensaver-kde
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index 02d4059..b32d6fb 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeartwork-3.5.4.tar.bz2) = c7ff9048b9b68c976de08ed418598e40
-SHA256 (KDE/kdeartwork-3.5.4.tar.bz2) = b4c9347fc515d9ff9d15465a8c5d2c8535181d7e47d2b5713010517bffba826d
-SIZE (KDE/kdeartwork-3.5.4.tar.bz2) = 16575390
+MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c
+SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1
+SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist
index e881e55..6d17b87 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-themes/kdeartwork4/pkg-plist
@@ -2219,6 +2219,7 @@ share/icons/kdeclassic/16x16/actions/series.png
 share/icons/kdeclassic/16x16/actions/servicenew_kdevelop.png
 share/icons/kdeclassic/16x16/actions/share.png
 share/icons/kdeclassic/16x16/actions/shear.png
+share/icons/kdeclassic/16x16/actions/show_side_panel.png
 share/icons/kdeclassic/16x16/actions/show_table_column.png
 share/icons/kdeclassic/16x16/actions/show_table_row.png
 share/icons/kdeclassic/16x16/actions/signature.png
@@ -2246,6 +2247,7 @@ share/icons/kdeclassic/16x16/actions/tab_left.png
 share/icons/kdeclassic/16x16/actions/tab_new.png
 share/icons/kdeclassic/16x16/actions/tab_new_bg.png
 share/icons/kdeclassic/16x16/actions/tab_remove.png
+share/icons/kdeclassic/16x16/actions/tab_remove_other.png
 share/icons/kdeclassic/16x16/actions/tab_right.png
 share/icons/kdeclassic/16x16/actions/targetnew_kdevelop.png
 share/icons/kdeclassic/16x16/actions/tcenteralign.png
@@ -2287,6 +2289,9 @@ share/icons/kdeclassic/16x16/actions/vertical_text.png
 share/icons/kdeclassic/16x16/actions/view_bottom.png
 share/icons/kdeclassic/16x16/actions/view_choose.png
 share/icons/kdeclassic/16x16/actions/view_detailed.png
+share/icons/kdeclassic/16x16/actions/view_fit_height.png
+share/icons/kdeclassic/16x16/actions/view_fit_width.png
+share/icons/kdeclassic/16x16/actions/view_fit_window.png
 share/icons/kdeclassic/16x16/actions/view_icon.png
 share/icons/kdeclassic/16x16/actions/view_left_right.png
 share/icons/kdeclassic/16x16/actions/view_multicolumn.png
@@ -2576,6 +2581,7 @@ share/icons/kdeclassic/16x16/apps/panel_settings.png
 share/icons/kdeclassic/16x16/apps/password.png
 share/icons/kdeclassic/16x16/apps/penguin.png
 share/icons/kdeclassic/16x16/apps/personal.png
+share/icons/kdeclassic/16x16/apps/photobook.png
 share/icons/kdeclassic/16x16/apps/plan.png
 share/icons/kdeclassic/16x16/apps/printmgr.png
 share/icons/kdeclassic/16x16/apps/proxy.png
@@ -3344,6 +3350,7 @@ share/icons/kdeclassic/22x22/actions/shadowR.png
 share/icons/kdeclassic/22x22/actions/shadowRB.png
 share/icons/kdeclassic/22x22/actions/shadowRU.png
 share/icons/kdeclassic/22x22/actions/shadowU.png
+share/icons/kdeclassic/22x22/actions/show_side_panel.png
 share/icons/kdeclassic/22x22/actions/show_table_column.png
 share/icons/kdeclassic/22x22/actions/show_table_row.png
 share/icons/kdeclassic/22x22/actions/showmenu.png
@@ -3371,6 +3378,7 @@ share/icons/kdeclassic/22x22/actions/tab_duplicate.png
 share/icons/kdeclassic/22x22/actions/tab_new.png
 share/icons/kdeclassic/22x22/actions/tab_new_bg.png
 share/icons/kdeclassic/22x22/actions/tab_remove.png
+share/icons/kdeclassic/22x22/actions/tab_remove_other.png
 share/icons/kdeclassic/22x22/actions/text.png
 share/icons/kdeclassic/22x22/actions/text_block.png
 share/icons/kdeclassic/22x22/actions/text_bold.png
@@ -3424,6 +3432,9 @@ share/icons/kdeclassic/22x22/actions/vertical_text.png
 share/icons/kdeclassic/22x22/actions/view_bottom.png
 share/icons/kdeclassic/22x22/actions/view_choose.png
 share/icons/kdeclassic/22x22/actions/view_detailed.png
+share/icons/kdeclassic/22x22/actions/view_fit_height.png
+share/icons/kdeclassic/22x22/actions/view_fit_width.png
+share/icons/kdeclassic/22x22/actions/view_fit_window.png
 share/icons/kdeclassic/22x22/actions/view_icon.png
 share/icons/kdeclassic/22x22/actions/view_left_right.png
 share/icons/kdeclassic/22x22/actions/view_multicolumn.png
@@ -3452,7 +3463,9 @@ share/icons/kdeclassic/22x22/apps/kivio.png
 share/icons/kdeclassic/22x22/apps/konqsidebar_mediaplayer.png
 share/icons/kdeclassic/22x22/apps/kpilot.png
 share/icons/kdeclassic/22x22/apps/kugar.png
+share/icons/kdeclassic/22x22/apps/kview.png
 share/icons/kdeclassic/22x22/apps/noatun.png
+share/icons/kdeclassic/22x22/apps/photobook.png
 share/icons/kdeclassic/22x22/mimetypes/empty.png
 share/icons/kdeclassic/22x22/mimetypes/karbon_karbon.png
 share/icons/kdeclassic/22x22/mimetypes/kchart_chrt.png
@@ -3674,6 +3687,7 @@ share/icons/kdeclassic/32x32/actions/rsub.png
 share/icons/kdeclassic/32x32/actions/rsup.png
 share/icons/kdeclassic/32x32/actions/run.png
 share/icons/kdeclassic/32x32/actions/share.png
+share/icons/kdeclassic/32x32/actions/show_side_panel.png
 share/icons/kdeclassic/32x32/actions/signature.png
 share/icons/kdeclassic/32x32/actions/sort_az.png
 share/icons/kdeclassic/32x32/actions/spellcheck.png
@@ -3689,6 +3703,7 @@ share/icons/kdeclassic/32x32/actions/tab_duplicate.png
 share/icons/kdeclassic/32x32/actions/tab_new.png
 share/icons/kdeclassic/32x32/actions/tab_new_bg.png
 share/icons/kdeclassic/32x32/actions/tab_remove.png
+share/icons/kdeclassic/32x32/actions/tab_remove_other.png
 share/icons/kdeclassic/32x32/actions/text_block.png
 share/icons/kdeclassic/32x32/actions/text_bold.png
 share/icons/kdeclassic/32x32/actions/text_center.png
@@ -3708,6 +3723,9 @@ share/icons/kdeclassic/32x32/actions/up.png
 share/icons/kdeclassic/32x32/actions/view_bottom.png
 share/icons/kdeclassic/32x32/actions/view_choose.png
 share/icons/kdeclassic/32x32/actions/view_detailed.png
+share/icons/kdeclassic/32x32/actions/view_fit_height.png
+share/icons/kdeclassic/32x32/actions/view_fit_width.png
+share/icons/kdeclassic/32x32/actions/view_fit_window.png
 share/icons/kdeclassic/32x32/actions/view_icon.png
 share/icons/kdeclassic/32x32/actions/view_left_right.png
 share/icons/kdeclassic/32x32/actions/view_multicolumn.png
@@ -3972,6 +3990,7 @@ share/icons/kdeclassic/32x32/apps/package_wordprocessing.png
 share/icons/kdeclassic/32x32/apps/password.png
 share/icons/kdeclassic/32x32/apps/penguin.png
 share/icons/kdeclassic/32x32/apps/personal.png
+share/icons/kdeclassic/32x32/apps/photobook.png
 share/icons/kdeclassic/32x32/apps/plan.png
 share/icons/kdeclassic/32x32/apps/printmgr.png
 share/icons/kdeclassic/32x32/apps/proxy.png