chat/psi: Update to 1.4.

New in 1.4
- Fixed reconnection on Stream Management resume failure
- Fixed compatibility with Qt >= 5.10
- Improved media contents previews for WebKit version (YouTube and files)
- CMake-based build fixes

New in 1.3
- Fixed connection to Openfire server
- Fixed connections by IP (fixes socks file transfer as well)
- Fixed compilation with new version of Enchant
- Fixed broken file transfer after reconnection
- Minor UI fixes

New in 1.2
- Removed AIM and MSN icons.
- Fixed debug build on Visual Studio.
- Font and windows sizes adjusted for regular fullhd displays.
- Fixed crashes online account remove and contact delete from another resource.
- History DB and dialog improvements.
- Fixed crash on unrecognized dictionary encodings in hunspell checker.
- Added option to disable previews in webkit builds.
- Fixed Youtube links recognition.

New in 1.1
- Fixed a few crashes. Seems to be pretty stable now.
- Contact list was rewritten once again.
- Improved stream management (no more disconnects).
- Better support for HIDPI displays.
- More Psi+ patches merged.
- JDNS was replaced with QDnsLookup for Qt5 builds.
- CMake support.
- A lot of minor UI fixes.

New in 1.0
- Almost all Psi+ patches were merged (a lot of features).
- Plugins support is enabled by default.

11 files changed, 287 insertions, 115 deletions

diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 8ff13d72f60..595afdde7e8 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.86 2018/07/18 00:06:11 joerg Exp $
+# $NetBSD: Makefile,v 1.87 2019/02/08 14:56:00 nia Exp $
 
-DISTNAME=	psi-0.15
-PKGREVISION=	10
+DISTNAME=	psi-1.4
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	schnoebe@NetBSD.org
 HOMEPAGE=	http://psi-im.org/
 COMMENT=	Psi XMPP/Jabber Client
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
+DEPENDS+=	qca2-qt5-ossl>=2.0.0beta3:../../security/qca2-qt5-ossl
 
 DIST_SUBDIR=	${DISTNAME}
 DISTFILES=	${DEFAULT_DISTFILES}
@@ -23,12 +22,13 @@ HAS_CONFIGURE=	yes
 
 CONFIG_SHELL=	${SH}
 
+CONFIGURE_ARGS+=	--qtselect=5
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--qtdir=${QTDIR}
 CONFIGURE_ARGS+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2}/lib
-CONFIGURE_ARGS+=	--with-qca-inc=${BUILDLINK_PREFIX.qca2}/include
+CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2-qt5}/lib
+CONFIGURE_ARGS+=	--with-qca-inc=${BUILDLINK_PREFIX.qca2-qt5}/include
 
 #
 # a group of scripts that aren't to be installed, and aren't used
@@ -74,7 +74,8 @@ post-install:
 
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/qca2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.7.0
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../security/qca2-qt5/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index cd05c87fafe..81ade4ef001 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,10 +1,125 @@
-@comment $NetBSD: PLIST,v 1.15 2012/12/07 23:52:09 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/02/08 14:56:01 nia Exp $
 bin/psi
+bin/psi.debug
 share/doc/psi/COPYING
 share/doc/psi/README
 share/psi/certs/README
 share/psi/certs/startcom_ca.crt
 share/psi/certs/startcom_ca_new.crt
+share/psi/client_icons.txt
+share/psi/iconsets/activities/default/doing_chores.png
+share/psi/iconsets/activities/default/doing_chores_buying_groceries.png
+share/psi/iconsets/activities/default/doing_chores_cleaning.png
+share/psi/iconsets/activities/default/doing_chores_cooking.png
+share/psi/iconsets/activities/default/doing_chores_doing_maintenance.png
+share/psi/iconsets/activities/default/doing_chores_doing_the_dishes.png
+share/psi/iconsets/activities/default/doing_chores_doing_the_laundry.png
+share/psi/iconsets/activities/default/doing_chores_gardening.png
+share/psi/iconsets/activities/default/doing_chores_running_an_errand.png
+share/psi/iconsets/activities/default/doing_chores_walking_the_dog.png
+share/psi/iconsets/activities/default/drinking.png
+share/psi/iconsets/activities/default/drinking_having_a_beer.png
+share/psi/iconsets/activities/default/drinking_having_coffee.png
+share/psi/iconsets/activities/default/drinking_having_tea.png
+share/psi/iconsets/activities/default/eating.png
+share/psi/iconsets/activities/default/eating_having_a_snack.png
+share/psi/iconsets/activities/default/eating_having_breakfast.png
+share/psi/iconsets/activities/default/eating_having_dinner.png
+share/psi/iconsets/activities/default/eating_having_lunch.png
+share/psi/iconsets/activities/default/exercising.png
+share/psi/iconsets/activities/default/exercising_cycling.png
+share/psi/iconsets/activities/default/exercising_dancing.png
+share/psi/iconsets/activities/default/exercising_hiking.png
+share/psi/iconsets/activities/default/exercising_jogging.png
+share/psi/iconsets/activities/default/exercising_playing_sports.png
+share/psi/iconsets/activities/default/exercising_running.png
+share/psi/iconsets/activities/default/exercising_skiing.png
+share/psi/iconsets/activities/default/exercising_swimming.png
+share/psi/iconsets/activities/default/exercising_working_out.png
+share/psi/iconsets/activities/default/grooming.png
+share/psi/iconsets/activities/default/grooming_at_the_spa.png
+share/psi/iconsets/activities/default/grooming_brushing_teeth.png
+share/psi/iconsets/activities/default/grooming_getting_a_haircut.png
+share/psi/iconsets/activities/default/grooming_shaving.png
+share/psi/iconsets/activities/default/grooming_taking_a_bath.png
+share/psi/iconsets/activities/default/grooming_taking_a_shower.png
+share/psi/iconsets/activities/default/having_appointment.png
+share/psi/iconsets/activities/default/icondef.xml
+share/psi/iconsets/activities/default/inactive.png
+share/psi/iconsets/activities/default/inactive_day_off.png
+share/psi/iconsets/activities/default/inactive_hanging_out.png
+share/psi/iconsets/activities/default/inactive_hiding.png
+share/psi/iconsets/activities/default/inactive_on_vacation.png
+share/psi/iconsets/activities/default/inactive_praying.png
+share/psi/iconsets/activities/default/inactive_scheduled_holiday.png
+share/psi/iconsets/activities/default/inactive_sleeping.png
+share/psi/iconsets/activities/default/inactive_thinking.png
+share/psi/iconsets/activities/default/relaxing.png
+share/psi/iconsets/activities/default/relaxing_fishing.png
+share/psi/iconsets/activities/default/relaxing_gaming.png
+share/psi/iconsets/activities/default/relaxing_going_out.png
+share/psi/iconsets/activities/default/relaxing_partying.png
+share/psi/iconsets/activities/default/relaxing_reading.png
+share/psi/iconsets/activities/default/relaxing_rehearsing.png
+share/psi/iconsets/activities/default/relaxing_shopping.png
+share/psi/iconsets/activities/default/relaxing_smoking.png
+share/psi/iconsets/activities/default/relaxing_socializing.png
+share/psi/iconsets/activities/default/relaxing_sunbathing.png
+share/psi/iconsets/activities/default/relaxing_watching_a_movie.png
+share/psi/iconsets/activities/default/relaxing_watching_tv.png
+share/psi/iconsets/activities/default/talking.png
+share/psi/iconsets/activities/default/talking_in_real_life.png
+share/psi/iconsets/activities/default/talking_on_the_phone.png
+share/psi/iconsets/activities/default/talking_on_video_phone.png
+share/psi/iconsets/activities/default/traveling.png
+share/psi/iconsets/activities/default/traveling_commuting.png
+share/psi/iconsets/activities/default/traveling_cycling.png
+share/psi/iconsets/activities/default/traveling_driving.png
+share/psi/iconsets/activities/default/traveling_in_a_car.png
+share/psi/iconsets/activities/default/traveling_on_a_bus.png
+share/psi/iconsets/activities/default/traveling_on_a_plane.png
+share/psi/iconsets/activities/default/traveling_on_a_train.png
+share/psi/iconsets/activities/default/traveling_on_a_trip.png
+share/psi/iconsets/activities/default/traveling_walking.png
+share/psi/iconsets/activities/default/unknown.png
+share/psi/iconsets/activities/default/working_coding.png
+share/psi/iconsets/activities/default/working_in_a_meeting.png
+share/psi/iconsets/activities/default/working_studying.png
+share/psi/iconsets/activities/default/working_working.png
+share/psi/iconsets/activities/default/working_writing.png
+share/psi/iconsets/affiliations/default/admin.png
+share/psi/iconsets/affiliations/default/icondef.xml
+share/psi/iconsets/affiliations/default/member.png
+share/psi/iconsets/affiliations/default/noaffiliation.png
+share/psi/iconsets/affiliations/default/outcast.png
+share/psi/iconsets/affiliations/default/owner.png
+share/psi/iconsets/clients/default/adium.png
+share/psi/iconsets/clients/default/bitlbee.png
+share/psi/iconsets/clients/default/bot.png
+share/psi/iconsets/clients/default/conversations.png
+share/psi/iconsets/clients/default/gajim.png
+share/psi/iconsets/clients/default/icondef.xml
+share/psi/iconsets/clients/default/isida-bot.png
+share/psi/iconsets/clients/default/jtalk.png
+share/psi/iconsets/clients/default/kadu.png
+share/psi/iconsets/clients/default/kopete.png
+share/psi/iconsets/clients/default/leechcraft-azoth.png
+share/psi/iconsets/clients/default/mcabber.png
+share/psi/iconsets/clients/default/miranda-ng.png
+share/psi/iconsets/clients/default/miranda.png
+share/psi/iconsets/clients/default/pidgin.png
+share/psi/iconsets/clients/default/poezio.png
+share/psi/iconsets/clients/default/psi.png
+share/psi/iconsets/clients/default/psiplus.png
+share/psi/iconsets/clients/default/qip.png
+share/psi/iconsets/clients/default/qutim.png
+share/psi/iconsets/clients/default/sawim.png
+share/psi/iconsets/clients/default/swift.png
+share/psi/iconsets/clients/default/tkabber.png
+share/psi/iconsets/clients/default/vacuum.png
+share/psi/iconsets/clients/default/vk4xmpp.png
+share/psi/iconsets/clients/default/xabber.png
+share/psi/iconsets/clients/default/yaxim.png
 share/psi/iconsets/emoticons/default/angry.png
 share/psi/iconsets/emoticons/default/bat.png
 share/psi/iconsets/emoticons/default/beer.png
@@ -43,11 +158,91 @@ share/psi/iconsets/emoticons/default/tongue.png
 share/psi/iconsets/emoticons/default/unhappy.png
 share/psi/iconsets/emoticons/default/wink.png
 share/psi/iconsets/emoticons/default/yes.png
+share/psi/iconsets/moods/default/Afraid.png
+share/psi/iconsets/moods/default/Amazed.png
+share/psi/iconsets/moods/default/Amorous.png
+share/psi/iconsets/moods/default/Angry.png
+share/psi/iconsets/moods/default/Annoyed.png
+share/psi/iconsets/moods/default/Anxious.png
+share/psi/iconsets/moods/default/Aroused.png
+share/psi/iconsets/moods/default/Ashamed.png
+share/psi/iconsets/moods/default/Bored.png
+share/psi/iconsets/moods/default/Brave.png
+share/psi/iconsets/moods/default/Calm.png
+share/psi/iconsets/moods/default/Cautious.png
+share/psi/iconsets/moods/default/Cold.png
+share/psi/iconsets/moods/default/Confident.png
+share/psi/iconsets/moods/default/Confused.png
+share/psi/iconsets/moods/default/Contemplative.png
+share/psi/iconsets/moods/default/Contented.png
+share/psi/iconsets/moods/default/Cranky.png
+share/psi/iconsets/moods/default/Crazy.png
+share/psi/iconsets/moods/default/Creative.png
+share/psi/iconsets/moods/default/Curious.png
+share/psi/iconsets/moods/default/Dejected.png
+share/psi/iconsets/moods/default/Depressed.png
+share/psi/iconsets/moods/default/Disappointed.png
+share/psi/iconsets/moods/default/Disgusted.png
+share/psi/iconsets/moods/default/Dismayed.png
+share/psi/iconsets/moods/default/Distracted.png
+share/psi/iconsets/moods/default/Embarrassed.png
+share/psi/iconsets/moods/default/Envious.png
+share/psi/iconsets/moods/default/Excited.png
+share/psi/iconsets/moods/default/Flirtatious.png
+share/psi/iconsets/moods/default/Frustrated.png
+share/psi/iconsets/moods/default/Grumpy.png
+share/psi/iconsets/moods/default/Guilty.png
+share/psi/iconsets/moods/default/Happy.png
+share/psi/iconsets/moods/default/Hopeful.png
+share/psi/iconsets/moods/default/Hot.png
+share/psi/iconsets/moods/default/Humbled.png
+share/psi/iconsets/moods/default/Humiliated.png
+share/psi/iconsets/moods/default/Hungry.png
+share/psi/iconsets/moods/default/Hurt.png
+share/psi/iconsets/moods/default/Impressed.png
+share/psi/iconsets/moods/default/In_awe.png
+share/psi/iconsets/moods/default/In_love.png
+share/psi/iconsets/moods/default/Indignant.png
+share/psi/iconsets/moods/default/Interested.png
+share/psi/iconsets/moods/default/Intoxicated.png
+share/psi/iconsets/moods/default/Invincible.png
+share/psi/iconsets/moods/default/Jealous.png
+share/psi/iconsets/moods/default/Lonely.png
+share/psi/iconsets/moods/default/Lucky.png
+share/psi/iconsets/moods/default/Mean.png
+share/psi/iconsets/moods/default/Moody.png
+share/psi/iconsets/moods/default/Nervous.png
+share/psi/iconsets/moods/default/Neutral.png
+share/psi/iconsets/moods/default/Offended.png
+share/psi/iconsets/moods/default/Outraged.png
+share/psi/iconsets/moods/default/Playful.png
+share/psi/iconsets/moods/default/Proud.png
+share/psi/iconsets/moods/default/Readme.txt
+share/psi/iconsets/moods/default/Relaxed.png
+share/psi/iconsets/moods/default/Relieved.png
+share/psi/iconsets/moods/default/Remorseful.png
+share/psi/iconsets/moods/default/Restless.png
+share/psi/iconsets/moods/default/Sad.png
+share/psi/iconsets/moods/default/Sarcastic.png
+share/psi/iconsets/moods/default/Serious.png
+share/psi/iconsets/moods/default/Shocked.png
+share/psi/iconsets/moods/default/Shy.png
+share/psi/iconsets/moods/default/Sick.png
+share/psi/iconsets/moods/default/Sleepy.png
+share/psi/iconsets/moods/default/Spontaneous.png
+share/psi/iconsets/moods/default/Stressed.png
+share/psi/iconsets/moods/default/Strong.png
+share/psi/iconsets/moods/default/Surprised.png
+share/psi/iconsets/moods/default/Thankful.png
+share/psi/iconsets/moods/default/Thirsty.png
+share/psi/iconsets/moods/default/Tired.png
+share/psi/iconsets/moods/default/Undefined.png
+share/psi/iconsets/moods/default/Weak.png
+share/psi/iconsets/moods/default/Worried.png
+share/psi/iconsets/moods/default/icondef.xml
 share/psi/iconsets/roster/README
-share/psi/iconsets/roster/crystal-aim.jisp
 share/psi/iconsets/roster/crystal-gadu.jisp
 share/psi/iconsets/roster/crystal-icq.jisp
-share/psi/iconsets/roster/crystal-msn.jisp
 share/psi/iconsets/roster/crystal-roster.jisp
 share/psi/iconsets/roster/crystal-service.jisp
 share/psi/iconsets/roster/crystal-sms.jisp
@@ -71,36 +266,61 @@ share/psi/iconsets/roster/default/online.dimming.png
 share/psi/iconsets/roster/default/online.png
 share/psi/iconsets/roster/default/perr.png
 share/psi/iconsets/roster/default/system.png
+share/psi/iconsets/roster/default/typing.png
 share/psi/iconsets/roster/default/xa.png
 share/psi/iconsets/roster/stellar-1.jisp
 share/psi/iconsets/system/README
 share/psi/iconsets/system/default/account.png
+share/psi/iconsets/system/default/action_button_send.png
+share/psi/iconsets/system/default/action_contacts_manager.png
+share/psi/iconsets/system/default/action_direct_presence.png
+share/psi/iconsets/system/default/action_muc_hide.png
+share/psi/iconsets/system/default/action_muc_leave.png
+share/psi/iconsets/system/default/action_muc_show.png
+share/psi/iconsets/system/default/action_templates.png
+share/psi/iconsets/system/default/action_templates_edit.png
+share/psi/iconsets/system/default/activity.png
 share/psi/iconsets/system/default/add.png
+share/psi/iconsets/system/default/advanced-plus.png
 share/psi/iconsets/system/default/advanced.png
 share/psi/iconsets/system/default/appearance.png
 share/psi/iconsets/system/default/arrow_down.png
 share/psi/iconsets/system/default/arrow_left.png
 share/psi/iconsets/system/default/arrow_right.png
 share/psi/iconsets/system/default/arrow_up.png
+share/psi/iconsets/system/default/autojid.png
+share/psi/iconsets/system/default/avcall.png
+share/psi/iconsets/system/default/bookmark_add.png
+share/psi/iconsets/system/default/bookmark_remove.png
+share/psi/iconsets/system/default/bookmarks.png
 share/psi/iconsets/system/default/browse.png
 share/psi/iconsets/system/default/cancel.png
 share/psi/iconsets/system/default/changeacc.png
 share/psi/iconsets/system/default/chatclear.png
 share/psi/iconsets/system/default/close.png
 share/psi/iconsets/system/default/closetab.png
+share/psi/iconsets/system/default/cm_check.png
+share/psi/iconsets/system/default/cm_invertcheck.png
+share/psi/iconsets/system/default/cm_uncheck.png
 share/psi/iconsets/system/default/command.png
 share/psi/iconsets/system/default/configure-room.png
 share/psi/iconsets/system/default/configure_toolbars.png
+share/psi/iconsets/system/default/default_avatar.png
 share/psi/iconsets/system/default/disco.png
 share/psi/iconsets/system/default/download.png
+share/psi/iconsets/system/default/enable-groups.png
 share/psi/iconsets/system/default/events.png
+share/psi/iconsets/system/default/export.png
 share/psi/iconsets/system/default/eye_blue.png
 share/psi/iconsets/system/default/filemanager.png
+share/psi/iconsets/system/default/geolocation.png
 share/psi/iconsets/system/default/groupchat.png
 share/psi/iconsets/system/default/gstreamer-logo-50.png
 share/psi/iconsets/system/default/help.png
 share/psi/iconsets/system/default/history.png
 share/psi/iconsets/system/default/icondef.xml
+share/psi/iconsets/system/default/ignore_global_actions.png
+share/psi/iconsets/system/default/import.png
 share/psi/iconsets/system/default/info.png
 share/psi/iconsets/system/default/jabber.png
 share/psi/iconsets/system/default/key.png
@@ -111,11 +331,22 @@ share/psi/iconsets/system/default/logo_16.png
 share/psi/iconsets/system/default/logo_32.png
 share/psi/iconsets/system/default/logo_48.png
 share/psi/iconsets/system/default/logo_64.png
+share/psi/iconsets/system/default/manage_contact.png
+share/psi/iconsets/system/default/mood.png
+share/psi/iconsets/system/default/notification_chat_delivery_ok.png
+share/psi/iconsets/system/default/notification_chat_delivery_ok_pgp.png
+share/psi/iconsets/system/default/notification_chat_info.png
+share/psi/iconsets/system/default/notification_chat_receive.png
+share/psi/iconsets/system/default/notification_chat_receive_pgp.png
+share/psi/iconsets/system/default/notification_chat_send.png
+share/psi/iconsets/system/default/notification_chat_send_pgp.png
+share/psi/iconsets/system/default/notification_chat_time.png
 share/psi/iconsets/system/default/ok.png
 share/psi/iconsets/system/default/options.png
 share/psi/iconsets/system/default/pgp.png
 share/psi/iconsets/system/default/play.png
 share/psi/iconsets/system/default/play_sounds.png
+share/psi/iconsets/system/default/plugins.png
 share/psi/iconsets/system/default/psilogo.png
 share/psi/iconsets/system/default/psimain.png
 share/psi/iconsets/system/default/publish_tune.png
@@ -123,6 +354,7 @@ share/psi/iconsets/system/default/quit.png
 share/psi/iconsets/system/default/register.png
 share/psi/iconsets/system/default/reload.png
 share/psi/iconsets/system/default/remove.png
+share/psi/iconsets/system/default/roster_icon.png
 share/psi/iconsets/system/default/search.png
 share/psi/iconsets/system/default/self.png
 share/psi/iconsets/system/default/send.png
@@ -136,8 +368,11 @@ share/psi/iconsets/system/default/ssl_yes.png
 share/psi/iconsets/system/default/start-chat.png
 share/psi/iconsets/system/default/status.png
 share/psi/iconsets/system/default/stop.png
+share/psi/iconsets/system/default/text.png
+share/psi/iconsets/system/default/throbber.png
 share/psi/iconsets/system/default/time.png
 share/psi/iconsets/system/default/tip.png
+share/psi/iconsets/system/default/tune.png
 share/psi/iconsets/system/default/upload.png
 share/psi/iconsets/system/default/url.png
 share/psi/iconsets/system/default/vcard.png
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index fa291a962f9..5dedecf79a2 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 01:20:23 agc Exp $
+$NetBSD: distinfo,v 1.28 2019/02/08 14:56:01 nia Exp $
 
-SHA1 (psi-0.15/psi-0.15.tar.bz2) = 4801866d4fa2af43a9b3f431e2c9d633a97276db
-RMD160 (psi-0.15/psi-0.15.tar.bz2) = 0c5d461fb2b7e7b25850f19f79bcc23c1e87efb3
-SHA512 (psi-0.15/psi-0.15.tar.bz2) = 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a
-Size (psi-0.15/psi-0.15.tar.bz2) = 1984777 bytes
-SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
-SHA1 (patch-ah) = 1c50b81daf5c4e9a4fcefc102ba5780ae90cf44e
-SHA1 (patch-ak) = f3870be31be769ac51a3f26a1fc6f6e14564e685
-SHA1 (patch-al) = 44d17e5ca70061c13164cadf69b8a5f84648c177
-SHA1 (patch-src_src.pro) = d35d1f22b91b8ca14692c4b5bfb13d11f1d06c34
+SHA1 (psi-1.4/psi-1.4.tar.xz) = 55c61cc0c1e3990f5a97619dc79fbe320f778770
+RMD160 (psi-1.4/psi-1.4.tar.xz) = 2f047baa0e2af16c949f6bb33667124253e231e4
+SHA512 (psi-1.4/psi-1.4.tar.xz) = 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
+Size (psi-1.4/psi-1.4.tar.xz) = 2119840 bytes
+SHA1 (patch-src_accountmanagedlg.cpp) = ca40ab15b01121a327b4774fb9f6284341f055bd
+SHA1 (patch-src_options_opt__application.cpp) = b0ddccbd3ffec0d89daa85e92f0ef06bc2d7fe68
diff --git a/chat/psi/options.mk b/chat/psi/options.mk
index 117e2945853..db5466fd6c3 100644
--- a/chat/psi/options.mk
+++ b/chat/psi/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
+# $NetBSD: options.mk,v 1.3 2019/02/08 14:56:01 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.psi
-PKG_SUPPORTED_OPTIONS+=	aspell enchant dbus whiteboard xscreensaver
+PKG_SUPPORTED_OPTIONS+=	aspell enchant whiteboard xscreensaver
 PKG_SUGGESTED_OPTIONS+=	aspell enchant
 
 # from an idea stolen from ../../misc/openoffice3.
@@ -43,13 +43,6 @@ CONFIGURE_ARGS+=	--disable-aspell
 CONFIGURE_ARGS+=	--disable-enchant
 .endif
 
-# enable qdbus
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-qdbus
-.endif
-
 # enable whiteboarding
 .if !empty(PKG_OPTIONS:Mwhiteboard)
 CONFIGURE_ARGS+=	--enable-whiteboarding
diff --git a/chat/psi/patches/patch-ad b/chat/psi/patches/patch-ad
deleted file mode 100644
index c2a4575585f..00000000000
--- a/chat/psi/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2011/01/02 23:53:13 schnoebe Exp $
-
-Some old versions of zlib defined OF; not needed, but provide compat for it.
-
---- src/libpsi/tools/zip/minizip/unzip.h.orig	2007-10-14 09:00:55.000000000 -0500
-+++ src/libpsi/tools/zip/minizip/unzip.h
-@@ -49,6 +49,14 @@ extern "C" {
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#  ifdef STDC
-+#    define OF(x)      x
-+#  else
-+#    define OF(x)
-+#  endif
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/chat/psi/patches/patch-ah b/chat/psi/patches/patch-ah
deleted file mode 100644
index efb6aa777ab..00000000000
--- a/chat/psi/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2012/12/07 23:52:09 schnoebe Exp $
-
-pkgsrc places idna.h in a different directory than other package
-managers
-
---- iris/src/xmpp/xmpp-core/connector.cpp.orig	2012-10-04 00:53:09.000000000 +0000
-+++ iris/src/xmpp/xmpp-core/connector.cpp
-@@ -36,7 +36,7 @@
- #include <QUrl>
- #include <QTimer>
- #include <qca.h>
--#include <libidn/idna.h>
-+#include <idna.h>
- 
- #include "bsocket.h"
- #include "httpconnect.h"
diff --git a/chat/psi/patches/patch-ak b/chat/psi/patches/patch-ak
deleted file mode 100644
index 7674e052d23..00000000000
--- a/chat/psi/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
-
-pkgsrc places IDN's stringprep in a different directory than other
-package managers.
-
---- iris/src/xmpp/jid/jid.cpp.orig	2012-10-04 00:53:09.000000000 +0000
-+++ iris/src/xmpp/jid/jid.cpp
-@@ -24,7 +24,7 @@
- #include <QCoreApplication>
- #include <QByteArray>
- #include <QHash>
--#include <libidn/stringprep.h>
-+#include <stringprep.h>
- 
- #ifndef NO_IRISNET
- #include "irisnetglobal_p.h"
diff --git a/chat/psi/patches/patch-al b/chat/psi/patches/patch-al
deleted file mode 100644
index b6798d2b695..00000000000
--- a/chat/psi/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 2011/01/02 23:53:13 schnoebe Exp $
-
-Add NetBSD to the list of resolvers that support threading, having a
-"modern" resolver API.
-
---- iris/src/jdns/jdns_sys.c.orig	2009-07-26 16:02:12.000000000 -0500
-+++ iris/src/jdns/jdns_sys.c
-@@ -679,7 +679,7 @@ static jdns_dnsparams_t *dnsparams_get_u
- 	return params;
- }
- 
--#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
-+#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) || defined(JDNS_OS_NETBSD)
- # define JDNS_MODERN_RES_API
- #endif
- 
diff --git a/chat/psi/patches/patch-src_accountmanagedlg.cpp b/chat/psi/patches/patch-src_accountmanagedlg.cpp
new file mode 100644
index 00000000000..4a5a140e264
--- /dev/null
+++ b/chat/psi/patches/patch-src_accountmanagedlg.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_accountmanagedlg.cpp,v 1.1 2019/02/08 14:56:01 nia Exp $
+
+Fix missing include.
+
+--- src/accountmanagedlg.cpp.orig	2019-02-08 13:44:45.092357357 +0000
++++ src/accountmanagedlg.cpp
+@@ -28,6 +28,7 @@
+ #include <QTimer>
+ #include <QHeaderView>
+ #include <QDropEvent>
++#include <QButtonGroup>
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"
diff --git a/chat/psi/patches/patch-src_options_opt__application.cpp b/chat/psi/patches/patch-src_options_opt__application.cpp
new file mode 100644
index 00000000000..46457da2332
--- /dev/null
+++ b/chat/psi/patches/patch-src_options_opt__application.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_options_opt__application.cpp,v 1.1 2019/02/08 14:56:01 nia Exp $
+
+Make sure the correct proxy.h include is included.
+
+--- src/options/opt_application.cpp.orig	2017-05-24 07:22:55.000000000 +0000
++++ src/options/opt_application.cpp
+@@ -2,7 +2,7 @@
+ #include "common.h"
+ #include "iconwidget.h"
+ #include "psioptions.h"
+-#include "proxy.h"
++#include "../proxy.h"
+ #include "translationmanager.h"
+ #include "varlist.h"
+ #include "applicationinfo.h"
diff --git a/chat/psi/patches/patch-src_src.pro b/chat/psi/patches/patch-src_src.pro
deleted file mode 100644
index 5477479ba1f..00000000000
--- a/chat/psi/patches/patch-src_src.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_src.pro,v 1.1 2012/12/07 23:52:09 schnoebe Exp $
-
-Remove unneeded DESTDIR statement, it broke the install target.
-
---- src/src.pro.orig	2012-10-04 00:53:03.000000000 +0000
-+++ src/src.pro
-@@ -6,7 +6,6 @@
- TEMPLATE = app
- TARGET   = psi
- CONFIG  += qt thread x11
--DESTDIR  = $$PWD/..
- 
- #CONFIG += use_crash
- CONFIG += pep