Update swift to 3.0.

we are pleased to announce the availability of Swift 3.0, an XMPP client
focused on usability and security.
It is our first release for 3 years and includes bug fixes and new features
like:
- File-transfer using Jingle File Transfer
- Simple continuation of 1-to-1 chats in group chats
- Keyword highlighting ( http://swift.im/blog/keyword-highlighting )
- Simple blocking of contacts using Blocking Command
- Compact roster setting that hides avatars and status messages
- Quick contact search filter in roster
- and more.

For the full changelog see https://swift.im/docs/changelog-3-0.html .

10 files changed, 33 insertions, 105 deletions

diff --git a/chat/swift/Makefile b/chat/swift/Makefile
index 84856055d1a..73ad663e8be 100644
--- a/chat/swift/Makefile
+++ b/chat/swift/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2015/04/25 14:20:28 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2016/03/01 13:25:01 wiz Exp $
 
-DISTNAME=	swift-2.0
-PKGREVISION=	6
+DISTNAME=	swift-3.0
 CATEGORIES=	chat
-MASTER_SITES=	http://swift.im/downloads/releases/swift-2.0/
+MASTER_SITES=	http://swift.im/downloads/releases/${DISTNAME}/
 
 MAINTAINER=	eric@cirr.com
 HOMEPAGE=	http://swift.im/
@@ -23,9 +22,12 @@ SUBST_SED.path+=	-e "s,/usr/local/share/,${PREFIX}/share/,"
 SUBST_FILES.path+=	SwifTools/Application/UnixApplicationPathProvider.cpp
 SUBST_MESSAGE.path=	Fixing path to support files.
 
+MAKE_ENV+=		qt5=1
+
 do-configure:
 	cd ${WRKSRC} ; \
 	${ECHO} "qt=\"${QTDIR}\"" > config.py ;\
+	${ECHO} "qt5=1" >> config.py ;\
 	${ECHO} "linkflags=\"-L${PREFIX}/lib -Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib\"" >> config.py ; \
 	${ECHO} "allow_warnings=\"true\"" >> config.py ;
 
@@ -45,7 +47,9 @@ do-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/swift/PLIST b/chat/swift/PLIST
index ee16a427f87..e6b479e5cc2 100644
--- a/chat/swift/PLIST
+++ b/chat/swift/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/04/26 13:19:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/03/01 13:25:01 wiz Exp $
 bin/swift-im
 bin/swift-open-uri
 man/man1/swift-im.1
@@ -13,6 +13,7 @@ share/icons/hicolor/scalable/apps/swift.svg
 share/pixmaps/swift.xpm
 share/swift/sounds/message-received.wav
 share/swift/translations/swift_ca.qm
+share/swift/translations/swift_cs.qm
 share/swift/translations/swift_de.qm
 share/swift/translations/swift_en.qm
 share/swift/translations/swift_es.qm
diff --git a/chat/swift/distinfo b/chat/swift/distinfo
index eb818eee92b..0606adb0230 100644
--- a/chat/swift/distinfo
+++ b/chat/swift/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:20:24 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/03/01 13:25:01 wiz Exp $
 
-SHA1 (swift-2.0.tar.gz) = b04ba098fffb1edc2ef0215957371c249458f0be
-RMD160 (swift-2.0.tar.gz) = f1e8f38e650a3178e236ec8d6f3cb97fecb4910d
-SHA512 (swift-2.0.tar.gz) = 852304b330cbdae1550101de3fa8932ba525497abd86a1fe81e65ba56ba7412ce7f5795a2c0023b87c7a77e84a0f9405a8e77fab79d55d76bece55fa7f983946
-Size (swift-2.0.tar.gz) = 8816954 bytes
-SHA1 (patch-BuildTools_SCons_SConscript.boot) = dadfab9a521d9ef1c1e5de0a8bec080d0a7b3e63
-SHA1 (patch-BuildTools_SCons_SConstruct) = 3a6bc4e3a931c8fa0e299edac65c3e8101f661bc
-SHA1 (patch-BuildTools_SCons_Tools_qt4.py) = 9c1f20a0dae15f73db02bbfe0d11e077176f2fcc
-SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp) = 1bb39d5b89bbd0d1d77c8cda7db55c3fbec066b8
-SHA1 (patch-Swiften_EventLoop_EventLoop.cpp) = a840ad43cd5082c3f511c6efd1a49e910c3fb6ea
-SHA1 (patch-Swiften_Serializer_StreamResumeSerializer.cpp) = 6db493f2bb45caf686289e2b93d204627e27abea
-SHA1 (patch-Swiften_Serializer_StreamResumedSerializer.cpp) = da36fb7f97c8b61092745733f79360deb7cc9820
+SHA1 (swift-3.0.tar.gz) = 2bafacd9cfffea1044bc8ff6b3547c771aa5547c
+RMD160 (swift-3.0.tar.gz) = 7b25e3655855f18446e0fb5053f37f490f68bda3
+SHA512 (swift-3.0.tar.gz) = 3d635e9a904a48a8553e153627242e44fad5d57c48152d3c698cdf73363bdc1c566a13692c7fb2d70f0f6b773f7ff9c2cd717687501940e3b8a30b6bebc44f63
+Size (swift-3.0.tar.gz) = 11084214 bytes
+SHA1 (patch-BuildTools_SCons_SConscript.boot) = f134f01b73e6862171c432c76088947d616c6d3d
+SHA1 (patch-BuildTools_SCons_SConstruct) = a2d68e60a41ea74ad753b17f97c7887cbd458c46
diff --git a/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot b/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot
index 9895201c245..3ea4df64d24 100644
--- a/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot
+++ b/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot
@@ -1,16 +1,19 @@
-$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.1 2014/12/12 10:50:49 joerg Exp $
+$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.2 2016/03/01 13:25:01 wiz Exp $
 
---- BuildTools/SCons/SConscript.boot.orig	2014-12-11 23:47:38.000000000 +0000
+Don't strip environment so pkgsrc settings survive.
+
+--- BuildTools/SCons/SConscript.boot.orig	2015-07-22 14:04:23.000000000 +0000
 +++ BuildTools/SCons/SConscript.boot
-@@ -65,10 +65,7 @@ vars.Add(BoolVariable("set_iterator_debu
+@@ -106,11 +106,7 @@ vars.Add(BoolVariable("install_git_hooks
  # Set up default build & configure environment
  ################################################################################
  
 -env_ENV = {
--  'PATH' : os.environ['PATH'], 
--  'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
+-	'PATH' : os.environ['PATH'],
+-	'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
+-	'TERM' : os.environ.get("TERM", ""),
 -}
 +env_ENV = os.environ
+ 
  if "MSVC_VERSION" in ARGUMENTS :
-   env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"])
- else :
+ 	env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None))
diff --git a/chat/swift/patches/patch-BuildTools_SCons_SConstruct b/chat/swift/patches/patch-BuildTools_SCons_SConstruct
index dd1710cdefe..3157af6ce31 100644
--- a/chat/swift/patches/patch-BuildTools_SCons_SConstruct
+++ b/chat/swift/patches/patch-BuildTools_SCons_SConstruct
@@ -1,4 +1,6 @@
-$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.1 2014/12/12 10:50:49 joerg Exp $
+$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.2 2016/03/01 13:25:01 wiz Exp $
+
+Don't strip environment so pkgsrc settings survive.
 
 --- BuildTools/SCons/SConstruct.orig	2014-12-11 23:38:09.000000000 +0000
 +++ BuildTools/SCons/SConstruct
diff --git a/chat/swift/patches/patch-BuildTools_SCons_Tools_qt4.py b/chat/swift/patches/patch-BuildTools_SCons_Tools_qt4.py
deleted file mode 100644
index 1fda8cdc179..00000000000
--- a/chat/swift/patches/patch-BuildTools_SCons_Tools_qt4.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-BuildTools_SCons_Tools_qt4.py,v 1.1 2014/04/26 11:41:46 wiz Exp $
-
-Handle NetBSD like Linux.
-
---- BuildTools/SCons/Tools/qt4.py.orig	2012-12-22 12:23:58.000000000 +0000
-+++ BuildTools/SCons/Tools/qt4.py
-@@ -448,7 +448,7 @@ def enable_modules(self, modules, debug=
- 		except: pass
- 	debugSuffix = ''
- 
--	if sys.platform.startswith("linux") and not crosscompiling :
-+	if (sys.platform.startswith("linux") or sys.platform.startswith("netbsd")) and not crosscompiling :
- 		if debug : debugSuffix = '_debug'
- 		self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")])
- 		for module in modules :
diff --git a/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp b/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp
deleted file mode 100644
index a6a5182faa5..00000000000
--- a/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp,v 1.1 2014/09/19 07:05:24 wiz Exp $
-
-Fix build with boost-1.56.0. From upstream git.
-
---- Swift/QtUI/UserSearch/QtUserSearchWindow.cpp.orig	2012-12-22 12:23:58.000000000 +0000
-+++ Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
-@@ -221,7 +221,7 @@ void QtUserSearchWindow::setSearchFields
- 		fieldsPage_->setFormWidget(new QtFormWidget(fields->getForm(), fieldsPage_));
- 	} else {
- 		fieldsPage_->setFormWidget(NULL);
--		bool enabled[8] = {fields->getNick(), fields->getNick(), fields->getFirst(), fields->getFirst(), fields->getLast(), fields->getLast(), fields->getEMail(), fields->getEMail()};
-+		bool enabled[8] = {!!fields->getNick(), !!fields->getNick(), !!fields->getFirst(), !!fields->getFirst(), !!fields->getLast(), !!fields->getLast(), !!fields->getEMail(), !!fields->getEMail()};
- 		QWidget* legacySearchWidgets[8] = {fieldsPage_->nickInputLabel_, fieldsPage_->nickInput_, fieldsPage_->firstInputLabel_, fieldsPage_->firstInput_, fieldsPage_->lastInputLabel_, fieldsPage_->lastInput_, fieldsPage_->emailInputLabel_, fieldsPage_->emailInput_};
- 		for (int i = 0; i < 8; i++) {
- 			legacySearchWidgets[i]->setVisible(enabled[i]);
diff --git a/chat/swift/patches/patch-Swiften_EventLoop_EventLoop.cpp b/chat/swift/patches/patch-Swiften_EventLoop_EventLoop.cpp
deleted file mode 100644
index 5f302c11347..00000000000
--- a/chat/swift/patches/patch-Swiften_EventLoop_EventLoop.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Swiften_EventLoop_EventLoop.cpp,v 1.1 2014/04/26 11:41:46 wiz Exp $
-
-Added missing lock_guard include.
-Change-Id: I1ea6c42292b7c3b5f0ecdc1395b9c8e8cf17a6b9
-
-http://swift.im/git/swift/commit/?h=swift-2.x&id=e4a3c018fe824c0c402dbc3167a113276fbe6e4e
-
---- Swiften/EventLoop/EventLoop.cpp.orig	2012-12-22 12:23:59.000000000 +0000
-+++ Swiften/EventLoop/EventLoop.cpp
-@@ -10,6 +10,7 @@
- #include <boost/bind.hpp>
- #include <iostream>
- #include <cassert>
-+#include <boost/thread/locks.hpp>
- 
- #include <Swiften/Base/Log.h>
- 
diff --git a/chat/swift/patches/patch-Swiften_Serializer_StreamResumeSerializer.cpp b/chat/swift/patches/patch-Swiften_Serializer_StreamResumeSerializer.cpp
deleted file mode 100644
index fb8a5146ba2..00000000000
--- a/chat/swift/patches/patch-Swiften_Serializer_StreamResumeSerializer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Swiften_Serializer_StreamResumeSerializer.cpp,v 1.1 2014/09/19 07:05:24 wiz Exp $
-
-Fix build with boost-1.56.0. From upstream git.
-
---- Swiften/Serializer/StreamResumeSerializer.cpp.orig	2012-12-22 12:23:59.000000000 +0000
-+++ Swiften/Serializer/StreamResumeSerializer.cpp
-@@ -22,7 +22,7 @@ SafeByteArray StreamResumeSerializer::se
- 	XMLElement element("resume", "urn:xmpp:sm:2");
- 	element.setAttribute("previd", e->getResumeID());
- 	if (e->getHandledStanzasCount()) {
--		element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount()));
-+		element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount().get()));
- 	}
- 	return createSafeByteArray(element.serialize());
- }
diff --git a/chat/swift/patches/patch-Swiften_Serializer_StreamResumedSerializer.cpp b/chat/swift/patches/patch-Swiften_Serializer_StreamResumedSerializer.cpp
deleted file mode 100644
index b12987904d2..00000000000
--- a/chat/swift/patches/patch-Swiften_Serializer_StreamResumedSerializer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Swiften_Serializer_StreamResumedSerializer.cpp,v 1.1 2014/09/19 07:05:24 wiz Exp $
-
-Fix build with boost-1.56.0. From upstream git.
-
---- Swiften/Serializer/StreamResumedSerializer.cpp.orig	2012-12-22 12:23:59.000000000 +0000
-+++ Swiften/Serializer/StreamResumedSerializer.cpp
-@@ -22,7 +22,7 @@ SafeByteArray StreamResumedSerializer::s
- 	XMLElement element("resumed", "urn:xmpp:sm:2");
- 	element.setAttribute("previd", e->getResumeID());
- 	if (e->getHandledStanzasCount()) {
--		element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount()));
-+		element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount().get()));
- 	}
- 	return createSafeByteArray(element.serialize());
- }