Update keepassx to 2.0.

KeePassX 2.0 is using the new .kdbx (same as KeePass 2) database
format.  You can import your .kdb database from 0.4 from the Database
> Import KeePass 1 database.  This is a one-way process though.
You canât migrate back to the .kdb format.

New features include:

    Multiple attachments per entry
    Add custom key/value pairs to entries
    Open multiple database in one window

KeePassX 2.0 has been rewritten from scratch so some features (like
showing expired passwords) are still missing.

7 files changed, 194 insertions, 169 deletions

diff --git a/security/keepassx/DESCR b/security/keepassx/DESCR
index f68862bbe61..5f38427a16a 100644
--- a/security/keepassx/DESCR
+++ b/security/keepassx/DESCR
@@ -1,6 +1,10 @@
-KeePass is a free/open-source password manager or safe which helps you to
-manage your passwords in a secure way. You can put all your passwords in one
-database, which is locked with one master key or a key-disk. So you only have
-to remember one single master password or insert the key-disk to unlock the
-whole database. The databases are encrypted using the best and most secure
-encryption algorithms currently known (AES and Twofish).
+KeePass is a free/open-source password manager or safe which helps
+you to manage your passwords in a secure way. You can put all your
+passwords in one database, which is locked with one master key or
+a key-disk. So you only have to remember one single master password
+or insert the key-disk to unlock the whole database. The databases
+are encrypted using the best and most secure encryption algorithms
+currently known (AES and Twofish).
+
+This package contains v2.x of the program with KeePass v2 database
+format (kdbx) support.
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index ffe1d8df96d..9f9d404c1b5 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -1,31 +1,34 @@
-# $NetBSD: Makefile,v 1.32 2015/12/09 13:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/12/11 13:37:32 wiz Exp $
 
-DISTNAME=	keepassx-0.4.4
-CATEGORIES=	security
+DISTNAME=	keepassx-2.0
+CATEGORIES=	security x11
 MASTER_SITES=	https://www.keepassx.org/releases/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.keepassx.org/
-COMMENT=	Password manager or safe
+HOMEPAGE=	https://www.keepassx.org/
+COMMENT=	Password generator and manager v2 (kdbx support)
 LICENSE=	gnu-gpl-v2
 
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
-USE_LIBTOOL=	YES
+USE_LIBTOOL=	yes
+CMAKE_ARG_PATH=	..
+CONFIGURE_DIRS=	build
 
-QMAKE=			${QTDIR}/bin/qmake
-CONFIGURE_ARGS+=	QMAKE=${QMAKE:Q} PREFIX=${PREFIX:Q} PRECOMPILED=0
-MAKE_ENV+=		QTDIR=${QTDIR} PREFIX=${PREFIX}
-INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
+.PHONY: qmake-bin-add
+pre-configure: qmake-bin-add
 
-do-configure:
-	cd ${WRKSRC} && \
-		${QMAKE} -unix -o Makefile ${CONFIGURE_ARGS} keepassx.pro
+qmake-bin-add:
+	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
-pre-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/keepassx ${WRKSRC}/src
+pre-configure:
+	${MKDIR} ${WRKSRC}/build
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/keepassx/PLIST b/security/keepassx/PLIST
index b9816a225dd..cf0df7fdf5f 100644
--- a/security/keepassx/PLIST
+++ b/security/keepassx/PLIST
@@ -1,99 +1,163 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/28 02:00:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/12/11 13:37:32 wiz Exp $
 bin/keepassx
+lib/keepassx/libkeepassx-autotype-x11.so
 share/applications/keepassx.desktop
-share/keepassx/i18n/keepassx-de_DE.qm
-share/keepassx/i18n/keepassx-es_ES.qm
-share/keepassx/i18n/keepassx-fi_FI.qm
-share/keepassx/i18n/keepassx-fr_FR.qm
-share/keepassx/i18n/keepassx-gl_ES.qm
-share/keepassx/i18n/keepassx-hu_HU.qm
-share/keepassx/i18n/keepassx-it_IT.qm
-share/keepassx/i18n/keepassx-ja_JP.qm
-share/keepassx/i18n/keepassx-nb_NO.qm
-share/keepassx/i18n/keepassx-nl_NL.qm
-share/keepassx/i18n/keepassx-pl_PL.qm
-share/keepassx/i18n/keepassx-pt_PT.qm
-share/keepassx/i18n/keepassx-ru_RU.qm
-share/keepassx/i18n/keepassx-sk_SK.qm
-share/keepassx/i18n/keepassx-sr_RS.qm
-share/keepassx/i18n/keepassx-tr_TR.qm
-share/keepassx/i18n/keepassx-uk_UA.qm
-share/keepassx/i18n/keepassx-zh_CN.qm
-share/keepassx/i18n/qt_fi.qm
-share/keepassx/i18n/qt_gl_ES.qm
-share/keepassx/i18n/qt_hu.qm
-share/keepassx/i18n/qt_it.qm
-share/keepassx/i18n/qt_nl.qm
-share/keepassx/i18n/qt_sr.qm
-share/keepassx/i18n/qt_tr.qm
-share/keepassx/icons/alarmclock.png
-share/keepassx/icons/appsettings.png
-share/keepassx/icons/autotype.png
-share/keepassx/icons/bookmark.png
-share/keepassx/icons/bookmark_add.png
-share/keepassx/icons/bookmark_del.png
-share/keepassx/icons/bookmark_edit.png
-share/keepassx/icons/bookmark_folder.png
-share/keepassx/icons/bookmark_this.png
-share/keepassx/icons/clientic.png
-share/keepassx/icons/clock.png
-share/keepassx/icons/cloneentry.png
-share/keepassx/icons/copypwd.png
-share/keepassx/icons/copyusername.png
-share/keepassx/icons/dbsearch.png
-share/keepassx/icons/dbsettings.png
-share/keepassx/icons/delete.png
-share/keepassx/icons/deleteentry.png
-share/keepassx/icons/deletegroup.png
-share/keepassx/icons/dice.png
-share/keepassx/icons/document.png
-share/keepassx/icons/down.png
-share/keepassx/icons/editentry.png
-share/keepassx/icons/editgroup.png
-share/keepassx/icons/exit.png
-share/keepassx/icons/expired.png
-share/keepassx/icons/fileclose.png
-share/keepassx/icons/filedelete.png
-share/keepassx/icons/filenew.png
-share/keepassx/icons/fileopen.png
-share/keepassx/icons/filesave.png
-share/keepassx/icons/filesaveas.png
-share/keepassx/icons/filesavedisabled.png
-share/keepassx/icons/generator.png
-share/keepassx/icons/go-home.png
-share/keepassx/icons/go-next.png
-share/keepassx/icons/go-previous.png
-share/keepassx/icons/groupsearch.png
-share/keepassx/icons/help.png
-share/keepassx/icons/help_about.png
-share/keepassx/icons/i18n.png
-share/keepassx/icons/keepassx.png
-share/keepassx/icons/keepassx_large.png
-share/keepassx/icons/keepassx_locked.png
-share/keepassx/icons/keepassx_small.png
-share/keepassx/icons/key.png
-share/keepassx/icons/lock.png
-share/keepassx/icons/manual.png
-share/keepassx/icons/newentry.png
-share/keepassx/icons/newgroup.png
-share/keepassx/icons/ok.png
-share/keepassx/icons/openurl.png
-share/keepassx/icons/pwd_hide.png
-share/keepassx/icons/pwd_show.png
-share/keepassx/icons/restore.png
-share/keepassx/icons/search.png
-share/keepassx/icons/swap.png
-share/keepassx/icons/templates.png
-share/keepassx/icons/text_block.png
-share/keepassx/icons/text_bold.png
-share/keepassx/icons/text_center.png
-share/keepassx/icons/text_italic.png
-share/keepassx/icons/text_left.png
-share/keepassx/icons/text_right.png
-share/keepassx/icons/text_under.png
-share/keepassx/icons/trashcan.png
-share/keepassx/icons/up.png
-share/keepassx/license.html
+share/icons/hicolor/128x128/apps/keepassx.png
+share/icons/hicolor/128x128/mimetypes/application-x-keepassx.png
+share/icons/hicolor/16x16/apps/keepassx.png
+share/icons/hicolor/16x16/mimetypes/application-x-keepassx.png
+share/icons/hicolor/22x22/mimetypes/application-x-keepassx.png
+share/icons/hicolor/24x24/apps/keepassx.png
+share/icons/hicolor/256x256/apps/keepassx.png
+share/icons/hicolor/32x32/apps/keepassx.png
+share/icons/hicolor/32x32/mimetypes/application-x-keepassx.png
+share/icons/hicolor/48x48/apps/keepassx.png
+share/icons/hicolor/64x64/apps/keepassx.png
+share/icons/hicolor/64x64/mimetypes/application-x-keepassx.png
+share/icons/hicolor/scalable/apps/keepassx.svgz
+share/keepassx/icons/application/128x128/apps/keepassx.png
+share/keepassx/icons/application/128x128/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/16x16/actions/application-exit.png
+share/keepassx/icons/application/16x16/actions/auto-type.png
+share/keepassx/icons/application/16x16/actions/configure.png
+share/keepassx/icons/application/16x16/actions/database-change-key.png
+share/keepassx/icons/application/16x16/actions/document-close.png
+share/keepassx/icons/application/16x16/actions/document-edit.png
+share/keepassx/icons/application/16x16/actions/document-encrypt.png
+share/keepassx/icons/application/16x16/actions/document-new.png
+share/keepassx/icons/application/16x16/actions/document-open.png
+share/keepassx/icons/application/16x16/actions/document-save-as.png
+share/keepassx/icons/application/16x16/actions/document-save.png
+share/keepassx/icons/application/16x16/actions/edit-clear-locationbar-ltr.png
+share/keepassx/icons/application/16x16/actions/edit-clear-locationbar-rtl.png
+share/keepassx/icons/application/16x16/actions/entry-clone.png
+share/keepassx/icons/application/16x16/actions/entry-delete.png
+share/keepassx/icons/application/16x16/actions/entry-edit.png
+share/keepassx/icons/application/16x16/actions/entry-new.png
+share/keepassx/icons/application/16x16/actions/group-delete.png
+share/keepassx/icons/application/16x16/actions/group-edit.png
+share/keepassx/icons/application/16x16/actions/group-new.png
+share/keepassx/icons/application/16x16/actions/help-about.png
+share/keepassx/icons/application/16x16/actions/password-copy.png
+share/keepassx/icons/application/16x16/actions/password-generate.png
+share/keepassx/icons/application/16x16/actions/password-show-off.png
+share/keepassx/icons/application/16x16/actions/password-show-on.png
+share/keepassx/icons/application/16x16/actions/system-search.png
+share/keepassx/icons/application/16x16/actions/username-copy.png
+share/keepassx/icons/application/16x16/apps/keepassx.png
+share/keepassx/icons/application/16x16/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/22x22/actions/dialog-close.png
+share/keepassx/icons/application/22x22/actions/dialog-ok.png
+share/keepassx/icons/application/22x22/actions/document-encrypt.png
+share/keepassx/icons/application/22x22/actions/document-open.png
+share/keepassx/icons/application/22x22/actions/document-save.png
+share/keepassx/icons/application/22x22/actions/entry-delete.png
+share/keepassx/icons/application/22x22/actions/entry-edit.png
+share/keepassx/icons/application/22x22/actions/entry-new.png
+share/keepassx/icons/application/22x22/actions/password-copy.png
+share/keepassx/icons/application/22x22/actions/system-search.png
+share/keepassx/icons/application/22x22/actions/username-copy.png
+share/keepassx/icons/application/22x22/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/22x22/status/dialog-error.png
+share/keepassx/icons/application/22x22/status/dialog-information.png
+share/keepassx/icons/application/22x22/status/dialog-warning.png
+share/keepassx/icons/application/24x24/apps/keepassx.png
+share/keepassx/icons/application/256x256/apps/keepassx.png
+share/keepassx/icons/application/32x32/apps/keepassx.png
+share/keepassx/icons/application/32x32/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/48x48/apps/keepassx.png
+share/keepassx/icons/application/64x64/apps/keepassx.png
+share/keepassx/icons/application/64x64/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/scalable/apps/keepassx.svgz
+share/keepassx/icons/database/C00_Password.png
+share/keepassx/icons/database/C01_Package_Network.png
+share/keepassx/icons/database/C02_MessageBox_Warning.png
+share/keepassx/icons/database/C03_Server.png
+share/keepassx/icons/database/C04_Klipper.png
+share/keepassx/icons/database/C05_Edu_Languages.png
+share/keepassx/icons/database/C06_KCMDF.png
+share/keepassx/icons/database/C07_Kate.png
+share/keepassx/icons/database/C08_Socket.png
+share/keepassx/icons/database/C09_Identity.png
+share/keepassx/icons/database/C10_Kontact.png
+share/keepassx/icons/database/C11_Camera.png
+share/keepassx/icons/database/C12_IRKickFlash.png
+share/keepassx/icons/database/C13_KGPG_Key3.png
+share/keepassx/icons/database/C14_Laptop_Power.png
+share/keepassx/icons/database/C15_Scanner.png
+share/keepassx/icons/database/C16_Mozilla_Firebird.png
+share/keepassx/icons/database/C17_CDROM_Unmount.png
+share/keepassx/icons/database/C18_Display.png
+share/keepassx/icons/database/C19_Mail_Generic.png
+share/keepassx/icons/database/C20_Misc.png
+share/keepassx/icons/database/C21_KOrganizer.png
+share/keepassx/icons/database/C22_ASCII.png
+share/keepassx/icons/database/C23_Icons.png
+share/keepassx/icons/database/C24_Connect_Established.png
+share/keepassx/icons/database/C25_Folder_Mail.png
+share/keepassx/icons/database/C26_FileSave.png
+share/keepassx/icons/database/C27_NFS_Unmount.png
+share/keepassx/icons/database/C28_QuickTime.png
+share/keepassx/icons/database/C29_KGPG_Term.png
+share/keepassx/icons/database/C30_Konsole.png
+share/keepassx/icons/database/C31_FilePrint.png
+share/keepassx/icons/database/C32_FSView.png
+share/keepassx/icons/database/C33_Run.png
+share/keepassx/icons/database/C34_Configure.png
+share/keepassx/icons/database/C35_KRFB.png
+share/keepassx/icons/database/C36_Ark.png
+share/keepassx/icons/database/C37_KPercentage.png
+share/keepassx/icons/database/C38_Samba_Unmount.png
+share/keepassx/icons/database/C39_History.png
+share/keepassx/icons/database/C40_Mail_Find.png
+share/keepassx/icons/database/C41_VectorGfx.png
+share/keepassx/icons/database/C42_KCMMemory.png
+share/keepassx/icons/database/C43_EditTrash.png
+share/keepassx/icons/database/C44_KNotes.png
+share/keepassx/icons/database/C45_Cancel.png
+share/keepassx/icons/database/C46_Help.png
+share/keepassx/icons/database/C47_KPackage.png
+share/keepassx/icons/database/C48_Folder.png
+share/keepassx/icons/database/C49_Folder_Blue_Open.png
+share/keepassx/icons/database/C50_Folder_Tar.png
+share/keepassx/icons/database/C51_Decrypted.png
+share/keepassx/icons/database/C52_Encrypted.png
+share/keepassx/icons/database/C53_Apply.png
+share/keepassx/icons/database/C54_Signature.png
+share/keepassx/icons/database/C55_Thumbnail.png
+share/keepassx/icons/database/C56_KAddressBook.png
+share/keepassx/icons/database/C57_View_Text.png
+share/keepassx/icons/database/C58_KGPG.png
+share/keepassx/icons/database/C59_Package_Development.png
+share/keepassx/icons/database/C60_KFM_Home.png
+share/keepassx/icons/database/C61_Services.png
+share/keepassx/icons/database/C62_Tux.png
+share/keepassx/icons/database/C63_Feather.png
+share/keepassx/icons/database/C64_Apple.png
+share/keepassx/icons/database/C65_W.png
+share/keepassx/icons/database/C66_Money.png
+share/keepassx/icons/database/C67_Certificate.png
+share/keepassx/icons/database/C68_BlackBerry.png
+share/keepassx/translations/keepassx_cs.qm
+share/keepassx/translations/keepassx_da.qm
+share/keepassx/translations/keepassx_de.qm
+share/keepassx/translations/keepassx_el.qm
+share/keepassx/translations/keepassx_en_plurals.qm
+share/keepassx/translations/keepassx_es.qm
+share/keepassx/translations/keepassx_fr.qm
+share/keepassx/translations/keepassx_id.qm
+share/keepassx/translations/keepassx_it.qm
+share/keepassx/translations/keepassx_ja.qm
+share/keepassx/translations/keepassx_ko.qm
+share/keepassx/translations/keepassx_lt.qm
+share/keepassx/translations/keepassx_nl_NL.qm
+share/keepassx/translations/keepassx_pl.qm
+share/keepassx/translations/keepassx_pt_BR.qm
+share/keepassx/translations/keepassx_pt_PT.qm
+share/keepassx/translations/keepassx_ru.qm
+share/keepassx/translations/keepassx_sl_SI.qm
+share/keepassx/translations/keepassx_sv.qm
+share/keepassx/translations/keepassx_uk.qm
+share/keepassx/translations/keepassx_zh_CN.qm
+share/keepassx/translations/keepassx_zh_TW.qm
 share/mime/packages/keepassx.xml
-share/mimelnk/application/x-keepass.desktop
-share/pixmaps/keepassx.xpm
diff --git a/security/keepassx/distinfo b/security/keepassx/distinfo
index 697c03bc219..e35dc10cef3 100644
--- a/security/keepassx/distinfo
+++ b/security/keepassx/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/12/09 13:54:32 wiz Exp $
+$NetBSD: distinfo,v 1.10 2015/12/11 13:37:32 wiz Exp $
 
-SHA1 (keepassx-0.4.4.tar.gz) = a6e7f779df0156d4419dae50bfa12df7a04f6aeb
-RMD160 (keepassx-0.4.4.tar.gz) = c7ce5954707760aafab6291d160dc3e538201bc2
-SHA512 (keepassx-0.4.4.tar.gz) = 2fc93d77f5576a0cce6514b39ee9b319efaa72b475762438eed5601c5e3edb7693a5fbb9c1e741be1e5d3a08849bc54b0cff90fe3a86cf240129febc0cc703d8
-Size (keepassx-0.4.4.tar.gz) = 1371560 bytes
-SHA1 (patch-src_crypto_aes__endian.h) = 3a88c3ebf2ccaa2229aa7e0600b4f0e976b21772
-SHA1 (patch-src_lib_AutoTypeX11.cpp) = 3bd8421804ec549ba4a7a42907516534d7bbf6f3
-SHA1 (patch-src_lib_random.cpp) = dd50e9cb5a95f5db780aab727dfd4b0dcceac9ef
+SHA1 (keepassx-2.0.tar.gz) = e5dc2e55c9ec22a769abac177f2c3b6dfb0a315c
+RMD160 (keepassx-2.0.tar.gz) = 559418be72c22cff2c397b822220765ec5e26234
+SHA512 (keepassx-2.0.tar.gz) = 6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788
+Size (keepassx-2.0.tar.gz) = 1524638 bytes
diff --git a/security/keepassx/patches/patch-src_crypto_aes__endian.h b/security/keepassx/patches/patch-src_crypto_aes__endian.h
deleted file mode 100644
index b379f7f7da8..00000000000
--- a/security/keepassx/patches/patch-src_crypto_aes__endian.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_crypto_aes__endian.h,v 1.1 2014/01/05 01:01:48 rumko Exp $
-
-Fix build on DragonFly.
-
---- src/crypto/aes_endian.h.orig	2008-08-01 19:03:05.000000000 +0000
-+++ src/crypto/aes_endian.h
-@@ -34,7 +34,7 @@
- /* Include files where endian defines and byteswap functions may reside */

- #if defined( __sun )

- #  include <sys/isa_defs.h>

--#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ )

-+#elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__ )

- #  include <sys/endian.h>

- #elif defined( BSD ) && ( BSD >= 199103 ) || defined( __APPLE__ ) || \

-       defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ )

diff --git a/security/keepassx/patches/patch-src_lib_AutoTypeX11.cpp b/security/keepassx/patches/patch-src_lib_AutoTypeX11.cpp
deleted file mode 100644
index 9550ae8ab96..00000000000
--- a/security/keepassx/patches/patch-src_lib_AutoTypeX11.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_lib_AutoTypeX11.cpp,v 1.2 2015/12/06 14:20:34 wiz Exp $
-
-Add a bunch of missing includes hidden by libstdc++ namespace pollution.
-
---- src/lib/AutoTypeX11.cpp.orig	2013-05-04 00:34:27.000000000 +0000
-+++ src/lib/AutoTypeX11.cpp
-@@ -23,6 +23,7 @@
- #include "mainwindow.h"
- #include "lib/HelperX11.h"
- #include <QX11Info>
-+#include <ctime>
- 
- #ifndef GLOBAL_AUTOTYPE
- AutoType* autoType = NULL;
diff --git a/security/keepassx/patches/patch-src_lib_random.cpp b/security/keepassx/patches/patch-src_lib_random.cpp
deleted file mode 100644
index b5797a00d65..00000000000
--- a/security/keepassx/patches/patch-src_lib_random.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_lib_random.cpp,v 1.4 2015/12/06 14:20:34 wiz Exp $
-
-Add a bunch of missing includes hidden by libstdc++ namespace pollution.
-
---- src/lib/random.cpp.orig	2013-05-04 00:33:31.000000000 +0000
-+++ src/lib/random.cpp
-@@ -23,6 +23,7 @@
- 
- #if defined(Q_WS_X11) || defined(Q_WS_MAC)
- 	#include <QFile>
-+	#include <unistd.h>
- #elif defined(Q_WS_WIN)
- 	#include <windows.h>
- 	#include <wincrypt.h>