4 files changed, 158 insertions, 62 deletions

diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile
index 7409dad3bbc3..828e17a27ee7 100644
--- a/misc/kbfx/Makefile
+++ b/misc/kbfx/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	kbfx
-PORTVERSION=	0.4.9.3.20070117
-PORTREVISION=	2
+PORTVERSION=	0.4.9.3.1
+PORTEPOCH=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=kbfx
-DISTNAME=	${PORTNAME}-0.4.9.3-20070117
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	A new K-menu for KDE
diff --git a/misc/kbfx/distinfo b/misc/kbfx/distinfo
index 217bdb0d7ee5..72aea5e5009b 100644
--- a/misc/kbfx/distinfo
+++ b/misc/kbfx/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbfx-0.4.9.3-20070117.tar.bz2) = d3a823e2ca0e99ed5596e84b9f9907a8
-SHA256 (kbfx-0.4.9.3-20070117.tar.bz2) = d4213547583f4219a5ce7efae9e43dec23041bcdd303739da26f088997cb03e8
-SIZE (kbfx-0.4.9.3-20070117.tar.bz2) = 1517905
+MD5 (kbfx-0.4.9.3.1.tar.bz2) = 47bb5328a3f6dd2cc3f21279b9d0435c
+SHA256 (kbfx-0.4.9.3.1.tar.bz2) = 7039b2b2ae15ae30c94526d835de0fe95b7b802e109871dff62a396a0993db3a
+SIZE (kbfx-0.4.9.3.1.tar.bz2) = 1456946
diff --git a/misc/kbfx/files/patch-cmakemodules__FindKdeLibs.cmake b/misc/kbfx/files/patch-cmakemodules__FindKdeLibs.cmake
index 2ad2977bf850..0ae606cc2d00 100644
--- a/misc/kbfx/files/patch-cmakemodules__FindKdeLibs.cmake
+++ b/misc/kbfx/files/patch-cmakemodules__FindKdeLibs.cmake
@@ -1,6 +1,6 @@
---- ./cmakemodules/FindKdeLibs.cmake.orig	Thu Dec 14 11:00:32 2006
-+++ ./cmakemodules/FindKdeLibs.cmake	Wed Jan 31 00:22:35 2007
-@@ -159,7 +159,7 @@
+--- ./cmakemodules/FindKdeLibs.cmake.orig	Fri Mar  9 03:04:51 2007
++++ ./cmakemodules/FindKdeLibs.cmake	Tue Jun 12 11:11:19 2007
+@@ -139,7 +139,7 @@
  ## the following are directories where stuff will be installed to
  SET(BIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/bin"                  CACHE PATH "The kde bin install dir (default prefix/bin)" FORCE)
  SET(SBIN_INSTALL_DIR         "${EXEC_INSTALL_PREFIX}/sbin"                 CACHE PATH "The kde sbin install dir (default prefix/sbin)" FORCE)
diff --git a/misc/kbfx/pkg-plist b/misc/kbfx/pkg-plist
index a6b8f8f00fe5..da57a34a4fe4 100644
--- a/misc/kbfx/pkg-plist
+++ b/misc/kbfx/pkg-plist
@@ -1,50 +1,80 @@
 bin/kbfxconfigapp
-include/kbfx/effect.h
-include/kbfx/kbfxconfig.h
-include/kbfx/kbfxdatagroup.h
-include/kbfx/kbfxdatagrouplist.h
-include/kbfx/kbfxdatasource.h
-include/kbfx/kbfxdatastack.h
-include/kbfx/kbfxdatavizitem.h
-include/kbfx/kbfxkiodownload.h
-include/kbfx/kbfxplasmacanvasabstractitem.h
-include/kbfx/kbfxplasmacanvasgroup.h
-include/kbfx/kbfxplasmacanvasgroupview.h
-include/kbfx/kbfxplasmacanvasitem.h
-include/kbfx/kbfxplasmacanvasitem_events.h
-include/kbfx/kbfxplasmacanvasitemwrapper.h
-include/kbfx/kbfxplasmacanvasrtti.h
-include/kbfx/kbfxplasmacanvasstack.h
-include/kbfx/kbfxplasmacanvasstackdata.h
-include/kbfx/kbfxplasmacanvasview.h
-include/kbfx/kbfxplasmadataplugin.h
-include/kbfx/kbfxplasmafadeitem.h
-include/kbfx/kbfxplasmaindexitem.h
-include/kbfx/kbfxplasmaindexview.h
-include/kbfx/kbfxplasmaitemview.h
-include/kbfx/kbfxplasmalistbox.h
-include/kbfx/kbfxplasmalistboxitem.h
-include/kbfx/kbfxplasmapluginloader.h
-include/kbfx/kbfxplasmaskinmanager.h
-include/kbfx/kbfxplasmawaterback.h
-include/kbfx/kbfxplugin.h
-include/kbfx/kbfxsignal.h
-include/kbfx/kbfxspinxscrollbar.h
-include/kbfx/kbfxwatersprite.h
-include/kbfx/plugins/kbfxplasmadataplugin.h
+include/kbfx/common/kbfxconfig.h
+include/kbfx/common/kbfxfontchooser.h
+include/kbfx/common/kbfxkiodownload.h
+include/kbfx/common/kbfxpixmaplabel.h
+include/kbfx/common/kbfxplasmapixmapprovider.h
+include/kbfx/common/kbfxpushbutton.h
+include/kbfx/common/kbfxthemesdata.h
+include/kbfx/data/kbfxdatagroup.h
+include/kbfx/data/kbfxdatagrouplist.h
+include/kbfx/data/kbfxdatasource.h
+include/kbfx/data/kbfxdatastack.h
+include/kbfx/data/kbfxplasmadataplugin.h
+include/kbfx/data/kbfxplasmapluginloader.h
+include/kbfx/data/kbfxplugin.h
+include/kbfx/plugins/kbfxplasmadataplugin-common.h
 lib/kbfx/plugins/libkbfxplasmadataplasmoid.la
 lib/kbfx/plugins/libkbfxplasmadataplasmoid.so
 lib/kbfx/plugins/libkbfxplasmadatasettings.la
 lib/kbfx/plugins/libkbfxplasmadatasettings.so
 lib/kbfx/plugins/libkbfxplasmadatastub.la
 lib/kbfx/plugins/libkbfxplasmadatastub.so
-lib/libkbfxplasma.la
-lib/libkbfxplasma.so
-lib/libkbfxspinxtest.la
-lib/libkbfxspinxtest.so
-share/applnk/.hidden/kbfx_theme.desktop
-share/applnk/Utilities/kbfxconfigapp.desktop
+lib/kbfx/plugins/libkbfxplasmarecentstuff.la
+lib/kbfx/plugins/libkbfxplasmarecentstuff.so
+lib/kde3/libkbfxspinx.la
+lib/kde3/libkbfxspinx.so
+lib/libkbfxcommon.la
+lib/libkbfxcommon.so
+lib/libkbfxdata.la
+lib/libkbfxdata.so
+share/applications/kde/kbfx_theme.desktop
+share/applications/kde/kbfxconfigapp.desktop
+share/apps/kbfx/skins/2panels/appfind.png
+share/apps/kbfx/skins/2panels/bg.png
+share/apps/kbfx/skins/2panels/bg_sidebar.png
+share/apps/kbfx/skins/2panels/botbg.png
+share/apps/kbfx/skins/2panels/butterfly.png
+share/apps/kbfx/skins/2panels/dudebox.png
+share/apps/kbfx/skins/2panels/fancymenuitem.png
+share/apps/kbfx/skins/2panels/find.png
+share/apps/kbfx/skins/2panels/hover.png
+share/apps/kbfx/skins/2panels/indexseparator.png
+share/apps/kbfx/skins/2panels/kbfxfontrc
+share/apps/kbfx/skins/2panels/kbfxlayoutrc
+share/apps/kbfx/skins/2panels/listboxbg.png
+share/apps/kbfx/skins/2panels/lock.png
+share/apps/kbfx/skins/2panels/lockhover.png
+share/apps/kbfx/skins/2panels/logo.png
+share/apps/kbfx/skins/2panels/logout.png
+share/apps/kbfx/skins/2panels/logouthover.png
+share/apps/kbfx/skins/2panels/mask.png
+share/apps/kbfx/skins/2panels/menu_main_white_bg.png
+share/apps/kbfx/skins/2panels/menu_top.png
+share/apps/kbfx/skins/2panels/menu_top_image_person.png
+share/apps/kbfx/skins/2panels/middleboxbg.png
+share/apps/kbfx/skins/2panels/mystatus_bg.png
+share/apps/kbfx/skins/2panels/normal.png
+share/apps/kbfx/skins/2panels/off.png
+share/apps/kbfx/skins/2panels/on.png
+share/apps/kbfx/skins/2panels/pressed.png
+share/apps/kbfx/skins/2panels/preview.png
+share/apps/kbfx/skins/2panels/rhshovertile.png
+share/apps/kbfx/skins/2panels/rhstile.png
+share/apps/kbfx/skins/2panels/scrollnormal.png
+share/apps/kbfx/skins/2panels/scrollnormalbot.png
+share/apps/kbfx/skins/2panels/separator.png
+share/apps/kbfx/skins/2panels/separator2.png
+share/apps/kbfx/skins/2panels/sidebar_top.png
+share/apps/kbfx/skins/2panels/tabbg.png
+share/apps/kbfx/skins/2panels/tilehover.png
+share/apps/kbfx/skins/2panels/tilenormal.png
+share/apps/kbfx/skins/2panels/toolbuttonnormal.png
+share/apps/kbfx/skins/2panels/top_bg.png
+share/apps/kbfx/skins/2panels/topbg.png
+share/apps/kbfx/skins/2panels/version-2
 share/apps/kbfx/skins/default/appfind.png
+share/apps/kbfx/skins/default/appviewbg.png
 share/apps/kbfx/skins/default/bg.png
 share/apps/kbfx/skins/default/botbg.png
 share/apps/kbfx/skins/default/butterfly.png
@@ -52,55 +82,122 @@ share/apps/kbfx/skins/default/dudebox.png
 share/apps/kbfx/skins/default/find.png
 share/apps/kbfx/skins/default/hover.png
 share/apps/kbfx/skins/default/indexseparator.png
+share/apps/kbfx/skins/default/kbfxfontrc
 share/apps/kbfx/skins/default/kbfxlayoutrc
 share/apps/kbfx/skins/default/listboxbg.png
 share/apps/kbfx/skins/default/lock.png
 share/apps/kbfx/skins/default/lockhover.png
+share/apps/kbfx/skins/default/logo.png
 share/apps/kbfx/skins/default/logout.png
 share/apps/kbfx/skins/default/logouthover.png
 share/apps/kbfx/skins/default/mask.png
 share/apps/kbfx/skins/default/menu_top.png
 share/apps/kbfx/skins/default/menu_top_image_person.png
+share/apps/kbfx/skins/default/middleboxbg.png
 share/apps/kbfx/skins/default/normal.png
+share/apps/kbfx/skins/default/off.png
+share/apps/kbfx/skins/default/on.png
 share/apps/kbfx/skins/default/pressed.png
 share/apps/kbfx/skins/default/preview.png
 share/apps/kbfx/skins/default/rhshovertile.png
 share/apps/kbfx/skins/default/rhstile.png
 share/apps/kbfx/skins/default/scrollnormal.png
+share/apps/kbfx/skins/default/scrollnormalbot.png
 share/apps/kbfx/skins/default/separator.png
 share/apps/kbfx/skins/default/tabbg.png
 share/apps/kbfx/skins/default/tilehover.png
 share/apps/kbfx/skins/default/tilenormal.png
+share/apps/kbfx/skins/default/tooltip_dudebox.png
+share/apps/kbfx/skins/default/tooltip_logo.png
+share/apps/kbfx/skins/default/tooltip_mask.png
+share/apps/kbfx/skins/default/tooltip_window.png
 share/apps/kbfx/skins/default/topbg.png
+share/apps/kbfx/skins/default/version-2
 share/apps/kbfxconfigapp/kbfxconfigappui.rc
-share/apps/kicker/applets/kbfxspinxtest.desktop
+share/apps/kicker/applets/kbfxspinx.desktop
 share/apps/konqueror/servicemenus/kbfx_install_theme.desktop
 share/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-share/doc/kbfx-0.4.9.3-20070117/AUTHORS
-share/doc/kbfx-0.4.9.3-20070117/COPYING
-share/doc/kbfx-0.4.9.3-20070117/CREDITS
-share/doc/kbfx-0.4.9.3-20070117/ChangeLog
-share/doc/kbfx-0.4.9.3-20070117/HACKING
-share/doc/kbfx-0.4.9.3-20070117/HOWTO
-share/doc/kbfx-0.4.9.3-20070117/INSTALL
-share/doc/kbfx-0.4.9.3-20070117/KNOWN_BUGS
-share/doc/kbfx-0.4.9.3-20070117/LICENSE
-share/doc/kbfx-0.4.9.3-20070117/NEWS
-share/doc/kbfx-0.4.9.3-20070117/README
-share/doc/kbfx-0.4.9.3-20070117/TODO
+share/doc/HTML/en/common/kbfx-about.jpg
+share/doc/HTML/en/common/kbfx-fonts.jpg
+share/doc/HTML/en/common/kbfx-layout.jpg
+share/doc/HTML/en/common/kbfx-maindescription.jpg
+share/doc/HTML/en/common/kbfx-plugins.jpg
+share/doc/HTML/en/common/kbfx-startbutton.jpg
+share/doc/HTML/en/common/kbfx-style.jpg
+share/doc/HTML/en/common/kbfx-themes.jpg
+share/doc/HTML/en/common/kbfx-tooltip.jpg
+share/doc/HTML/en/kbfxconfigapp/appfind.png
+share/doc/HTML/en/kbfxconfigapp/appviewbg.png
+share/doc/HTML/en/kbfxconfigapp/bg.png
+share/doc/HTML/en/kbfxconfigapp/botbg.png
+share/doc/HTML/en/kbfxconfigapp/butterfly.png
+share/doc/HTML/en/kbfxconfigapp/common
+share/doc/HTML/en/kbfxconfigapp/dudebox.png
+share/doc/HTML/en/kbfxconfigapp/find.png
+share/doc/HTML/en/kbfxconfigapp/hover.png
+share/doc/HTML/en/kbfxconfigapp/index.cache.bz2
+share/doc/HTML/en/kbfxconfigapp/index.docbook
+share/doc/HTML/en/kbfxconfigapp/indexseparator.png
+share/doc/HTML/en/kbfxconfigapp/listboxbg.png
+share/doc/HTML/en/kbfxconfigapp/lock.png
+share/doc/HTML/en/kbfxconfigapp/lockhover.png
+share/doc/HTML/en/kbfxconfigapp/logo.png
+share/doc/HTML/en/kbfxconfigapp/logout.png
+share/doc/HTML/en/kbfxconfigapp/logouthover.png
+share/doc/HTML/en/kbfxconfigapp/mask.png
+share/doc/HTML/en/kbfxconfigapp/menu_top.png
+share/doc/HTML/en/kbfxconfigapp/menu_top_image_person.png
+share/doc/HTML/en/kbfxconfigapp/middleboxbg.png
+share/doc/HTML/en/kbfxconfigapp/normal.png
+share/doc/HTML/en/kbfxconfigapp/off.png
+share/doc/HTML/en/kbfxconfigapp/on.png
+share/doc/HTML/en/kbfxconfigapp/pressed.png
+share/doc/HTML/en/kbfxconfigapp/preview.png
+share/doc/HTML/en/kbfxconfigapp/rhshovertile.png
+share/doc/HTML/en/kbfxconfigapp/rhstile.png
+share/doc/HTML/en/kbfxconfigapp/scrollnormal.png
+share/doc/HTML/en/kbfxconfigapp/scrollnormalbot.png
+share/doc/HTML/en/kbfxconfigapp/separator.png
+share/doc/HTML/en/kbfxconfigapp/tabbg.png
+share/doc/HTML/en/kbfxconfigapp/tilehover.png
+share/doc/HTML/en/kbfxconfigapp/tilenormal.png
+share/doc/HTML/en/kbfxconfigapp/tooltip_dudebox.png
+share/doc/HTML/en/kbfxconfigapp/tooltip_logo.png
+share/doc/HTML/en/kbfxconfigapp/tooltip_mask.png
+share/doc/HTML/en/kbfxconfigapp/tooltip_window.png
+share/doc/HTML/en/kbfxconfigapp/topbg.png
+share/doc/kbfx-0.4.9.3.1/AUTHORS
+share/doc/kbfx-0.4.9.3.1/COPYING
+share/doc/kbfx-0.4.9.3.1/CREDITS
+share/doc/kbfx-0.4.9.3.1/ChangeLog
+share/doc/kbfx-0.4.9.3.1/HACKING
+share/doc/kbfx-0.4.9.3.1/HOWTO
+share/doc/kbfx-0.4.9.3.1/INSTALL
+share/doc/kbfx-0.4.9.3.1/KNOWN_BUGS
+share/doc/kbfx-0.4.9.3.1/LICENSE
+share/doc/kbfx-0.4.9.3.1/NEWS
+share/doc/kbfx-0.4.9.3.1/README
+share/doc/kbfx-0.4.9.3.1/TODO
 share/icons/hicolor/128x128/apps/kbfx.png
 share/icons/hicolor/16x16/apps/kbfxconfigapp.png
 share/icons/hicolor/32x32/apps/kbfxconfigapp.png
 share/locale/bg/LC_MESSAGES/kbfxconfigapp.mo
+share/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
 share/locale/it/LC_MESSAGES/kbfxconfigapp.mo
 share/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
 share/mimelnk/application/x-kbfxtheme.desktop
-@dirrm share/doc/kbfx-0.4.9.3-20070117
+@dirrm share/doc/kbfx-0.4.9.3.1
+@dirrm share/doc/HTML/en/kbfxconfigapp
+@dirrmtry share/doc/HTML/en/common
 @dirrm share/apps/kbfxconfigapp
 @dirrm share/apps/kbfx/skins/default
+@dirrm share/apps/kbfx/skins/2panels
 @dirrm share/apps/kbfx/skins
 @dirrm share/apps/kbfx
+@dirrmtry share/applications/kde
 @dirrm lib/kbfx/plugins
 @dirrm lib/kbfx
 @dirrm include/kbfx/plugins
+@dirrm include/kbfx/data
+@dirrm include/kbfx/common
 @dirrm include/kbfx