Merge branch 'master' into gnome-3.24

14 files changed, 75 insertions, 68 deletions

diff --git a/net-im/corebird/Makefile b/net-im/corebird/Makefile
index 559db4c7ff89..23796f76fc19 100644
--- a/net-im/corebird/Makefile
+++ b/net-im/corebird/Makefile
@@ -33,7 +33,7 @@ OPTIONS_SUB=		yes
 
 GSTREAMER_LIB_DEPENDS=		libgstbase-1.0.so:multimedia/gstreamer1 \
 				libgstreamer-1.0.so:multimedia/gstreamer1
-GSTREAMER_USE=			gstreamer1=yes,bad,good,gtksink,hls,libav,soup,x,ximagesrc
+GSTREAMER_USE=			gstreamer1=yes,bad,good,gtk,hls,libav,soup,x,ximagesrc
 GSTREAMER_CONFIGURE_OFF=	--disable-video
 
 NLS_USES=			gettext
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 609b5c89ef45..12dcf83341bd 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ejabberd
 PORTVERSION=	17.07
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
 		http://distfiles.pirateparty.in/ashish/:deps \
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index a467eb736281..4b8214b1adbe 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -1,4 +1,4 @@
---- ejabberdctl.template.orig	2017-07-10 09:25:01 UTC
+--- ejabberdctl.template.orig	2017-07-15 11:43:57 UTC
 +++ ejabberdctl.template
 @@ -49,8 +49,8 @@ done
  
@@ -11,8 +11,22 @@
  : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml}
  : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg}
  [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
-@@ -72,7 +72,8 @@ if [ "$INET_DIST_INTERFACE" != "" ] ; th
-         ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\""
+@@ -62,17 +62,18 @@ done
+ # define erl parameters
+ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
+ if [ "$FIREWALL_WINDOW" != "" ] ; then
+-    ERLANG_OPTS="$ERLANG_OPTS -kernel " \
+-        "inet_dist_listen_min ${FIREWALL_WINDOW%-*} " \
+-        "inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
++    ERLANG_OPTS="$ERLANG_OPTS -kernel \
++        inet_dist_listen_min ${FIREWALL_WINDOW%-*} \
++        inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
+ fi
+ if [ "$INET_DIST_INTERFACE" != "" ] ; then
+     INET_DIST_INTERFACE2=$("$ERL" -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt)
+     if [ "$INET_DIST_INTERFACE2" != "" ] ; then
+-        ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\""
++        ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
      fi
  fi
 -ERL_LIBS={{libdir}}
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index 0ba3fe3bec18..8618ea5e61de 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im www
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -55,7 +55,7 @@ RUN_DEPENDS+=	rubygem-addressable>0:www/rubygem-addressable \
 		rubygem-pundit>0:security/rubygem-pundit \
 		rubygem-rabl>0:devel/rubygem-rabl \
 		rubygem-rack-attack>0:www/rubygem-rack-attack \
-		rubygem-rack-cors>0:www/rubygem-rack-cors \
+		rubygem-rack-cors0>0:www/rubygem-rack-cors0 \
 		rubygem-rack-timeout>0:www/rubygem-rack-timeout \
 		rubygem-rails-i18n>0:devel/rubygem-rails-i18n \
 		rubygem-rails-settings-cached-rails5>0:www/rubygem-rails-settings-cached-rails5 \
diff --git a/net-im/oysttyer/Makefile b/net-im/oysttyer/Makefile
index 3ac7a27d23b3..7969590f6d52 100644
--- a/net-im/oysttyer/Makefile
+++ b/net-im/oysttyer/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	oysttyer
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.9.0
 CATEGORIES=	net-im
 
 MAINTAINER=	pi@FreeBSD.org
diff --git a/net-im/oysttyer/distinfo b/net-im/oysttyer/distinfo
index 28b3d3b0760f..d42c6e96c717 100644
--- a/net-im/oysttyer/distinfo
+++ b/net-im/oysttyer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476996862
-SHA256 (oysttyer-oysttyer-2.8.1_GH0.tar.gz) = 7e3842aeba7a9aefbddf9782b49e0f1ed27e00a197d97614e67dbbc28ed8991a
-SIZE (oysttyer-oysttyer-2.8.1_GH0.tar.gz) = 106307
+TIMESTAMP = 1500489191
+SHA256 (oysttyer-oysttyer-2.9.0_GH0.tar.gz) = 0d8ec6bd10674f805552c8d77fa26bf491613f318fa8481e3dc714660887e6e0
+SIZE (oysttyer-oysttyer-2.9.0_GH0.tar.gz) = 107245
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 1af2400e3e72..5fafe789725e 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qTox
-PORTVERSION=	1.10.2
+PORTVERSION=	1.11.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im net-p2p
 
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libtoxcore.so:net-im/tox \
 		libavcodec.so:multimedia/ffmpeg \
 		libvpx.so:multimedia/libvpx \
 		libfilteraudio.so:audio/libfilteraudio \
+		libopus.so:audio/opus \
 		libsodium.so:security/libsodium \
 		libqrencode.so:graphics/libqrencode \
 		libsqlcipher.so:databases/sqlcipher \
@@ -29,19 +30,22 @@ GH_ACCOUNT=	qTox
 
 SUB_FILES=	pkg-message
 
-USES=		compiler:c++11-lib desktop-file-utils gettext gmake openal:soft pkgconfig qmake
+USES=		compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig cmake
 USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
 USE_XORG=	x11 xscrnsaver
 USE_GL=		gl
-USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg \
+USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg testlib \
 		concurrent buildtools_build linguisttools_build
+# bug#220813: qmake isn't needed, but the build fails without qmake_build
+USE_QT5+=	qmake_build
+CMAKE_ARGS=	-DGIT_DESCRIBE:STRING=${FULLVERSION}
 INSTALLS_ICONS=	yes
 ICON_SIZES=	14x14 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512
-QMAKE_ARGS=	FREEBSD_PKGVERSION=${FULLVERSION}
 
 PLIST_FILES=	bin/qtox \
 		share/applications/qtox.desktop \
-		share/icons/hicolor/scalable/apps/qtox.svgz
+		share/icons/hicolor/scalable/apps/qtox.svgz \
+		share/appdata/qTox.appdata.xml
 .for SZ in ${ICON_SIZES}
 PLIST_FILES+=	share/icons/hicolor/${SZ}/apps/qtox.png
 .endfor
@@ -64,20 +68,16 @@ pre-everything::
 	@${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!"
 	@${ECHO_MSG}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_TAGNAME}"|' \
-			-e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "${LOCALBASE}/include|' \
-			-e 's|INCLUDEPATH += "/usr/lib64|INCLUDEPATH += "${LOCALBASE}/lib|' \
-			-e 's|INCLUDEPATH += "/usr/lib|INCLUDEPATH += "${LOCALBASE}/lib|' \
-			${WRKSRC}/qtox.pro
-
 pre-configure:
 	@${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \
 		${WRKSRC}/qtox.desktop
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	@${GZIP_CMD} < ${WRKSRC}/img/icons/qtox.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svgz
+	@${GZIP_CMD} \
+		< ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svg \
+		> ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svgz
+	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svg
 .for SZ in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps
 	${INSTALL_DATA} ${WRKSRC}/img/icons/${SZ}/qtox.png \
diff --git a/net-im/qTox/distinfo b/net-im/qTox/distinfo
index 8eef16ccd24f..30d95b4444e2 100644
--- a/net-im/qTox/distinfo
+++ b/net-im/qTox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496411551
-SHA256 (qTox-qTox-v1.10.2_GH0.tar.gz) = 1709ba412149781fc922c0807fddbf36af355e59a8cb4454b568fa739b2a5e80
-SIZE (qTox-qTox-v1.10.2_GH0.tar.gz) = 3647721
+TIMESTAMP = 1500321399
+SHA256 (qTox-qTox-v1.11.0_GH0.tar.gz) = be38517cd915727dbd9b3cd2a51bbaf1cae28290de07a34c759ec8b77c502cd4
+SIZE (qTox-qTox-v1.11.0_GH0.tar.gz) = 3946782
diff --git a/net-im/qTox/files/patch-CMakeLists.txt b/net-im/qTox/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..54cc71e4c655
--- /dev/null
+++ b/net-im/qTox/files/patch-CMakeLists.txt
@@ -0,0 +1,26 @@
+--- CMakeLists.txt.orig	2017-07-16 12:33:33 UTC
++++ CMakeLists.txt
+@@ -16,15 +16,15 @@ endif()
+ set(ENV{PKG_CONFIG_PATH}
+   ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig:/opt/ffmpeg/lib/pkgconfig:$ENV{PKG_CONFIG_PATH})
+ 
+-execute_process(
+-  COMMAND brew --prefix qt5
+-  OUTPUT_VARIABLE QT_PREFIX_PATH
+-  OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(
++#  COMMAND brew --prefix qt5
++#  OUTPUT_VARIABLE QT_PREFIX_PATH
++#  OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+-execute_process(
+-  COMMAND xcode-select -p
+-  OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+-  OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(
++#  COMMAND xcode-select -p
++#  OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
++#  OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
+ set(CMAKE_OSX_SYSROOT
diff --git a/net-im/qTox/files/patch-qtox.pro b/net-im/qTox/files/patch-qtox.pro
deleted file mode 100644
index ede10dde2a65..000000000000
--- a/net-im/qTox/files/patch-qtox.pro
+++ /dev/null
@@ -1,32 +0,0 @@
---- qtox.pro.orig	2017-01-29 12:48:48 UTC
-+++ qtox.pro
-@@ -75,11 +75,11 @@ include(translations/i18n.pri)
- system($$fromfile(translations/i18n.pri, updateallqm))
- 
- isEmpty(GIT_VERSION) {
--    GIT_VERSION = $$system(git rev-parse HEAD 2> /dev/null || echo "built without git")
-+    GIT_VERSION = $$system(echo "n/a")
- }
- DEFINES += GIT_VERSION=\"\\\"$$quote($$GIT_VERSION)\\\"\"
- isEmpty(GIT_DESCRIBE) {
--    GIT_DESCRIBE = $$system(git describe --tags 2> /dev/null || echo "Nightly")
-+    GIT_DESCRIBE = $$FREEBSD_PKGVERSION
- }
- DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"
- # date works on linux/mac, but it would hangs qmake on windows
-@@ -663,3 +663,15 @@ SOURCES += \
-     src/widget/tool/toolboxgraphicsitem.cpp \
-     src/widget/translator.cpp \
-     src/widget/widget.cpp
-+
-+unix {
-+    target.path  = $$PREFIX/bin
-+
-+    desktop.files = qtox.desktop
-+    desktop.path = $$PREFIX/share/applications
-+
-+    icon.files = img/qtox.png
-+    icon.path = $$PREFIX/share/pixmaps
-+
-+    INSTALLS = target desktop icon
-+}
diff --git a/net-im/qTox/files/patch-src_main.cpp b/net-im/qTox/files/patch-src_main.cpp
index 107da48094ef..7c344c1cbe58 100644
--- a/net-im/qTox/files/patch-src_main.cpp
+++ b/net-im/qTox/files/patch-src_main.cpp
@@ -1,7 +1,7 @@
---- src/main.cpp.orig	2017-01-29 12:48:48 UTC
+--- src/main.cpp.orig	2017-07-16 12:33:33 UTC
 +++ src/main.cpp
-@@ -317,3 +317,10 @@ int main(int argc, char *argv[])
- #endif
+@@ -322,3 +322,10 @@ int main(int argc, char* argv[])
+     delete a;
      return errorcode;
  }
 +
diff --git a/net-im/rubygem-termtter/Makefile b/net-im/rubygem-termtter/Makefile
index 2659d42aa842..52b99e9f66a6 100644
--- a/net-im/rubygem-termtter/Makefile
+++ b/net-im/rubygem-termtter/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	termtter
-PORTVERSION=	2.2.6
-PORTREVISION=	3
+PORTVERSION=	2.2.8
 CATEGORIES=	net-im rubygems
 MASTER_SITES=	RG
 
diff --git a/net-im/rubygem-termtter/distinfo b/net-im/rubygem-termtter/distinfo
index a24af5f42f96..14eeedb179de 100644
--- a/net-im/rubygem-termtter/distinfo
+++ b/net-im/rubygem-termtter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480768484
-SHA256 (rubygem/termtter-2.2.6.gem) = 6dd4c45d70347b0e0cce3851c51f761002b94a981516748cba55c5bec69314ef
-SIZE (rubygem/termtter-2.2.6.gem) = 1506304
+TIMESTAMP = 1500142581
+SHA256 (rubygem/termtter-2.2.8.gem) = 65f35477c89754ee71882287750de2cdd8cbed55b9f250a7cacb155a321e5d6c
+SIZE (rubygem/termtter-2.2.8.gem) = 1506304
diff --git a/net-im/rubygem-termtter/pkg-descr b/net-im/rubygem-termtter/pkg-descr
index 07050df76ba1..24aa70379ac0 100644
--- a/net-im/rubygem-termtter/pkg-descr
+++ b/net-im/rubygem-termtter/pkg-descr
@@ -1,3 +1,3 @@
 Termtter is a Terminal based Twitter client.
 
-WWW: http://termtter.github.io/
+WWW: https://termtter.github.io/