CVS commit: pkgsrc/security/vaultwarden

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sun Mar 30 12:56:14 UTC 2025

Modified Files:
        pkgsrc/security/vaultwarden: Makefile options.mk

Log Message:
Make package build with mysql or pgsql support.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/vaultwarden/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/vaultwarden/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/vaultwarden/Makefile
diff -u pkgsrc/security/vaultwarden/Makefile:1.10 pkgsrc/security/vaultwarden/Makefile:1.11
--- pkgsrc/security/vaultwarden/Makefile:1.10   Mon Feb 24 08:59:37 2025
+++ pkgsrc/security/vaultwarden/Makefile        Sun Mar 30 12:56:13 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2025/02/24 08:59:37 adam Exp $
+# $NetBSD: Makefile,v 1.11 2025/03/30 12:56:13 hauke Exp $
 
 DISTNAME=      vaultwarden-1.33.2
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dani-garcia/}
 
@@ -17,7 +18,7 @@ SITES.yubico-${YUBICO_REV}.tar.gz=    -${MA
 
 .include "cargo-depends.mk"
 
-USE_TOOLS+=    perl
+USE_TOOLS+=    pkg-config perl
 
 DEPENDS+=      daemonize>=1.7.8:../../sysutils/daemonize
 

Index: pkgsrc/security/vaultwarden/options.mk
diff -u pkgsrc/security/vaultwarden/options.mk:1.2 pkgsrc/security/vaultwarden/options.mk:1.3
--- pkgsrc/security/vaultwarden/options.mk:1.2  Mon Feb 24 08:59:37 2025
+++ pkgsrc/security/vaultwarden/options.mk      Sun Mar 30 12:56:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2025/02/24 08:59:37 adam Exp $
+# $NetBSD: options.mk,v 1.3 2025/03/30 12:56:13 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vaultwarden
 PKG_SUPPORTED_OPTIONS=         web-vault
@@ -12,16 +12,19 @@ PLIST_VARS+=                web-vault
 
 .if !empty(PKG_OPTIONS:Msqlite)
 CARGO_FEATURES+=       sqlite
+RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
 .  include "../../databases/sqlite3/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 CARGO_FEATURES+=       postgresql
+RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib
 .  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
 CARGO_FEATURES+=       mysql
+RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib
 .  include "../../mk/mysql.buildlink3.mk"
 .endif