From owner-svn-ports-all@FreeBSD.ORG  Thu Apr  3 11:26:46 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 82B94A25;
 Thu,  3 Apr 2014 11:26:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E5E7F11;
 Thu,  3 Apr 2014 11:26:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33BQkX1042858;
 Thu, 3 Apr 2014 11:26:46 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33BQkTk042856;
 Thu, 3 Apr 2014 11:26:46 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201404031126.s33BQkTk042856@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 3 Apr 2014 11:26:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350000 - in head/net-im/hotot: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 11:26:46 -0000

Author: danfe
Date: Thu Apr  3 11:26:45 2014
New Revision: 350000
URL: http://svnweb.freebsd.org/changeset/ports/350000
QAT: https://qat.redports.org/buildarchive/r350000/

Log:
  Backport a fix from upstream for HTTP code 406 when doing search, and also
  stagify the port.
  
  PR:	ports/184981

Added:
  head/net-im/hotot/files/patch-903e3c3   (contents, props changed)
Modified:
  head/net-im/hotot/Makefile

Modified: head/net-im/hotot/Makefile
==============================================================================
--- head/net-im/hotot/Makefile	Thu Apr  3 11:26:23 2014	(r349999)
+++ head/net-im/hotot/Makefile	Thu Apr  3 11:26:45 2014	(r350000)
@@ -3,6 +3,7 @@
 
 PORTNAME=	hotot
 PORTVERSION=	0.9.8.14
+PORTREVISION=	1
 CATEGORIES=	net-im www
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -26,7 +27,6 @@ OPTIONS_DEFINE=	GTK2 QT4 KDE4
 OPTIONS_DEFAULT=	GTK2 QT4
 KDE4_DESC=	KDE 4 integration (implies Qt 4)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
@@ -66,7 +66,5 @@ post-patch:
 # Sanitize font selection list
 	@${REINPLACE_CMD} -e "/font_list/s/\[.*/['DejaVu Sans', 'Bitstream Vera Sans', 'Droid Sans', 'Verdana', 'Arial', 'Helvetica']/" \
 		${WRKSRC}/data/js/conf.js
-# Remove stale backup files (prevent pkg-plist pollution)
-	@${FIND} ${WRKSRC} -type f -name '*.bak' -delete
 
 .include <bsd.port.mk>

Added: head/net-im/hotot/files/patch-903e3c3
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/hotot/files/patch-903e3c3	Thu Apr  3 11:26:45 2014	(r350000)
@@ -0,0 +1,123 @@
+diff --git a/data/index.html b/data/index.html
+index 2565030..37f564c 100644
+--- data/index.html
++++ data/index.html
+@@ -905,11 +905,11 @@ <h3 data-i18n-text="api_setting">API Settings</h3>
+ 							<label class="label" data-i18n-text="oauth_base"
+ 									>OAuth Base</label>
+ 						</li><li class="mochi_list_item">
+-							<input id="tbox_prefs_search_api_base2"
++							<input id="tbox_prefs_search_api_base3"
+ 									title="Search API Base"
+ 									type="text" class="mochi_entry widget"/>
+ 							<label class="label"
+-									data-i18n-text="search_api_base2"
++									data-i18n-text="search_api_base3"
+ 									>Search API Base</label>
+ 						</li><li class="mochi_list_item">
+ 							<input id="tbox_prefs_upload_api_base"
+diff --git a/data/js/conf.js b/data/js/conf.js
+index 559bc03..f251dab 100644
+--- data/js/conf.js
++++ data/js/conf.js
+@@ -78,6 +78,7 @@ default_prefs: {
+         , 'sign_oauth_base': 'https://api.twitter.com/oauth/'
+         , 'use_same_sign_oauth_base': true
+         , 'search_api_base2': 'https://twitter.com/phoenix_search.phoenix'
++        , 'search_api_base3': 'https://api.twitter.com/1.1/search/tweets.json'
+         , 'upload_api_base': 'https://upload.twitter.com/1/'
+           // extensions and others
+         , 'exts_enabled': ["org.hotot.imagepreview", "org.hotot.gmap", "org.hotot.translate", "org.hotot.imageupload", "org.hotot.videopreview", "org.hotot.shorturl", "org.hotot.cfw"]
+@@ -126,7 +127,7 @@ default_prefs: {
+         , 'oauth_base': 'https://identi.ca/api/oauth/'
+         , 'sign_oauth_base': 'https://identi.ca/api/oauth/'
+         , 'use_same_sign_oauth_base': true
+-        , 'search_api_base2': 'https://identi.ca/api/'
++        , 'search_api_base3': 'https://identi.ca/api/'
+         , 'upload_api_base': 'https://identi.ca/api/'
+           // extensions:
+         , 'exts_enabled': ["org.hotot.imagepreview", "org.hotot.gmap", "org.hotot.translate", "org.hotot.imageupload", "org.hotot.videopreview", "org.hotot.shorturl", "org.hotot.cfw"]
+@@ -326,7 +327,7 @@ function apply_prefs(name, full) {
+         }
+     })(prefs.api_base);
+     globals.twitterClient.sign_api_base = prefs.sign_api_base;
+-    globals.twitterClient.search_api_base2 = prefs.search_api_base2;
++    globals.twitterClient.search_api_base3 = prefs.search_api_base3;
+     globals.twitterClient.upload_api_base = prefs.upload_api_base;
+     globals.twitterClient.use_same_sign_api_base = prefs.use_same_sign_api_base;
+     var oauth = globals.twitterClient.oauth;
+diff --git a/data/js/lib.twitter.js b/data/js/lib.twitter.js
+index 91ff50f..96da74f 100644
+--- data/js/lib.twitter.js
++++ data/js/lib.twitter.js
+@@ -10,7 +10,7 @@ function TwitterClient() {
+     self.password = '';
+     self.api_base = 'https://api.twitter.com/';
+     self.sign_api_base = 'https://api.twitter.com/';
+-    self.search_api_base2 = 'https://twitter.com/phoenix_search.phoenix';
++    self.search_api_base3 = 'https://api.twitter.com/1.1/search/tweets.json';
+     self.upload_api_base = 'https://upload.twitter.com/1/';
+ 
+     self.use_same_sign_api_base = true;
+@@ -764,7 +764,7 @@ function TwitterClient() {
+     };
+ 
+     self.search = function search(query, page, since_id, max_id, on_success, on_error) {
+-        var url = self.search_api_base2;
++        var url = self.search_api_base3;
+         if (url == 'https://twitter.com/phoenix_search.phoenix') {
+             var params = {
+                 'q': query
+@@ -786,9 +786,10 @@ function TwitterClient() {
+             var params = {
+                 'q': query
+             };
+-            if (since_id != null) params['since_id'] = since_id;
++            params['count'] = 100;
++            params['include_entities'] = 'true';
++            params['result_type'] = 'recent';
+             if (max_id != null) params['max_id'] = max_id;
+-            if (page != null) params['page'] = page;
+             self.source = '';
+             self.get(url, params, on_success, on_error);
+             self.source = 'Hotot';
+diff --git a/data/js/ui.prefs_dlg.js b/data/js/ui.prefs_dlg.js
+index 22a8be4..287ae99 100644
+--- data/js/ui.prefs_dlg.js
++++ data/js/ui.prefs_dlg.js
+@@ -323,7 +323,7 @@ function load_prefs() {
+         .prop('checked', prefs.enable_gpu_acceleration);
+     $('#tbox_prefs_api_base').val(prefs.api_base);
+     $('#tbox_prefs_sign_api_base').val(prefs.sign_api_base);
+-    $('#tbox_prefs_search_api_base2').val(prefs.search_api_base2);
++    $('#tbox_prefs_search_api_base3').val(prefs.search_api_base3);
+     $('#tbox_prefs_upload_api_base').val(prefs.upload_api_base);
+     $('#tbox_prefs_oauth_base').val(prefs.oauth_base);
+     $('#tbox_prefs_sign_oauth_base').val(prefs.sign_oauth_base);
+@@ -393,8 +393,8 @@ function save_prefs() {
+         = $('#tbox_prefs_api_base').attr('value');
+     prefs.sign_api_base
+         = $('#tbox_prefs_sign_api_base').attr('value');
+-    prefs.search_api_base2
+-        = $('#tbox_prefs_search_api_base2').attr('value');
++    prefs.search_api_base3
++        = $('#tbox_prefs_search_api_base3').attr('value');
+     prefs.upload_api_base
+         = $('#tbox_prefs_upload_api_base').attr('value');
+     prefs.oauth_base
+diff --git a/data/js/ui.template.js b/data/js/ui.template.js
+index abec916..885175c 100644
+--- data/js/ui.template.js
++++ data/js/ui.template.js
+@@ -1388,9 +1388,9 @@ function (dataObj) {
+         }
+     } else {
+         if(now.diff(mobj, 'days', true) > 1) {
+-            time_str = mobj.format('MM-DD-YYYY HH:mm:ss');
++            time_str = mobj.format('YYYY-MM-DD HH:mm:ss');
+         } else {
+-            time_str = mobj.format('HH:mm:ss');
++            time_str = mobj.format('YYYY-MM-DD HH:mm:ss');
+         }
+     }
+