CVS commit: pkgsrc/audio/ncspot

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Oct 20 22:54:40 UTC 2020

Modified Files:
        pkgsrc/audio/ncspot: Makefile options.mk

Log Message:
ncspot: turn xcb off by default. Terminal apps should not need X11.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/ncspot/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ncspot/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/audio/ncspot/Makefile
diff -u pkgsrc/audio/ncspot/Makefile:1.7 pkgsrc/audio/ncspot/Makefile:1.8
--- pkgsrc/audio/ncspot/Makefile:1.7    Tue Oct 20 19:03:07 2020
+++ pkgsrc/audio/ncspot/Makefile        Tue Oct 20 22:54:40 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/10/20 19:03:07 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/20 22:54:40 tnn Exp $
 
 DISTNAME=      ncspot-0.2.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=hrkfdn/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -425,12 +425,9 @@ INSTALLATION_DIRS= bin
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
-RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.libxcb}/lib
 MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 CARGO_NO_DEFAULT_FEATURES=     YES
-CARGO_FEATURES+=               share_clipboard
 
 .include "options.mk"
 
@@ -440,5 +437,4 @@ do-install:
 .include "../../lang/python/tool.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libxcb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/ncspot/options.mk
diff -u pkgsrc/audio/ncspot/options.mk:1.1 pkgsrc/audio/ncspot/options.mk:1.2
--- pkgsrc/audio/ncspot/options.mk:1.1  Tue Oct 20 18:40:31 2020
+++ pkgsrc/audio/ncspot/options.mk      Tue Oct 20 22:54:40 2020
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2020/10/20 18:40:31 tnn Exp $
+# $NetBSD: options.mk,v 1.2 2020/10/20 22:54:40 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ncspot
 PKG_OPTIONS_OPTIONAL_GROUPS=   backend ui
 PKG_OPTIONS_GROUP.backend=     alsa portaudio pulseaudio rodio
 PKG_OPTIONS_GROUP.ui=          ncursesw termion
 
-PKG_SUPPORTED_OPTIONS= dbus
+PKG_SUPPORTED_OPTIONS= dbus xcb
 PKG_SUGGESTED_OPTIONS= portaudio ncursesw
 
 .include "../../mk/bsd.options.mk"
@@ -45,9 +45,14 @@ CARGO_FEATURES+=     cursive/termion-backend
 
 .if !empty(PKG_OPTIONS:Mdbus)
 CARGO_FEATURES+=       mpris
-CARGO_FEATURES+=       notif
+CARGO_FEATURES+=       notify
 RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.dbus}/lib
 .  include "../../sysutils/dbus/buildlink3.mk"
-.else
+.endif
 
+.if !empty(PKG_OPTIONS:Mxcb)
+CARGO_FEATURES+=       share_clipboard
+RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
+RUSTFLAGS+=            -C link-arg=-L${BUILDLINK_PREFIX.libxcb}/lib
+.include "../../x11/libxcb/buildlink3.mk"
 .endif