3 files changed, 57 insertions, 82 deletions

diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile
index eaac7746d362..926d28281cf8 100644
--- a/misc/kbfx/Makefile
+++ b/misc/kbfx/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	kbfx
-PORTVERSION=	0.4.9.2.r1
+PORTVERSION=	0.4.9.2.r4
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=kbfx
-DISTNAME=	${PORTNAME}-0.4.9.2rc1
+DISTNAME=	${PORTNAME}-0.4.9.2rc4
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	A new K-menu for KDE
 
-USE_QT_VER=	3
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/kbfx/distinfo b/misc/kbfx/distinfo
index e7dd3330ef67..c9e5e48ad20e 100644
--- a/misc/kbfx/distinfo
+++ b/misc/kbfx/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbfx-0.4.9.2rc1.tar.gz) = 17349a247b5cc4f75eaa6829b92c577c
-SHA256 (kbfx-0.4.9.2rc1.tar.gz) = 2f90a222c9a63af48fd83c55d3aa414ea96c9408be7deeb017fe6e1b84656452
-SIZE (kbfx-0.4.9.2rc1.tar.gz) = 1393870
+MD5 (kbfx-0.4.9.2rc4.tar.bz2) = 52bdd89a284c5d8188898c1d97eb7b48
+SHA256 (kbfx-0.4.9.2rc4.tar.bz2) = a958c4d76527f6dd1795d0fc1b3c66b06aab87597ee610c509c9aef276d6bc61
+SIZE (kbfx-0.4.9.2rc4.tar.bz2) = 3339541
diff --git a/misc/kbfx/pkg-plist b/misc/kbfx/pkg-plist
index 0746e1655592..a2ec6b422825 100644
--- a/misc/kbfx/pkg-plist
+++ b/misc/kbfx/pkg-plist
@@ -1,82 +1,53 @@
 bin/kbfxconfigapp
-lib/kde3/kcm_kcmkbfx.a
-lib/kde3/kcm_kcmkbfx.la
-lib/kde3/kcm_kcmkbfx.so
 lib/libkbfxspinx.a
 lib/libkbfxspinx.la
 lib/libkbfxspinx.so
-share/applications/kde/kbfxconfig.desktop
-share/applications/kde/kcmkbfx.desktop
-share/apps/kbfx/about.htm
-share/apps/kbfx/backup.htm
-share/apps/kbfx/howto.htm
-share/apps/kbfx/images/about.png
-share/apps/kbfx/images/border.png
-share/apps/kbfx/images/control_configurator.png
-share/apps/kbfx/images/control_exit.png
-share/apps/kbfx/images/control_reload.png
-share/apps/kbfx/images/control_save.png
-share/apps/kbfx/images/control_version.png
-share/apps/kbfx/images/how_to_createthemes.png
-share/apps/kbfx/images/how_to_helpus.png
-share/apps/kbfx/images/how_to_one.png
-share/apps/kbfx/images/how_to_select.png
-share/apps/kbfx/images/how_to_tipstrix.png
-share/apps/kbfx/images/main_browse.png
-share/apps/kbfx/images/main_one_apply.png
-share/apps/kbfx/images/main_one_browse.png
-share/apps/kbfx/images/main_one_hover.png
-share/apps/kbfx/images/main_one_kickerbutton.png
-share/apps/kbfx/images/main_one_normal.png
-share/apps/kbfx/images/main_one_pressed.png
-share/apps/kbfx/images/main_one_preview_1.png
-share/apps/kbfx/images/main_one_preview_2.png
-share/apps/kbfx/images/main_one_preview_3.png
-share/apps/kbfx/images/menu_about.png
-share/apps/kbfx/images/menu_animations.png
-share/apps/kbfx/images/menu_how_to.png
-share/apps/kbfx/images/menu_start_button.png
-share/apps/kbfx/images/menu_style.png
-share/apps/kbfx/images/menu_style_kbfxmenu.png
-share/apps/kbfx/images/menu_style_kbmenu.png
-share/apps/kbfx/images/menu_style_kdemenu.png
-share/apps/kbfx/images/menu_style_kdmenu.png
-share/apps/kbfx/images/menu_style_one.png
-share/apps/kbfx/images/menu_themes.png
-share/apps/kbfx/images/menu_tooltip.png
-share/apps/kbfx/images/themes_apply.png
-share/apps/kbfx/images/themes_browse.png
-share/apps/kbfx/images/themes_create_own.png
-share/apps/kbfx/images/themes_how_to.png
-share/apps/kbfx/images/themes_new_install.png
-share/apps/kbfx/images/themes_new_installed.png
-share/apps/kbfx/images/themes_new_one.png
-share/apps/kbfx/images/themes_one.png
-share/apps/kbfx/images/tooltip_animation.png
-share/apps/kbfx/images/tooltip_empty.png
-share/apps/kbfx/images/tooltip_off.png
-share/apps/kbfx/images/tooltip_on.png
-share/apps/kbfx/images/tooltip_one.png
-share/apps/kbfx/images/tooltip_status.png
-share/apps/kbfx/images/tooltip_text.png
-share/apps/kbfx/index.htm
-share/apps/kbfx/kbfxconfig.desktop
-share/apps/kbfx/menustyle.htm
-share/apps/kbfx/oodomimagerollover.js
-share/apps/kbfx/remove.htm
+share/applnk/.hidden/kbfx_theme.desktop
+share/applnk/Utilities/kbfxconfigapp.desktop
+share/apps/kbfx/skins/Old_KBFX/appfind.png
+share/apps/kbfx/skins/Old_KBFX/bg.png
+share/apps/kbfx/skins/Old_KBFX/botbg.png
+share/apps/kbfx/skins/Old_KBFX/butterfly.png
+share/apps/kbfx/skins/Old_KBFX/dudebox.png
+share/apps/kbfx/skins/Old_KBFX/find.png
+share/apps/kbfx/skins/Old_KBFX/hover.png
+share/apps/kbfx/skins/Old_KBFX/listboxbg.png
+share/apps/kbfx/skins/Old_KBFX/lock.png
+share/apps/kbfx/skins/Old_KBFX/lockhover.png
+share/apps/kbfx/skins/Old_KBFX/logout.png
+share/apps/kbfx/skins/Old_KBFX/logouthover.png
+share/apps/kbfx/skins/Old_KBFX/mask.png
+share/apps/kbfx/skins/Old_KBFX/menu_top.png
+share/apps/kbfx/skins/Old_KBFX/menu_top_image_person.png
+share/apps/kbfx/skins/Old_KBFX/normal.png
+share/apps/kbfx/skins/Old_KBFX/pressed.png
+share/apps/kbfx/skins/Old_KBFX/preview.png
+share/apps/kbfx/skins/Old_KBFX/rhshovertile.png
+share/apps/kbfx/skins/Old_KBFX/rhstile.png
+share/apps/kbfx/skins/Old_KBFX/separator.png
+share/apps/kbfx/skins/Old_KBFX/tabbg.png
+share/apps/kbfx/skins/Old_KBFX/tilehover.png
+share/apps/kbfx/skins/Old_KBFX/tilenormal.png
+share/apps/kbfx/skins/Old_KBFX/topbg.png
 share/apps/kbfx/skins/default/appfind.png
 share/apps/kbfx/skins/default/bg.png
 share/apps/kbfx/skins/default/botbg.png
+share/apps/kbfx/skins/default/butterfly.png
+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/kbfxfontrc
 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/logout.png
 share/apps/kbfx/skins/default/logouthover.png
 share/apps/kbfx/skins/default/mask.png
-share/apps/kbfx/skins/default/menu_main_white_bg.png
 share/apps/kbfx/skins/default/menu_top.png
 share/apps/kbfx/skins/default/menu_top_image_person.png
+share/apps/kbfx/skins/default/normal.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/separator.png
@@ -84,7 +55,6 @@ 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/topbg.png
-share/apps/kbfx/skins/default/topbg2.png
 share/apps/kbfx/spinx/menu_arrow_down.png
 share/apps/kbfx/spinx/menu_arrow_up.png
 share/apps/kbfx/spinx/menu_button_lock.png
@@ -94,18 +64,14 @@ share/apps/kbfx/spinx/menu_button_logout_hover.png
 share/apps/kbfx/spinx/menu_change_the_settings.png
 share/apps/kbfx/spinx/menu_scroll_down.png
 share/apps/kbfx/spinx/menu_scroll_up.png
-share/apps/kbfx/style.css
-share/apps/kbfx/themes.htm
-share/apps/kbfx/tooltip.htm
+share/apps/kbfxconfigapp/kbfxconfigappui.rc
 share/apps/kicker/applets/kbfxspinx.desktop
+share/apps/konqueror/servicemenus/kbfx_install_theme.desktop
+share/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
 share/config.kcfg/kbfx.kcfg
-share/icons/crystalsvg/32x32/actions/kbfxnew.png
 share/icons/crystalsvg/32x32/apps/kbfx.png
-share/icons/crystalsvg/32x32/apps/kbfxnew.png
-share/icons/crystalsvg/32x32/apps/kcmkbfxnew.png
 share/icons/crystalsvg/32x32/apps/siraj.png
 share/icons/crystalsvg/48x48/actions/butterfly.png
-share/icons/crystalsvg/48x48/actions/hover.png
 share/icons/crystalsvg/48x48/actions/menu_arrow_down.png
 share/icons/crystalsvg/48x48/actions/menu_arrow_up.png
 share/icons/crystalsvg/48x48/actions/menu_button_lock.png
@@ -115,10 +81,18 @@ share/icons/crystalsvg/48x48/actions/menu_button_logout_hover.png
 share/icons/crystalsvg/48x48/actions/menu_change_the_settings.png
 share/icons/crystalsvg/48x48/actions/menu_scroll_down.png
 share/icons/crystalsvg/48x48/actions/menu_scroll_up.png
-share/icons/crystalsvg/48x48/actions/normal.png
-share/icons/crystalsvg/48x48/actions/pressed.png
+share/icons/hicolor/16x16/apps/kbfxconfigapp.png
+share/icons/hicolor/32x32/actions/kbfxnew.png
+share/icons/hicolor/32x32/apps/kbfxconfigapp.png
+share/icons/hicolor/32x32/apps/kbfxnew.png
+share/icons/hicolor/32x32/apps/kcmkbfxnew.png
+share/locale/bg/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/apps/kbfxconfigapp
 @dirrm share/apps/kbfx/spinx
 @dirrm share/apps/kbfx/skins/default
+@dirrm share/apps/kbfx/skins/Old_KBFX
 @dirrm share/apps/kbfx/skins
-@dirrm share/apps/kbfx/images
 @dirrm share/apps/kbfx