Thu Mar 26 21:50:24 2020 UTC ()
Don't try using jemalloc on NetBSD, it doesn't work.


(joerg)
diff -r1.20 -r1.21 pkgsrc/security/keepassxc/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/security/keepassxc/Makefile (expand / switch to unified diff)

--- pkgsrc/security/keepassxc/Makefile 2020/03/10 22:10:54 1.20
+++ pkgsrc/security/keepassxc/Makefile 2020/03/26 21:50:24 1.21
@@ -1,38 +1,34 @@ @@ -1,38 +1,34 @@
1# $NetBSD: Makefile,v 1.20 2020/03/10 22:10:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2020/03/26 21:50:24 joerg Exp $
2 2
3DISTNAME= keepassxc-${GITHUB_RELEASE}-src 3DISTNAME= keepassxc-${GITHUB_RELEASE}-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ${MASTER_SITE_GITHUB:=keepassxreboot/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=keepassxreboot/}
8GITHUB_RELEASE= 2.5.3 8GITHUB_RELEASE= 2.5.3
9GITHUB_PROJECT= keepassxc 9GITHUB_PROJECT= keepassxc
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://keepassxc.org/ 13HOMEPAGE= https://keepassxc.org/
14COMMENT= Password generator and manager 14COMMENT= Password generator and manager
15LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v3 AND mit AND cc0-1.0-universal 15LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v3 AND mit AND cc0-1.0-universal
16 16
17SUPERSEDES+= keepassx-[0-9]* 17SUPERSEDES+= keepassx-[0-9]*
18SUPERSEDES+= keepassx0-[0-9]* 18SUPERSEDES+= keepassx0-[0-9]*
19 19
20WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 20WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
21 21
22.if exists(/usr/lib/libjemalloc.so) 
23LDFLAGS.NetBSD+= -ljemalloc # for malloc_usable_size() 
24.endif 
25 
26USE_CMAKE= yes 22USE_CMAKE= yes
27USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
28CMAKE_ARG_PATH= .. 24CMAKE_ARG_PATH= ..
29CMAKE_ARGS+= -DKEEPASSXC_BUILD_TYPE=Release 25CMAKE_ARGS+= -DKEEPASSXC_BUILD_TYPE=Release
30CONFIGURE_DIRS= build 26CONFIGURE_DIRS= build
31 27
32NOT_PAX_MPROTECT_SAFE+= bin/keepassxc 28NOT_PAX_MPROTECT_SAFE+= bin/keepassxc
33 29
34.PHONY: qmake-bin-add 30.PHONY: qmake-bin-add
35pre-configure: qmake-bin-add 31pre-configure: qmake-bin-add
36 32
37qmake-bin-add: 33qmake-bin-add:
38 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 34 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/