summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/passwordsafe/Makefile8
-rw-r--r--sysutils/passwordsafe/files/patch-Makefile.freebsd15
2 files changed, 18 insertions, 5 deletions
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
index 842a5eb7fb20..75552c230f73 100644
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -10,17 +10,17 @@ COMMENT= Popular secure and convenient password manager
LICENSE= ART20
+NOT_FOR_ARCHS= aarch64 armv6 armv7
+NOT_FOR_ARCHS_REASON= Cannot determine whether the target CPU is big or little endian - please fix PwsPlatform.h
+
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
libxerces-c.so:textproc/xerces-c3 \
libqrencode.so:graphics/libqrencode
BUILD_DEPENDS= zip:archivers/zip
-NOT_FOR_ARCHS= aarch64 armv6 armv7
-NOT_FOR_ARCHS_REASON= Cannot determine whether the target CPU is big or little endian - please fix PwsPlatform.h
-
CONFLICTS= pwsafe-[0-9]*
-USES= gmake
+USES= compiler:c++11-lang gmake
USE_GITHUB= yes
USE_WX= 3.0+
USE_XORG= x11 xtst
diff --git a/sysutils/passwordsafe/files/patch-Makefile.freebsd b/sysutils/passwordsafe/files/patch-Makefile.freebsd
index 641f46601163..28b0b23ba73a 100644
--- a/sysutils/passwordsafe/files/patch-Makefile.freebsd
+++ b/sysutils/passwordsafe/files/patch-Makefile.freebsd
@@ -1,4 +1,4 @@
---- Makefile.freebsd.orig 2017-05-01 15:10:07 UTC
+--- Makefile.freebsd.orig 2017-10-07 17:53:15 UTC
+++ Makefile.freebsd
@@ -34,8 +34,6 @@ GIT := git
GZIP := gzip
@@ -9,3 +9,16 @@
GPG := /usr/local/bin/gpg
GPG_SIGN := $(GPG) --detach-sign --default-key $(GPG_KEY)
SIGN_CMD := $(foreach file, $(wildcard $(RELEASEDIR)/*$(RELEASENAME)*), $(GPG_SIGN) $(file); )
+@@ -46,11 +44,8 @@ SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEAS
+ RELTAG = wx$(subst .,_,$(RELEASENAME))
+
+ export CPPFLAGS += -std=c++11
+-export CXXFLAGS += --stdlib=libc++ -I/usr/local/include
++export CXXFLAGS += -I/usr/local/include
+ export CFLAGS += -I/usr/local/include
+-export CC = clang
+-export CXX = clang++
+-export CPP = clang++
+ export PLATFORM = FreeBSD
+
+ all: I18N unicodedebug unicoderelease