From a7870666dba0a5fd60e4667cca53f25b431ecfe9 Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <raf-ep@gmx.com>
Date: Mon, 23 Nov 2015 13:38:57 +0000
Subject: [PATCH] New package: passwordsafe-0.97BETA

Thanks @yopito for the path patche and multiple fixes.
---
 .../patches/override-ldflags.patch            | 24 +++++++++++
 ...passwordsafe-0.97-fix-resource-paths.patch | 15 +++++++
 srcpkgs/passwordsafe/template                 | 41 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 srcpkgs/passwordsafe/patches/override-ldflags.patch
 create mode 100644 srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch
 create mode 100644 srcpkgs/passwordsafe/template

diff --git a/srcpkgs/passwordsafe/patches/override-ldflags.patch b/srcpkgs/passwordsafe/patches/override-ldflags.patch
new file mode 100644
index 00000000000..58bebc64ea2
--- /dev/null
+++ b/srcpkgs/passwordsafe/patches/override-ldflags.patch
@@ -0,0 +1,24 @@
+make LDFLAGS=... discarded internal LDFLAGS see
+https://github.com/pwsafe/pwsafe/issues/42
+
+diff -ru pwsafe-0.97BETA/src/ui/wxWidgets/Makefile pwsafe-n/src/ui/wxWidgets/Makefile
+--- src/ui/wxWidgets/Makefile	2015-10-09 09:35:00.000000000 +0100
++++ src/ui/wxWidgets/Makefile	2015-11-23 11:10:08.509509481 +0000
+@@ -139,7 +139,7 @@
+ XERCESCPPFLAGS=-DUSE_XML_LIBRARY=XERCES -DWCHAR_INCOMPATIBLE_XMLCH
+ XERCESLIBFLAGS=-lxerces-c
+ GCCFLAGS=-fPIC
+-LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(LDFLAGS)
++override LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(LDFLAGS)
+ RESPATH=--include-dir "$(WXWIN)/include" --include-dir "$(WXWIN)/contrib/include" --include-dir "$(WXWIN)/GCCBuildReleaseGTK2Unicode/lib/wx/include/gtk2-unicode-release-static-2.6"
+ MACPACKAGEINFO=
+ endif
+@@ -155,7 +155,7 @@
+ YBPERS_LIBPATH_FLAGS=-L$(YBPERS_LIBPATH)
+ endif
+ 
+-LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(XERCESLIBFLAGS) $(YBPERS_LIBPATH_FLAGS) $(LDFLAGS)
++override LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(XERCESLIBFLAGS) $(YBPERS_LIBPATH_FLAGS) $(LDFLAGS)
+ CPPFLAGS:=$(CXXFLAGS) $(CPPINC) $(GCCFLAGS) $(DEBUGFLAGS) $(OPTFLAGS) $(WARNINGFLAGS) $(XERCESCPPFLAGS) $(YUBIFLAGS) $(CPPFLAGS)
+ 
+ SOURCES= passwordsafeframe.cpp \
diff --git a/srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch b/srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch
new file mode 100644
index 00000000000..05adc3290d9
--- /dev/null
+++ b/srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch
@@ -0,0 +1,15 @@
+--- src/os/linux/dir.cpp.orig	2015-10-09 10:35:00.000000000 +0200
++++ src/os/linux/dir.cpp	2015-11-18 12:40:54.216572503 +0100
+@@ -151,10 +151,10 @@
+ 
+ stringT pws_os::getxmldir(void)
+ {
+-  return _S("/usr/share/pwsafe/xml/");
++  return _S("/usr/share/passwordsafe/xml/");
+ }
+ 
+ stringT pws_os::gethelpdir(void)
+ {
+-  return _S("/usr/share/doc/passwordsafe/help/");
++  return _S("/usr/share/passwordsafe/help/");
+ }
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
new file mode 100644
index 00000000000..5a8a6e7e9cb
--- /dev/null
+++ b/srcpkgs/passwordsafe/template
@@ -0,0 +1,41 @@
+# Template file for 'passwordwsafe'
+pkgname=passwordsafe
+version="0.97BETA"
+revision=1
+wrksrc="pwsafe-${version}"
+build_style=gnu-makefile
+# TODO: pkg dependencies to support yubikey
+make_build_args="NO_YUBI=1"
+make_build_target="release help I18N"
+# Makefile uses perl to generate core_st.cpp, zip to generate help files
+hostmakedepends="perl wxWidgets-devel zip pkg-config gettext"
+makedepends="wxWidgets-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel"
+short_desc="Simple & Secure Password Management"
+maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
+license="Artistic-2.0"
+homepage="http://pwsafe.org"
+distfiles="https://github.com/pwsafe/pwsafe/releases/download/${version}/pwsafe-${version}-src.tgz"
+checksum=f1cdbdda7ef795d974772e40a0d040deb296c110ded1bd05a524a6baa152a9a8
+nocross=yes
+
+do_install() {
+	vbin src/ui/wxWidgets/GCCUnicodeRelease/pwsafe
+	vinstall install/desktop/pwsafe.desktop 644 usr/share/applications
+	vinstall install/graphics/pwsafe.png 644 usr/share/icons/hicolor/48x48/apps/
+	# Help files
+	for f in help/help*.zip; do
+		vinstall $f 644 usr/share/${pkgname}/help
+	done
+	# XML files
+	vmkdir usr/share/pwsafe
+	vcopy xml usr/share/${pkgname}
+	vlicense LICENSE
+	vdoc docs/config.txt
+	vman docs/pwsafe.1
+	# 0.97BETA: ignore locales:
+	#        weird behaviour on GUI language change in application.
+	#        might be related to UTF-8.
+	#vmkdir usr/share/locale
+	#vcopy src/ui/wxWidgets/I18N/mos/* usr/share/locale
+}
+