- Update to version 0.9.8.10 (track master for some nice fixes)

- Reduce local patching (integrated upstream)
- Provide KDE 4 integration option (disabled by default)
- Do not override DISTNAME, update a comment, sort pkg-plist

Feature safe:	yes

3 files changed, 49 insertions, 28 deletions

diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index 56dc7be7df96..c3e6647ec4e1 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	hotot
-PORTVERSION=	0.9.8.8
-PORTREVISION=	1
+PORTVERSION=	0.9.8.10
 CATEGORIES=	net-im www
-DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Lightweight, flexible microblogging client
@@ -16,10 +14,9 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	shellex
 GH_PROJECT=	Hotot
 GH_TAGNAME=	master
-GH_COMMIT=	9c8c8a2
+GH_COMMIT=	1110bed
 
 USE_CMAKE=	yes
-CMAKE_ARGS=	-DWITH_KDE=off	# untested, please send patches if you want it
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_GNOME=	intltool
@@ -27,8 +24,9 @@ INSTALLS_ICONS=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include		# does not uphold CPPFLAGS
 
-OPTIONS_DEFINE=	GTK2 QT4
+OPTIONS_DEFINE=	GTK2 QT4 KDE4
 OPTIONS_DEFAULT=	GTK2 QT4
+KDE4_DESC=	KDE 4 integration (implies Qt 4)
 
 .include <bsd.port.options.mk>
 
@@ -41,7 +39,7 @@ CMAKE_ARGS+=	-DWITH_GTK=off
 PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
+.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MKDE4}
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib gui sql webkit
 PLIST_SUB+=	QT4=""
@@ -51,15 +49,19 @@ INSTALL_TARGET=	install
 PLIST_SUB+=	QT4="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MKDE4}
+USE_KDE4=	automoc4 kdelibs
+.else
+CMAKE_ARGS+=	-DWITH_KDE=off
+.endif
+
 post-patch:
-# Upstream should probably use platform.system() instead of hardcoding its
-# name (in Python code at least)
+# Fix hardcoded platform name (it is not always Linux)
 	@${REINPLACE_CMD} -e 's,Linux,${OPSYS},' ${WRKSRC}/data/js/conf.js \
-		${WRKSRC}/data/js/util.js ${WRKSRC}/hotot/view.py \
-		${WRKSRC}/hotot-gir/view.py ${WRKSRC}/qt/mainwindow.cpp
+		${WRKSRC}/data/js/util.js ${WRKSRC}/qt/mainwindow.cpp
 # Strip shlib versions from the library filenames
 	@${REINPLACE_CMD} -E 's,so\.[0-9]+,so,' ${WRKSRC}/hotot/utils.py
-# Remove `sourceid' parameter from the search string
+# Remove `sourceid' parameter from Google search string
 	@${REINPLACE_CMD} -e 's,sourceid=chrome&,,' \
 		${WRKSRC}/data/js/ui.context_menu.js
 # Sanitize font selection list
diff --git a/net-im/hotot/distinfo b/net-im/hotot/distinfo
index 80025a973cf1..17b758592302 100644
--- a/net-im/hotot/distinfo
+++ b/net-im/hotot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shellex-Hotot-9c8c8a2.tar.gz) = 6689abd05454513308093770f382efd6677c81f4d13070f2b8970e17efa8e28b
-SIZE (shellex-Hotot-9c8c8a2.tar.gz) = 1179741
+SHA256 (hotot-0.9.8.10.tar.gz) = 473e76605aef269658e10dddab05892587211c77b86a899fd70a3b99f4c4b761
+SIZE (hotot-0.9.8.10.tar.gz) = 1226397
diff --git a/net-im/hotot/pkg-plist b/net-im/hotot/pkg-plist
index 13ae82fbbfb7..f87c11ff3d58 100644
--- a/net-im/hotot/pkg-plist
+++ b/net-im/hotot/pkg-plist
@@ -20,25 +20,41 @@
 %%GTK2%%share/applications/hotot.desktop
 %%QT4%%share/applications/hotot-qt.desktop
 share/hotot/_locales/bg/messages.json
+share/hotot/_locales/bg/timestring.js
 share/hotot/_locales/bn/messages.json
 share/hotot/_locales/ca/messages.json
+share/hotot/_locales/ca/timestring.js
 share/hotot/_locales/de/messages.json
+share/hotot/_locales/de/timestring.js
 share/hotot/_locales/el/messages.json
 share/hotot/_locales/en/messages.json
 share/hotot/_locales/es/messages.json
+share/hotot/_locales/es/timestring.js
 share/hotot/_locales/fr/messages.json
+share/hotot/_locales/fr/timestring.js
 share/hotot/_locales/it/messages.json
+share/hotot/_locales/it/timestring.js
 share/hotot/_locales/ja/messages.json
+share/hotot/_locales/ja/timestring.js
 share/hotot/_locales/lv/messages.json
 share/hotot/_locales/nl/messages.json
+share/hotot/_locales/nl/timestring.js
 share/hotot/_locales/pl_PL/messages.json
+share/hotot/_locales/pl_PL/timestring.js
 share/hotot/_locales/pt_BR/messages.json
+share/hotot/_locales/pt_BR/timestring.js
 share/hotot/_locales/ru/messages.json
+share/hotot/_locales/ru/timestring.js
 share/hotot/_locales/uk/messages.json
 share/hotot/_locales/zh_CAN/messages.json
+share/hotot/_locales/zh_CAN/timestring.js
 share/hotot/_locales/zh_CLS/messages.json
+share/hotot/_locales/zh_CLS/timestring.js
 share/hotot/_locales/zh_CN/messages.json
+share/hotot/_locales/zh_CN/timestring.js
 share/hotot/_locales/zh_TW/messages.json
+share/hotot/_locales/zh_TW/timestring.js
+share/hotot/background.html
 share/hotot/css/hotot.widget.css
 share/hotot/css/mochi.css
 share/hotot/css/style.css
@@ -48,10 +64,11 @@ share/hotot/ext/org.hotot.appmask/icon.png
 share/hotot/ext/org.hotot.cfw/entry.js
 share/hotot/ext/org.hotot.cfw/ic16_cfw.png
 share/hotot/ext/org.hotot.cfw/icon.png
+share/hotot/ext/org.hotot.expandurls/entry.js
 share/hotot/ext/org.hotot.gmap/entry.js
 share/hotot/ext/org.hotot.gmap/ic16_marker.png
 share/hotot/ext/org.hotot.gmap/icon.png
-share/hotot/ext/org.hotot.expandurls/entry.js
+share/hotot/ext/org.hotot.imghp/entry.js
 share/hotot/ext/org.hotot.sample/entry.js
 share/hotot/ext/org.hotot.shorturl/entry.js
 share/hotot/ext/org.hotot.shorturl/icon.png
@@ -62,6 +79,7 @@ share/hotot/ext/org.hotot.stat/icon.png
 share/hotot/ext/org.hotot.stat/jquery.flot.min.js
 share/hotot/ext/org.hotot.stat/jquery.flot.pie.min.js
 share/hotot/ext/org.hotot.stat/summary.html
+share/hotot/ext/org.hotot.stat/summary.js
 share/hotot/ext/org.hotot.translate/entry.js
 share/hotot/ext/org.hotot.translate/ic16_translate.png
 share/hotot/ext/org.hotot.translate/icon.png
@@ -127,10 +145,10 @@ share/hotot/image/ic_mention.png
 share/hotot/image/ic_people.png
 share/hotot/image/ic_retweet.png
 share/hotot/image/ic_search.png
-share/hotot/image/tweet_ctrl_icons.png
-share/hotot/image/welcome_bg.jpg
 share/hotot/image/mask.png
+share/hotot/image/tweet_ctrl_icons.png
 share/hotot/image/tweet_fav_indicator.png
+share/hotot/image/welcome_bg.jpg
 share/hotot/index.html
 share/hotot/js/background.coffee
 share/hotot/js/background.js
@@ -138,8 +156,8 @@ share/hotot/js/base64.js
 share/hotot/js/conf.js
 share/hotot/js/daemon.js
 share/hotot/js/db.js
-share/hotot/js/hotot.js
 share/hotot/js/hotkey.js
+share/hotot/js/hotot.js
 share/hotot/js/i18n.js
 share/hotot/js/jquery.js
 share/hotot/js/jquery.layout.js
@@ -149,14 +167,15 @@ share/hotot/js/lib.network.js
 share/hotot/js/lib.oauth.js
 share/hotot/js/lib.twitter.js
 share/hotot/js/mochi.js
+share/hotot/js/moment.min.js
 share/hotot/js/notification.js
 share/hotot/js/readlater.coffee
 share/hotot/js/readlater.js
 share/hotot/js/sha1.js
 share/hotot/js/toast.js
 share/hotot/js/ui.about_dlg.js
-share/hotot/js/ui.add_to_list_dlg.js
 share/hotot/js/ui.action_menu.js
+share/hotot/js/ui.add_to_list_dlg.js
 share/hotot/js/ui.context_menu.js
 share/hotot/js/ui.dm_tabs.js
 share/hotot/js/ui.error_dlg.js
@@ -185,15 +204,16 @@ share/hotot/js/ui.status_box.js
 share/hotot/js/ui.template.js
 share/hotot/js/ui.trending_topicsview.js
 share/hotot/js/ui.welcome.js
-share/hotot/js/widget.autocomplete.js
-share/hotot/js/widget.scrollbar.coffee
 share/hotot/js/util.js
+share/hotot/js/widget.autocomplete.js
 share/hotot/js/widget.bubble.js
 share/hotot/js/widget.button.js
 share/hotot/js/widget.dialog.js
 share/hotot/js/widget.listview.js
 share/hotot/js/widget.radio_group.js
+share/hotot/js/widget.scrollbar.coffee
 share/hotot/js/widget.scrollbar.js
+share/hotot/manifest.json
 share/hotot/sound/notify.wav
 share/hotot/theme/Bare/info.json
 share/hotot/theme/Bare/preview.png
@@ -212,16 +232,14 @@ share/hotot/theme/Iron Heart/style.css
 share/hotot/theme/New Hope/info.json
 share/hotot/theme/New Hope/preview.png
 share/hotot/theme/New Hope/style.css
-share/hotot/background.html
-share/hotot/manifest.json
-share/icons/hicolor/scalable/status/hotot_qt-inactive.svg
-share/icons/hicolor/scalable/status/hotot_qt-active.svg
+share/icons/hicolor/128x128/apps/hotot.png
 share/icons/hicolor/22x22/apps/hotot.png
 share/icons/hicolor/24x24/apps/hotot.png
 share/icons/hicolor/32x32/apps/hotot.png
 share/icons/hicolor/48x48/apps/hotot.png
 share/icons/hicolor/64x64/apps/hotot.png
-share/icons/hicolor/128x128/apps/hotot.png
+share/icons/hicolor/scalable/status/hotot_qt-active.svg
+share/icons/hicolor/scalable/status/hotot_qt-inactive.svg
 share/locale/ca/LC_MESSAGES/hotot.mo
 share/locale/de_DE/LC_MESSAGES/hotot.mo
 share/locale/es_ES/LC_MESSAGES/hotot.mo
@@ -236,10 +254,10 @@ share/locale/tr_TR/LC_MESSAGES/hotot.mo
 share/locale/zh_CN/LC_MESSAGES/hotot.mo
 share/locale/zh_TW/LC_MESSAGES/hotot.mo
 @dirrmtry share/locale/tr_TR/LC_MESSAGES
-@dirrmtry share/locale/it_IT/LC_MESSAGES
-@dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/tr_TR
+@dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
+@dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
 @dirrm share/hotot/theme/New Hope
 @dirrm share/hotot/theme/Iron Heart
@@ -266,6 +284,7 @@ share/locale/zh_TW/LC_MESSAGES/hotot.mo
 @dirrm share/hotot/ext/org.hotot.stat
 @dirrm share/hotot/ext/org.hotot.shorturl
 @dirrm share/hotot/ext/org.hotot.sample
+@dirrm share/hotot/ext/org.hotot.imghp
 @dirrm share/hotot/ext/org.hotot.gmap
 @dirrm share/hotot/ext/org.hotot.expandurls
 @dirrm share/hotot/ext/org.hotot.cfw