Update to 0.4.3

4+ years worth of patches.

6 files changed, 109 insertions, 106 deletions

diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 70cc0ec66b7..954ec3e6f87 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2012/10/23 18:16:31 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/28 02:00:50 markd Exp $
 #
 
-DISTNAME=	KeePassX-0.2.2
-PKGNAME=	${DISTNAME:S/KeePassX/keepassx/}
-PKGREVISION=	15
+DISTNAME=	keepassx-0.4.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=keepassx/}
 
@@ -12,27 +10,22 @@ HOMEPAGE=	http://keepassx.sourceforge.net/
 COMMENT=	Password manager or safe
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 
 QMAKE=			${QTDIR}/bin/qmake
-CONFIGURE_ARGS+=	QMAKE=${QMAKE:Q} PREFIX=${PREFIX:Q}
+CONFIGURE_ARGS+=	QMAKE=${QMAKE:Q} PREFIX=${PREFIX:Q} PRECOMPILED=0
 MAKE_ENV+=		QTDIR=${QTDIR} PREFIX=${PREFIX}
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
-BUILDLINK_DEPMETHOD.qt3-tools=	build
-
 do-configure:
 	cd ${WRKSRC} && \
-		${QMAKE} -o Makefile ${CONFIGURE_ARGS} keepass.pro
+		${QMAKE} -unix -o Makefile ${CONFIGURE_ARGS} keepassx.pro
 
 pre-install:
-	${CP} ${WRKSRC}/bin/keepass ${WRKSRC}/src
-
-post-install:
-	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/share/keepass/icons/*.png
+	${CP} ${WRKSRC}/bin/keepassx ${WRKSRC}/src
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
diff --git a/security/keepassx/PLIST b/security/keepassx/PLIST
index 8dac4ee4e7e..b9816a225dd 100644
--- a/security/keepassx/PLIST
+++ b/security/keepassx/PLIST
@@ -1,36 +1,99 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:30 joerg Exp $
-bin/keepass
-share/keepass/i18n/keepass-de_DE.qm
-share/keepass/i18n/keepass-fr_FR.qm
-share/keepass/icons/clientic.png
-share/keepass/icons/i18n.png
-share/keepass/icons/keepassx.png
-share/keepass/icons/key.png
-share/keepass/icons/nuvola/32x32/actions/configure.png
-share/keepass/icons/nuvola/32x32/actions/edit.png
-share/keepass/icons/nuvola/32x32/actions/edit_add.png
-share/keepass/icons/nuvola/32x32/actions/editcopy.png
-share/keepass/icons/nuvola/32x32/actions/editdelete.png
-share/keepass/icons/nuvola/32x32/actions/exit.png
-share/keepass/icons/nuvola/32x32/actions/fileclose.png
-share/keepass/icons/nuvola/32x32/actions/fileexport.png
-share/keepass/icons/nuvola/32x32/actions/filenew.png
-share/keepass/icons/nuvola/32x32/actions/fileopen.png
-share/keepass/icons/nuvola/32x32/actions/filesave.png
-share/keepass/icons/nuvola/32x32/actions/filesaveas.png
-share/keepass/icons/nuvola/32x32/actions/find.png
-share/keepass/icons/nuvola/32x32/actions/help.png
-share/keepass/icons/nuvola/32x32/actions/identity.png
-share/keepass/icons/nuvola/32x32/actions/klipper_dock.png
-share/keepass/icons/nuvola/32x32/actions/reload.png
-share/keepass/icons/nuvola/32x32/actions/run.png
-share/keepass/icons/nuvola/32x32/apps/ktouch.png
-share/keepass/icons/nuvola/32x32/filesystems/desktop.png
-share/keepass/icons/nuvola/32x32/filesystems/folder.png
-share/keepass/icons/nuvola/32x32/filesystems/folder_home.png
-share/keepass/icons/nuvola/32x32/filesystems/network_local.png
-share/keepass/icons/nuvola/32x32/filesystems/trashcan_full.png
-share/keepass/icons/ok.png
-share/keepass/icons/search.png
-share/keepass/icons/settings.png
-share/keepass/license.html
+@comment $NetBSD: PLIST,v 1.3 2012/10/28 02:00:50 markd Exp $
+bin/keepassx
+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/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 38eec1fa6bb..5be9cce1302 100644
--- a/security/keepassx/distinfo
+++ b/security/keepassx/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/07/03 18:37:55 schwarz Exp $
+$NetBSD: distinfo,v 1.4 2012/10/28 02:00:50 markd Exp $
 
-SHA1 (KeePassX-0.2.2.tar.gz) = bae4b984d32f2bb6220d17a135e3322c4df73fcb
-RMD160 (KeePassX-0.2.2.tar.gz) = ba386cca105227120c0c50a500eee3b2b2bf24ec
-Size (KeePassX-0.2.2.tar.gz) = 302656 bytes
-SHA1 (patch-src_crypto_twofish.cpp) = 7bd41b67c0df56be41a9579d09c5d8d765b97353
-SHA1 (patch-src_lib_random.cpp) = 802b128fcc9c4805e1061246a2c9e9aeb420dbe8
-SHA1 (patch-src_src.pro) = 291d8f96c20a67e5098dac11af457de7300a953b
+SHA1 (keepassx-0.4.3.tar.gz) = d25ecc9d3caaa5a6d0f39a42c730a95997f37e2e
+RMD160 (keepassx-0.4.3.tar.gz) = 3e963d82dd6b8bc32e32dbb46efa9168bac1088b
+Size (keepassx-0.4.3.tar.gz) = 1368766 bytes
diff --git a/security/keepassx/patches/patch-src_crypto_twofish.cpp b/security/keepassx/patches/patch-src_crypto_twofish.cpp
deleted file mode 100644
index a00b2a3bbf1..00000000000
--- a/security/keepassx/patches/patch-src_crypto_twofish.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_crypto_twofish.cpp,v 1.1 2011/11/24 13:37:22 joerg Exp $
-
---- src/crypto/twofish.cpp.orig	2011-11-24 01:43:03.000000000 +0000
-+++ src/crypto/twofish.cpp
-@@ -171,6 +171,7 @@
-  * Standard include files will probably be ok.
-  */
- 
-+#include <stdlib.h>
- #include <qstring.h>     /* for memset(), memcpy(), and memcmp() */
- #include "twofish.h"
- 
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 a204c6977de..00000000000
--- a/security/keepassx/patches/patch-src_lib_random.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_lib_random.cpp,v 1.1 2011/11/24 13:37:22 joerg Exp $
-
---- src/lib/random.cpp.orig	2011-11-24 01:44:17.000000000 +0000
-+++ src/lib/random.cpp
-@@ -21,6 +21,7 @@
- #include <fstream>
- #include <qdatetime.h>
- #include <qobject.h>
-+#include <cstdlib>
- #include "random.h"
- using namespace std;
- 
diff --git a/security/keepassx/patches/patch-src_src.pro b/security/keepassx/patches/patch-src_src.pro
deleted file mode 100644
index 8234b7fffd3..00000000000
--- a/security/keepassx/patches/patch-src_src.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_src.pro,v 1.1 2012/07/03 18:37:55 schwarz Exp $
-
---- src/src.pro.orig	2012-06-30 20:01:34.000000000 +0200
-+++ src/src.pro	2012-06-30 20:02:23.000000000 +0200
-@@ -8,7 +8,7 @@
- data.files += ../share/keepass/* 

- TARGET = ../bin/keepass

- 

--unix:!macx{

-+unix{

- 	isEmpty(PREFIX){

- 		PREFIX=/usr/local

- 	}

-@@ -18,12 +18,6 @@
- 	SOURCES+=lib/AutoType_X11.cpp

- }

- 

--macx{ 

--	target.path = /Applications

--	data.path = /Applications/keepass.app/Contents/share/keepass

--	SOURCES+=lib/AutoType_X11.cpp

--}

--

- win32{

- 	SOURCES+=lib/AutoType_Win.cpp

- 	TARGET=../$$TARGET