summaryrefslogtreecommitdiff
path: root/security/MyPasswordSafe
diff options
context:
space:
mode:
Diffstat (limited to 'security/MyPasswordSafe')
-rw-r--r--security/MyPasswordSafe/Makefile8
-rw-r--r--security/MyPasswordSafe/distinfo14
-rw-r--r--security/MyPasswordSafe/patches/patch-aa48
-rw-r--r--security/MyPasswordSafe/patches/patch-ab23
-rw-r--r--security/MyPasswordSafe/patches/patch-ac28
5 files changed, 37 insertions, 84 deletions
diff --git a/security/MyPasswordSafe/Makefile b/security/MyPasswordSafe/Makefile
index bf8252eda8c..dc5f2254eed 100644
--- a/security/MyPasswordSafe/Makefile
+++ b/security/MyPasswordSafe/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/11/17 22:12:37 wiz Exp $
#
-DISTNAME= MyPasswordSafe-20041004.src
-PKGNAME= MyPasswordSafe-20041004
+DISTNAME= MyPasswordSafe-20050615.src
+PKGNAME= MyPasswordSafe-20050615
CATEGORIES= security
-MASTER_SITES= http://www.semanticgap.com/myps/release/devel/
+MASTER_SITES= http://www.semanticgap.com/myps/release/
EXTRACT_SUFX= .tgz
MAINTAINER= tech-pkg@NetBSD.org
diff --git a/security/MyPasswordSafe/distinfo b/security/MyPasswordSafe/distinfo
index 5bb5b6bb354..1566f4a8272 100644
--- a/security/MyPasswordSafe/distinfo
+++ b/security/MyPasswordSafe/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:04 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/17 22:12:37 wiz Exp $
-SHA1 (MyPasswordSafe-20041004.src.tgz) = 6145988be66a10b35df5f88395263018a4ca7725
-RMD160 (MyPasswordSafe-20041004.src.tgz) = 7c2ddbfc33e67a525dc09a778f60688d29bac7e7
-Size (MyPasswordSafe-20041004.src.tgz) = 807655 bytes
-SHA1 (patch-aa) = 5a41f666f0f4e29440dc878e7f7ff2c95a643ec7
-SHA1 (patch-ab) = e1d44a990418e8280f918327b4515f2bd20f12bd
-SHA1 (patch-ac) = ba79a5a8bc3c8289547827d094425fe10fd9e8e7
+SHA1 (MyPasswordSafe-20050615.src.tgz) = 80f3569722617a0884ffcb637dca156708dd4c68
+RMD160 (MyPasswordSafe-20050615.src.tgz) = 9020e75d4cfaf0188f124541691be1feae1224e3
+Size (MyPasswordSafe-20050615.src.tgz) = 823130 bytes
+SHA1 (patch-aa) = 2e0b231b50a39d48b7124381f27e0de968c8e7bf
+SHA1 (patch-ab) = 41f42aa0fa4f9d97431a9a01807a0a2cc838a753
+SHA1 (patch-ac) = f2a1911cb3a7b0de9d99e8ec70299a79c2392b4a
diff --git a/security/MyPasswordSafe/patches/patch-aa b/security/MyPasswordSafe/patches/patch-aa
index 31934c4f2cc..74353abda6e 100644
--- a/security/MyPasswordSafe/patches/patch-aa
+++ b/security/MyPasswordSafe/patches/patch-aa
@@ -1,53 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/06 00:13:20 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/17 22:12:37 wiz Exp $
---- Makefile.orig 2004-10-02 05:40:30.000000000 +0200
+--- Makefile.orig 2004-12-06 14:14:53.000000000 +0100
+++ Makefile
-@@ -28,12 +28,12 @@ MyPasswordSafe.mak: MyPasswordSafe.pro
- $(QMAKE) -o $@ $<
+@@ -29,7 +29,7 @@ MyPasswordSafe.mak: MyPasswordSafe.pro
MyPasswordSafe: config uuid-1.0.0/.libs/libuuid.a MyPasswordSafe.mak
-- make -f MyPasswordSafe.mak
+ ${MAKE} -f MyPasswordSafe.mak
- lrelease locale/*.ts
-+ ${MAKE} -f MyPasswordSafe.mak
+ ${LOCALBASE}/qt3/bin/lrelease locale/*.ts
uuid-1.0.0/.libs/libuuid.a:
cd uuid-1.0.0 && ./configure --prefix=$(PREFIX) && cd ..
-- make -C uuid-1.0.0
-+ ${MAKE} -C uuid-1.0.0
-
- doc/api:
- mkdir doc/api
-@@ -54,18 +54,18 @@ src/config.h:
- config: src/config.h
-
- clean: MyPasswordSafe.mak
-- make -f $< clean
-- make -C uuid-1.0.0 clean
-+ ${MAKE} -f $< clean
-+ ${MAKE} -C uuid-1.0.0 clean
- rm $<
- rm -r doc/api
-
- install:
- install -d $(PREFIX)/bin $(PREFIX)/share/MyPasswordSafe/locale \
-- $(PREFIX)/doc/MyPasswordSafe/sshots
-+ $(PREFIX)/share/doc/MyPasswordSafe/sshots
- install MyPasswordSafe $(PREFIX)/bin/MyPasswordSafe
- install -m 0644 locale/*.qm $(PREFIX)/share/MyPasswordSafe/locale
-- install -m 0644 doc/manual.html $(PREFIX)/doc/MyPasswordSafe
-- install -m 0644 doc/sshots/*.jpg $(PREFIX)/doc/MyPasswordSafe/sshots
-+ install -m 0644 doc/manual.html $(PREFIX)/share/doc/MyPasswordSafe
-+ install -m 0644 doc/sshots/*.jpg $(PREFIX)/share/doc/MyPasswordSafe/sshots
-
- uninstall:
- rm $(PREFIX)/bin/MyPasswordSafe
-@@ -73,7 +73,7 @@ uninstall:
- rm -r $(PREFIX)/doc/MyPasswordSafe
-
- release:
-- make -c release
-+ ${MAKE} -c release
-
- commit:
- cvs commit
diff --git a/security/MyPasswordSafe/patches/patch-ab b/security/MyPasswordSafe/patches/patch-ab
index 2d14ddc9e85..9036dee11b6 100644
--- a/security/MyPasswordSafe/patches/patch-ab
+++ b/security/MyPasswordSafe/patches/patch-ab
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/06 00:13:20 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/17 22:12:37 wiz Exp $
---- src/pwsafe/PwsPlatform.h.orig 2004-05-05 00:48:46.000000000 +0200
-+++ src/pwsafe/PwsPlatform.h
-@@ -3,7 +3,11 @@
- #ifndef PwsPlatform_h
- #define PwsPlatform_h
+--- src/crypto/sha1.h.orig 2004-12-06 13:32:07.000000000 +0100
++++ src/crypto/sha1.h
+@@ -15,7 +15,7 @@
+ #include <stdint.h>
+ #include <string>
-+#ifdef __NetBSD__
-+#include <sys/endian.h>
-+#else
- #include <endian.h>
-+#endif
+-#include "endian.h"
++#include "myendian.h"
+
+ using std::string;
- #ifndef BYTE_ORDER
- #error BYTE_ORDER not defined
diff --git a/security/MyPasswordSafe/patches/patch-ac b/security/MyPasswordSafe/patches/patch-ac
index 5adeb5c6cf9..2b59f5a9592 100644
--- a/security/MyPasswordSafe/patches/patch-ac
+++ b/security/MyPasswordSafe/patches/patch-ac
@@ -1,17 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/10/06 00:13:20 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/17 22:12:37 wiz Exp $
---- src/pwsafe/Util.h.orig 2004-05-05 00:47:07.000000000 +0200
-+++ src/pwsafe/Util.h
-@@ -10,8 +10,12 @@
- #include <assert.h>
-
- #ifndef WIN32
-+#ifdef __NetBSD__
-+#include <sys/endian.h>
-+#else
- #include <endian.h>
- #endif
-+#endif
-
- #include <string>
- using std::string;
+qt3-3.3.5 fix. Can probably be removed after next qt3 release.
+
+--- src/mypasswordsafe.ui.orig 2004-12-06 17:03:46.000000000 +0100
++++ src/mypasswordsafe.ui
+@@ -1006,6 +1006,5 @@
+ <pixmapinproject/>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>safelistview.h</includehint>
+ </includehints>
+ </UI>