Update to 20060326. Add options.mk file in preparation of eventual

qt4 support (doesn't compile yet).

2006-03-26 19:06  nolan

	* src/serializers.cpp: Had a reported bug in which only the items
	  in a single group got saved with a PwSafe 1.0 safe. The repro
	  steps were:	Create a safe with a few entries   Save it as a
	  PwSafe 1.0 safe   Create a couple of folders	 Move the items
	  into those folders   Save the safe.	 Reopen the safe  It ended
	  up with the items from a single group instead of all the items.
	  The cause was that I was returning from a recursive call to
	  BlowfishLizer::saveGroup instead of only returning on an error.

2006-01-23 20:57  nolan

	* MyPasswordSafe.pro, MyPasswordSafe.qrc, src/aboutdlg.ui,
	  src/main.cpp, src/manualdlg.ui, src/mypasswordsafe.ui,
	  src/mypasswordsafe.ui.h, src/newpassphrasedlg.ui,
	  src/passphrasedlg.ui, src/plaintextlizer.cpp,
	  src/plaintextlizer.hpp, src/preferencesdlg.ui,
	  src/preferencesdlg.ui.h, src/pwordeditdlg.ui, src/safe.hpp,
	  src/safedragobject.cpp, src/safedragobject.hpp,
	  src/safelistview.cpp, src/safelistview.hpp, src/serializers.cpp,
	  src/startupdlgbase.ui, src/xmlserializer.cpp,
	  src/tools/idle/idle_x11.cpp, uuid-1.0.0/Makefile,
	  uuid-1.0.0/config.status: Converted to Qt4

2005-12-17 06:47  nolan

	* src/: mypasswordsafe.ui.h, pwordeditdlg.ui, pwordeditdlg.ui.h:
	  Set the edit dialog as the active window if the user tries to
	  edit that item a second time.  Moved the future group handling
	  for new items into MyPasswordSafe

2005-12-17 06:33  nolan

	* src/: mypasswordsafe.ui, mypasswordsafe.ui.h, pwordeditdlg.ui,
	  pwordeditdlg.ui.h, safelistview.cpp: Made the add and edit
	  dialogs non-modal Hiding during a lock now works

2005-12-17 05:03  nolan

	* src/: mypasswordsafe.ui, mypasswordsafe.ui.h, pwordeditdlg.ui,
	  pwordeditdlg.ui.h, safelistview.cpp, safelistview.hpp: Attempted
	  to hide the edit dialog when MyPS got locked, but that caused a
	  crash so they get closed.  Moved entry creation and updating to
	  PwordEditDlg Moved the default user name and generation length
	  into PwordEditDlg

2005-12-17 02:42  nolan

	* src/pwordeditdlg.ui.h, src/serializers.cpp, uuid-1.0.0/Makefile,
	  uuid-1.0.0/config.status: Fixed the problem with the show
	  password button; was checking for a normal echo mode

2005-11-25 00:21  nolan

	* src/: mypasswordsafe.ui, mypasswordsafe.ui.h: Lock on minimize
	  works under WindowMaker

2005-11-24 01:23  nolan

	* src/mypasswordsafe.ui.h: Parented all the dialogs

2005-11-23 22:15  nolan

	* release/Makefile: Updated release path and upload rules

2005-11-23 11:14  nolan

	* src/: mypasswordsafe.ui.h, pwordeditdlg.ui, pwordeditdlg.ui.h:
	  Had a bug in the user name and password checking in the edit
	  dialog.  Fixed that by adding an isNew attribute.

2005-11-23 08:21  nolan

	* src/tools/idle/: idle.cpp, idle.h, idle.pri, idle_mac.cpp,
	  idle_win.cpp, idle_x11.cpp, win32/Makefile, win32/idleui.cpp,
	  win32/idleui.def, win32/idleui.dll, win32/idleui.h: Added Idle
	  from Psi to lock MyPS

2005-11-23 08:21  nolan

	* src/mypasswordsafe.ui, src/mypasswordsafe.ui.h,
	  src/preferencesdlg.ui, src/preferencesdlg.ui.h,
	  src/pwordeditdlg.ui, src/pwordeditdlg.ui.h, src/safe.cpp,
	  src/safe.hpp, src/safelistview.cpp, src/safelistview.hpp,
	  src/serializers.cpp, test/safe/safe.pro, test/safe/safetest.cpp:
	  Added Idle from Psi to lock MyPS Add Password: automatically
	  generate a new password and display it to the user Confirm
	  changes to user name and/or password in entries Empty fields are
	  now saved working around a bug in Password Safe Clipboard will be
	  cleared after a specified time Generated passwords are
	  automatically fetched

2005-11-23 08:19  nolan

	* MyPasswordSafe.pro: Added Idle from Psi

3 files changed, 27 insertions, 10 deletions

diff --git a/security/MyPasswordSafe/Makefile b/security/MyPasswordSafe/Makefile
index 33930539b2f..ff6b2a3c3ad 100644
--- a/security/MyPasswordSafe/Makefile
+++ b/security/MyPasswordSafe/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:33 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/29 22:14:18 wiz Exp $
 #
 
-DISTNAME=		MyPasswordSafe-20050615.src
-PKGNAME=		MyPasswordSafe-20050615
-PKGREVISION=		3
+DISTNAME=		MyPasswordSafe-20060326.src
+PKGNAME=		MyPasswordSafe-20060326
 CATEGORIES=		security
 MASTER_SITES=		http://www.semanticgap.com/myps/release/
 EXTRACT_SUFX=		.tgz
@@ -12,10 +11,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.semanticgap.com/myps/
 COMMENT=		Easy-to-use password manager
 
+.include "options.mk"
+
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=		gmake
 MAKE_FLAGS+=		QMAKE=${QTDIR:Q}/bin/qmake
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/MyPasswordSafe/distinfo b/security/MyPasswordSafe/distinfo
index 0acc32ab9c0..d32956ee778 100644
--- a/security/MyPasswordSafe/distinfo
+++ b/security/MyPasswordSafe/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/01/19 23:39:19 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/03/29 22:14:18 wiz Exp $
 
-SHA1 (MyPasswordSafe-20050615.src.tgz) = 80f3569722617a0884ffcb637dca156708dd4c68
-RMD160 (MyPasswordSafe-20050615.src.tgz) = 9020e75d4cfaf0188f124541691be1feae1224e3
-Size (MyPasswordSafe-20050615.src.tgz) = 823130 bytes
+SHA1 (MyPasswordSafe-20060326.src.tgz) = 355aa95e9388a1685c3420d0ed524ff4cd180d9c
+RMD160 (MyPasswordSafe-20060326.src.tgz) = a0acc078b7cda1e969bf74c28d86d60360ce381b
+Size (MyPasswordSafe-20060326.src.tgz) = 835296 bytes
 SHA1 (patch-aa) = 2e0b231b50a39d48b7124381f27e0de968c8e7bf
 SHA1 (patch-ab) = 41f42aa0fa4f9d97431a9a01807a0a2cc838a753
 SHA1 (patch-ac) = f2a1911cb3a7b0de9d99e8ec70299a79c2392b4a
diff --git a/security/MyPasswordSafe/options.mk b/security/MyPasswordSafe/options.mk
new file mode 100644
index 00000000000..21fb29f89d6
--- /dev/null
+++ b/security/MyPasswordSafe/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2006/03/29 22:14:18 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.MyPasswordSafe
+PKG_SUGGESTED_OPTIONS=	qt3
+PKG_OPTIONS_REQUIRED_GROUPS=	gui
+PKG_OPTIONS_GROUP.gui=	qt3 # qt4 - not yet
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mqt3)
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.endif