Index: head/sysutils/passwordsafe/Makefile =================================================================== --- head/sysutils/passwordsafe/Makefile (revision 568410) +++ head/sysutils/passwordsafe/Makefile (revision 568411) @@ -1,78 +1,78 @@ # $FreeBSD$ PORTNAME= passwordsafe -DISTVERSION= 1.03BETA -PORTREVISION= 3 +DISTVERSION= 1.12.0 CATEGORIES= sysutils MAINTAINER= brnrd@FreeBSD.org 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 CONFLICTS= pwsafe-[0-9]* -USES= gmake xorg +USES= gmake pkgconfig xorg USE_GITHUB= yes USE_WX= 3.0+ USE_XORG= x11 xtst OPTIONS_DEFINE= NLS YUBIKEY YUBIKEY_DESC= Yubikey support OPTIONS_SUB= yes NLS_USES= gettext YUBIKEY_LIB_DEPENDS= libykpers-1.so:security/ykpers YUBIKEY_MAKE_ENV_OFF= NO_YUBI=yes +MAKE_ENV= NO_QR=yes + GH_ACCOUNT= pwsafe GH_PROJECT= ${GH_ACCOUNT} WX_COMP= wx WANT_WX_VER= 3.0 LDFLAGS= -L${PREFIX}/lib -lqrencode ALL_TARGET= unicoderelease .include .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 USES+= compiler:gcc-c++11-lib .else USES+= compiler:c++11-lang .endif post-patch: . for f in Makefile.freebsd help/Makefile.freebsd src/os/unix/Makefile \ - src/os/unix/dir.cpp src/ui/wxWidgets/pwsafeapp.cpp \ - src/ui/wxWidgets/Makefile + src/os/unix/dir.cpp src/ui/wxWidgets/Makefile ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/$f . endfor post-build: ${GMAKE} -C ${WRKSRC}/src/ui/wxWidgets/I18N mos ${GMAKE} -C ${WRKSRC}/help all do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ui/wxWidgets/GCCUnicodeRelease/pwsafe \ ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR}/help ${CP} ${WRKSRC}/help/help*.zip ${STAGEDIR}${DOCSDIR}/help post-install-NLS-on: .for l in da de es fr it ko nl pl ru sv zh ${MKDIR} ${STAGEDIR}${PREFIX}/locale/$l/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/src/ui/wxWidgets/I18N/mos/$l/LC_MESSAGES/pwsafe.mo \ ${STAGEDIR}${PREFIX}/locale/$l/LC_MESSAGES .endfor .include Index: head/sysutils/passwordsafe/distinfo =================================================================== --- head/sysutils/passwordsafe/distinfo (revision 568410) +++ head/sysutils/passwordsafe/distinfo (revision 568411) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512977443 -SHA256 (pwsafe-pwsafe-1.03BETA_GH0.tar.gz) = 36d64d748a63825cb17e247628f6a378f131d952d4c1715cc6304e4d07b3e0ed -SIZE (pwsafe-pwsafe-1.03BETA_GH0.tar.gz) = 14391644 +TIMESTAMP = 1615744771 +SHA256 (pwsafe-pwsafe-1.12.0_GH0.tar.gz) = 8d331019170f2920a28ccda08ae420c78e016f41d3ccedb7b4dba1f5f7f25bcb +SIZE (pwsafe-pwsafe-1.12.0_GH0.tar.gz) = 14937705 Index: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp =================================================================== --- head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp (revision 568410) +++ head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/ui/wxWidgets/passwordsubset.cpp.orig 2017-11-20 03:11:40.369984000 +0300 -+++ src/ui/wxWidgets/passwordsubset.cpp 2017-11-20 03:12:19.012627000 +0300 -@@ -240,7 +240,7 @@ - m_vals->Clear(); - m_error->SetLabel(wxEmptyString); - -- std::wistringstream is(pos_str.wc_str()); -+ std::wistringstream is(static_cast(pos_str.wc_str())); - int pos; - while (is >> pos) { - if (pos > 0 && pos <= N) -@@ -280,7 +280,7 @@ - wxASSERT(val_str.length() % 2 == 0); - for (size_t i = 0; i < val_str.length(); i += 2) - reduced_str += val_str[i]; -- PWSclipboard::GetInstance()->SetData(reduced_str.wc_str()); -+ PWSclipboard::GetInstance()->SetData(static_cast(reduced_str.wc_str())); - } - } - Property changes on: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp =================================================================== --- head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp (revision 568410) +++ head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp (nonexistent) @@ -1,24 +0,0 @@ -From b5c12954802f733cbef5a83b1b2d07b8fde8a6b0 Mon Sep 17 00:00:00 2001 -From: Bernard Spil -Date: Sun, 19 Nov 2017 20:53:11 +0100 -Subject: [PATCH] Unbreak build on FreeBSD - -The function wxLinuxDistributionInfo is only available on Linux. Add check for LINUX symbol as per [documentation](http://docs.wxwidgets.org/3.0/group__group__funcmacro__networkuseros.html#ga06f6fb212c396bd20865ee4e2f69aa1f) -`This function is Linux-specific and is only available when the LINUX symbol is defined. ` ---- - src/ui/wxWidgets/wxutils.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ui/wxWidgets/wxutils.cpp b/src/ui/wxWidgets/wxutils.cpp -index 25faa5310..027ee69b4 100644 ---- src/ui/wxWidgets/wxutils.cpp.orig -+++ src/ui/wxWidgets/wxutils.cpp -@@ -203,7 +203,7 @@ int pless(int* first, int* second) { return *first - *second; } - // on Fedora or Ubuntu - bool IsTaskBarIconAvailable() - { --#ifdef __WXGTK__ -+#if defined(__WXGTK__) && defined(LINUX) - const wxLinuxDistributionInfo ldi = wxGetLinuxDistributionInfo(); - if (ldi.Id.IsEmpty() || ldi.Id == wxT("Ubuntu") || ldi.Id == wxT("Fedora")) - return false; Property changes on: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp =================================================================== --- head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp (nonexistent) +++ head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp (revision 568411) @@ -0,0 +1,18 @@ +From b5c12954802f733cbef5a83b1b2d07b8fde8a6b0 Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Sun, 19 Nov 2017 20:53:11 +0100 +Subject: [PATCH] Unbreak build on FreeBSD + +The function wxLinuxDistributionInfo is only available on Linux. Add check for LINUX symbol as per [documentation](http://docs.wxwidgets.org/3.0/group__group__funcmacro__networkuseros.html#ga06f6fb212c396bd20865ee4e2f69aa1f) +`This function is Linux-specific and is only available when the LINUX symbol is defined. ` +--- src/ui/wxWidgets/wxUtilities.cpp.orig 2020-10-28 19:48:24 UTC ++++ src/ui/wxWidgets/wxUtilities.cpp +@@ -203,7 +203,7 @@ int pless(int* first, int* second) { return *first - * + // on Fedora or Ubuntu + bool IsTaskBarIconAvailable() + { +-#if defined(__WXGTK__) ++#if defined(__WXGTK__) && defined(LINUX) + const wxVersionInfo verInfo = wxGetLibraryVersionInfo(); + int major = verInfo.GetMajor(); + int minor = verInfo.GetMinor(); Property changes on: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property