5 files changed, 111 insertions, 32 deletions

diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index f294608ad580..6a9f95450a8d 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	choqok
-PORTVERSION=	0.9.90
-PORTREVISION=	2
+PORTVERSION=	1.0
 CATEGORIES=	www kde
-MASTER_SITES=	http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/
+MASTER_SITES=	http://choqok.gnufolks.org/pkgs/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE micro-blogging client
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 LIB_DEPENDS=	qjson.0:${PORTSDIR}/devel/qjson \
 		qoauth.1:${PORTSDIR}/net/qoauth \
 		kwebkit.1:${PORTSDIR}/www/kwebkitpart
diff --git a/www/choqok/distinfo b/www/choqok/distinfo
index 9eab5c63c2b8..a28f71c753ba 100644
--- a/www/choqok/distinfo
+++ b/www/choqok/distinfo
@@ -1,2 +1,2 @@
-SHA256 (choqok-0.9.90.tar.bz2) = e2989d88deb61d472e3bddd308c3cd0dedbea47e8102ae70a5e24e5ebd6a99eb
-SIZE (choqok-0.9.90.tar.bz2) = 441070
+SHA256 (choqok-1.0.tar.bz2) = 45d08a621f2e96fb235aba24c181970cb9ddd423a695cd6c4f9be55300764847
+SIZE (choqok-1.0.tar.bz2) = 885498
diff --git a/www/choqok/files/patch-cmake__modules__CMakeLists.txt b/www/choqok/files/patch-cmake__modules__CMakeLists.txt
index 47341e257db1..9454b743664b 100644
--- a/www/choqok/files/patch-cmake__modules__CMakeLists.txt
+++ b/www/choqok/files/patch-cmake__modules__CMakeLists.txt
@@ -3,7 +3,7 @@
 @@ -1,4 +1,4 @@
  # install the cmake files
  
--set(cmakeFiles FindChoqok.cmake FindQJson.cmake FindQtOAuth.cmake)
+-set(cmakeFiles FindChoqok.cmake FindQJson.cmake FindQtOAuth.cmake FindQtIndicate.cmake)
 +set(cmakeFiles FindChoqok.cmake FindQtOAuth.cmake)
  install( FILES ${cmakeFiles} DESTINATION ${DATA_INSTALL_DIR}/cmake/modules )
 \ No newline at end of file
diff --git a/www/choqok/files/patch-cmake__modules__DBusMacros.cmake b/www/choqok/files/patch-cmake__modules__DBusMacros.cmake
new file mode 100644
index 000000000000..16f1899cb062
--- /dev/null
+++ b/www/choqok/files/patch-cmake__modules__DBusMacros.cmake
@@ -0,0 +1,10 @@
+--- ./cmake/modules/DBusMacros.cmake.bak	2010-12-15 19:50:32.015441170 +1000
++++ ./cmake/modules/DBusMacros.cmake	2010-12-15 19:52:27.213438681 +1000
+@@ -26,6 +26,6 @@
+         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
+         set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
+         configure_file(${_service_file} ${_target})
+-        install(FILES ${_target} DESTINATION ${DATA_INSTALL_DIR}/dbus-1/services)
++        install(FILES ${_target} DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+     endforeach (_i ${ARGN})
+ endmacro(dbus_add_activation_service _sources)
diff --git a/www/choqok/pkg-plist b/www/choqok/pkg-plist
index 2e019622b68f..e494fd39cb85 100644
--- a/www/choqok/pkg-plist
+++ b/www/choqok/pkg-plist
@@ -5,6 +5,7 @@ include/choqok/choqok_export.h
 include/choqok/choqokappearancesettings.h
 include/choqok/choqokbehaviorsettings.h
 include/choqok/choqokid.h
+include/choqok/choqokmainwindow.h
 include/choqok/choqoktextedit.h
 include/choqok/choqoktools.h
 include/choqok/choqoktypes.h
@@ -12,7 +13,6 @@ include/choqok/choqokuiglobal.h
 include/choqok/composerwidget.h
 include/choqok/dbushandler.h
 include/choqok/editaccountwidget.h
-include/choqok/mainwindow.h
 include/choqok/mediamanager.h
 include/choqok/microblog.h
 include/choqok/microblogwidget.h
@@ -37,49 +37,58 @@ include/choqok/twitterapihelper/twitterapisearchdialog.h
 include/choqok/twitterapihelper/twitterapisearchtimelinewidget.h
 include/choqok/twitterapihelper/twitterapishowthread.h
 include/choqok/twitterapihelper/twitterapitextedit.h
+include/choqok/twitterapihelper/twitterapitimelinewidget.h
 include/choqok/twitterapihelper/twitterapiwhoiswidget.h
 include/choqok/uploader.h
 include/choqok/uploadmediadialog.h
 lib/kde4/choqok_bit_ly.so
-lib/kde4/choqok_digg.so
 lib/kde4/choqok_filter.so
+lib/kde4/choqok_flickr.so
 lib/kde4/choqok_goo_gl.so
 lib/kde4/choqok_imagepreview.so
+lib/kde4/choqok_imageshack.so
+lib/kde4/choqok_imstatus.so
 lib/kde4/choqok_is_gd.so
 lib/kde4/choqok_laconica.so
+lib/kde4/choqok_mobypicture.so
 lib/kde4/choqok_nowlistening.so
+lib/kde4/choqok_ocs.so
+lib/kde4/choqok_posterous.so
 lib/kde4/choqok_searchaction.so
 lib/kde4/choqok_three_ly.so
 lib/kde4/choqok_tighturl.so
 lib/kde4/choqok_tinyarro_ws.so
+lib/kde4/choqok_twitgoo.so
 lib/kde4/choqok_twitpic.so
 lib/kde4/choqok_twitter.so
-lib/kde4/choqok_u_nu.so
 lib/kde4/choqok_untiny.so
 lib/kde4/choqok_ur1_ca.so
 lib/kde4/choqok_ur_ly.so
 lib/kde4/choqok_urls_io.so
 lib/kde4/choqok_videopreview.so
-lib/kde4/choqok_yfrog.so
 lib/kde4/choqok_yourls.so
 lib/kde4/kcm_choqok_accountsconfig.so
 lib/kde4/kcm_choqok_appearanceconfig.so
 lib/kde4/kcm_choqok_behaviorconfig.so
 lib/kde4/kcm_choqok_bit_ly.so
+lib/kde4/kcm_choqok_flickr.so
+lib/kde4/kcm_choqok_imstatus.so
+lib/kde4/kcm_choqok_mobypicture.so
 lib/kde4/kcm_choqok_nowlistening.so
 lib/kde4/kcm_choqok_pluginconfig.so
+lib/kde4/kcm_choqok_posterous.so
 lib/kde4/kcm_choqok_tinyarro_ws.so
+lib/kde4/kcm_choqok_twitgoo.so
 lib/kde4/kcm_choqok_twitpic.so
 lib/kde4/kcm_choqok_untiny.so
-lib/kde4/kcm_choqok_yfrog.so
 lib/kde4/kcm_choqok_yourls.so
 lib/kde4/konqchoqokplugin.so
-lib/libchoqok.so.0.9.90
-lib/libchoqok.so.0
 lib/libchoqok.so
-lib/libtwitterapihelper.so.0.9.5
-lib/libtwitterapihelper.so.0
+lib/libchoqok.so.1
+lib/libchoqok.so.1.0.0
 lib/libtwitterapihelper.so
+lib/libtwitterapihelper.so.1
+lib/libtwitterapihelper.so.1.0.0
 share/applications/kde4/choqok.desktop
 share/apps/choqok/choqok.notifyrc
 share/apps/choqok/choqokui.rc
@@ -89,7 +98,6 @@ share/apps/choqok_nowlistening/nowlisteningui.rc
 share/apps/choqok_searchaction/searchactionui.rc
 share/apps/cmake/modules/FindChoqok.cmake
 share/apps/cmake/modules/FindQtOAuth.cmake
-share/apps/dbus-1/services/org.kde.choqok.service
 share/apps/khtml/kpartplugins/konqchoqok.desktop
 share/apps/khtml/kpartplugins/konqchoqok.rc
 share/apps/kwebkitpart/kpartplugins/konqchoqok.desktop
@@ -97,33 +105,72 @@ share/apps/kwebkitpart/kpartplugins/konqchoqok.rc
 share/config.kcfg/bit_ly_settings.kcfg
 share/config.kcfg/choqokappearancesettings.kcfg
 share/config.kcfg/choqokbehaviorsettings.kcfg
+share/config.kcfg/flickrsettings.kcfg
+share/config.kcfg/imstatussettings.kcfg
+share/config.kcfg/mobypicturesettings.kcfg
 share/config.kcfg/nowlisteningsettings.kcfg
+share/config.kcfg/posteroussettings.kcfg
 share/config.kcfg/tinyarro_ws_settings.kcfg
+share/config.kcfg/twitgoosettings.kcfg
 share/config.kcfg/twitpicsettings.kcfg
 share/config.kcfg/untinysettings.kcfg
-share/config.kcfg/yfrogsettings.kcfg
 share/config.kcfg/yourlssettings.kcfg
+share/dbus-1/services/org.kde.choqok.service
+share/doc/HTML/en/choqok/add_account.png
+share/doc/HTML/en/choqok/choqok.png
+share/doc/HTML/en/choqok/choqok_quick.png
+share/doc/HTML/en/choqok/choqok_search.png
+share/doc/HTML/en/choqok/common
+share/doc/HTML/en/choqok/index.cache.bz2
+share/doc/HTML/en/choqok/index.docbook
 share/icons/hicolor/128x128/apps/choqok.png
 share/icons/hicolor/16x16/actions/retweet.png
 share/icons/hicolor/16x16/apps/choqok.png
+share/icons/hicolor/16x16/apps/flickr_uploader.png
+share/icons/hicolor/16x16/apps/imageshack_uploader.png
 share/icons/hicolor/16x16/apps/laconica_microblog.png
+share/icons/hicolor/16x16/apps/mobypicture_uploader.png
+share/icons/hicolor/16x16/apps/ocs_microblog.png
+share/icons/hicolor/16x16/apps/posterous_uploader.png
+share/icons/hicolor/16x16/apps/twitgoo_uploader.png
 share/icons/hicolor/16x16/apps/twitpic_uploader.png
 share/icons/hicolor/16x16/apps/twitter_microblog.png
-share/icons/hicolor/16x16/apps/yfrog_uploader.png
 share/icons/hicolor/22x22/apps/choqok.png
+share/icons/hicolor/22x22/apps/flickr_uploader.png
+share/icons/hicolor/22x22/apps/imageshack_uploader.png
 share/icons/hicolor/22x22/apps/laconica_microblog.png
+share/icons/hicolor/22x22/apps/mobypicture_uploader.png
+share/icons/hicolor/22x22/apps/ocs_microblog.png
+share/icons/hicolor/22x22/apps/posterous_uploader.png
+share/icons/hicolor/22x22/apps/twitgoo_uploader.png
 share/icons/hicolor/22x22/apps/twitpic_uploader.png
 share/icons/hicolor/22x22/apps/twitter_microblog.png
-share/icons/hicolor/22x22/apps/yfrog_uploader.png
 share/icons/hicolor/32x32/apps/choqok.png
+share/icons/hicolor/32x32/apps/flickr_uploader.png
+share/icons/hicolor/32x32/apps/imageshack_uploader.png
 share/icons/hicolor/32x32/apps/laconica_microblog.png
+share/icons/hicolor/32x32/apps/mobypicture_uploader.png
+share/icons/hicolor/32x32/apps/ocs_microblog.png
+share/icons/hicolor/32x32/apps/posterous_uploader.png
+share/icons/hicolor/32x32/apps/twitgoo_uploader.png
 share/icons/hicolor/32x32/apps/twitpic_uploader.png
 share/icons/hicolor/32x32/apps/twitter_microblog.png
-share/icons/hicolor/32x32/apps/yfrog_uploader.png
 share/icons/hicolor/48x48/apps/choqok.png
+share/icons/hicolor/48x48/apps/flickr_uploader.png
+share/icons/hicolor/48x48/apps/imageshack_uploader.png
 share/icons/hicolor/48x48/apps/laconica_microblog.png
+share/icons/hicolor/48x48/apps/mobypicture_uploader.png
+share/icons/hicolor/48x48/apps/ocs_microblog.png
+share/icons/hicolor/48x48/apps/posterous_uploader.png
+share/icons/hicolor/48x48/apps/twitgoo_uploader.png
 share/icons/hicolor/48x48/apps/twitter_microblog.png
 share/icons/hicolor/64x64/apps/choqok.png
+share/icons/hicolor/64x64/apps/flickr_uploader.png
+share/icons/hicolor/64x64/apps/imageshack_uploader.png
+share/icons/hicolor/64x64/apps/mobypicture_uploader.png
+share/icons/hicolor/64x64/apps/ocs_microblog.png
+share/icons/hicolor/64x64/apps/posterous_uploader.png
+share/icons/hicolor/64x64/apps/twitgoo_uploader.png
 share/kde4/services/ServiceMenus/choqok_share.desktop
 share/kde4/services/ServiceMenus/choqok_upload.desktop
 share/kde4/services/choqok_accountsconfig.desktop
@@ -131,32 +178,40 @@ share/kde4/services/choqok_appearanceconfig.desktop
 share/kde4/services/choqok_behaviorconfig.desktop
 share/kde4/services/choqok_bit_ly.desktop
 share/kde4/services/choqok_bit_ly_config.desktop
-share/kde4/services/choqok_digg.desktop
 share/kde4/services/choqok_filter.desktop
+share/kde4/services/choqok_flickr.desktop
+share/kde4/services/choqok_flickr_config.desktop
 share/kde4/services/choqok_goo_gl.desktop
 share/kde4/services/choqok_imagepreview.desktop
+share/kde4/services/choqok_imageshack.desktop
+share/kde4/services/choqok_imstatus.desktop
+share/kde4/services/choqok_imstatus_config.desktop
 share/kde4/services/choqok_is_gd.desktop
 share/kde4/services/choqok_laconica.desktop
+share/kde4/services/choqok_mobypicture.desktop
+share/kde4/services/choqok_mobypicture_config.desktop
 share/kde4/services/choqok_nowlistening.desktop
 share/kde4/services/choqok_nowlistening_config.desktop
+share/kde4/services/choqok_ocs.desktop
 share/kde4/services/choqok_pluginconfig.desktop
+share/kde4/services/choqok_posterous.desktop
+share/kde4/services/choqok_posterous_config.desktop
 share/kde4/services/choqok_searchaction.desktop
 share/kde4/services/choqok_three_ly.desktop
 share/kde4/services/choqok_tighturl.desktop
 share/kde4/services/choqok_tinyarro_ws.desktop
 share/kde4/services/choqok_tinyarro_ws_config.desktop
+share/kde4/services/choqok_twitgoo.desktop
+share/kde4/services/choqok_twitgoo_config.desktop
 share/kde4/services/choqok_twitpic.desktop
 share/kde4/services/choqok_twitpic_config.desktop
 share/kde4/services/choqok_twitter.desktop
-share/kde4/services/choqok_u_nu.desktop
 share/kde4/services/choqok_untiny.desktop
 share/kde4/services/choqok_untiny_config.desktop
 share/kde4/services/choqok_ur1_ca.desktop
 share/kde4/services/choqok_ur_ly.desktop
 share/kde4/services/choqok_urls_io.desktop
 share/kde4/services/choqok_videopreview.desktop
-share/kde4/services/choqok_yfrog.desktop
-share/kde4/services/choqok_yfrog_config.desktop
 share/kde4/services/choqok_yourls.desktop
 share/kde4/services/choqok_yourls_config.desktop
 share/kde4/servicetypes/choqokplugin.desktop
@@ -165,32 +220,48 @@ share/kde4/servicetypes/choqokuploaderplugin.desktop
 share/locale/bg/LC_MESSAGES/choqok.mo
 share/locale/ca/LC_MESSAGES/choqok.mo
 share/locale/ca@valencia/LC_MESSAGES/choqok.mo
+share/locale/cs/LC_MESSAGES/choqok.mo
 share/locale/da/LC_MESSAGES/choqok.mo
 share/locale/de/LC_MESSAGES/choqok.mo
+share/locale/el/LC_MESSAGES/choqok.mo
 share/locale/en_GB/LC_MESSAGES/choqok.mo
+share/locale/eo/LC_MESSAGES/choqok.mo
 share/locale/es/LC_MESSAGES/choqok.mo
 share/locale/et/LC_MESSAGES/choqok.mo
+share/locale/fa/LC_MESSAGES/choqok.mo
 share/locale/fi/LC_MESSAGES/choqok.mo
 share/locale/fr/LC_MESSAGES/choqok.mo
+share/locale/ga/LC_MESSAGES/choqok.mo
+share/locale/gl/LC_MESSAGES/choqok.mo
 share/locale/hr/LC_MESSAGES/choqok.mo
 share/locale/hu/LC_MESSAGES/choqok.mo
+share/locale/is/LC_MESSAGES/choqok.mo
 share/locale/ja/LC_MESSAGES/choqok.mo
+share/locale/km/LC_MESSAGES/choqok.mo
+share/locale/lt/LC_MESSAGES/choqok.mo
+share/locale/ms/LC_MESSAGES/choqok.mo
 share/locale/nb/LC_MESSAGES/choqok.mo
+share/locale/nds/LC_MESSAGES/choqok.mo
 share/locale/nl/LC_MESSAGES/choqok.mo
+share/locale/pa/LC_MESSAGES/choqok.mo
 share/locale/pl/LC_MESSAGES/choqok.mo
 share/locale/pt/LC_MESSAGES/choqok.mo
 share/locale/pt_BR/LC_MESSAGES/choqok.mo
+share/locale/ro/LC_MESSAGES/choqok.mo
+share/locale/ru/LC_MESSAGES/choqok.mo
+share/locale/sk/LC_MESSAGES/choqok.mo
 share/locale/sv/LC_MESSAGES/choqok.mo
+share/locale/tr/LC_MESSAGES/choqok.mo
 share/locale/uk/LC_MESSAGES/choqok.mo
 share/locale/zh_CN/LC_MESSAGES/choqok.mo
-@dirrm include/choqok/twitterapihelper
-@dirrm include/choqok
+share/locale/zh_TW/LC_MESSAGES/choqok.mo
+@dirrm share/doc/HTML/en/choqok
 @dirrmtry share/apps/kwebkitpart/kpartplugins
 @dirrmtry share/apps/kwebkitpart
-@dirrm share/apps/choqok/images
-@dirrm share/apps/choqok_filter
-@dirrm share/apps/choqok_nowlistening
 @dirrm share/apps/choqok_searchaction
+@dirrm share/apps/choqok_nowlistening
+@dirrm share/apps/choqok_filter
+@dirrm share/apps/choqok/images
 @dirrm share/apps/choqok
-@dirrmtry share/apps/dbus-1/services
-@dirrmtry share/apps/dbus-1
+@dirrm include/choqok/twitterapihelper
+@dirrm include/choqok