[pkgsrc/trunk]: pkgsrc/wm/enlightenment enlightenment: options.mk tweaks

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9772dfaca09a
branches:  trunk
changeset: 418917:9772dfaca09a
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Dec 08 13:26:55 2019 +0000

description:
enlightenment: options.mk tweaks

- Move sound server to an options group, allowing sound to be disabled.
- Enable pango by default since it's a default upstream.

Bit uneasy about esound using libaudiofile given it's kind of dead and
full of bugs but the alternative might be worse.

Bump PKGREVISION

diffstat:

 wm/enlightenment/Makefile   |   3 ++-
 wm/enlightenment/options.mk |  13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 4479961480e1 -r 9772dfaca09a wm/enlightenment/Makefile
--- a/wm/enlightenment/Makefile Sun Dec 08 13:07:41 2019 +0000
+++ b/wm/enlightenment/Makefile Sun Dec 08 13:26:55 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2019/12/07 05:34:10 gutteridge Exp $
+# $NetBSD: Makefile,v 1.75 2019/12/08 13:26:55 nia Exp $
 
 DISTNAME=      e16-1.0.21
 PKGNAME=       ${DISTNAME:S/e16/enlightenment/}
+PKGREVISION=   1
 CATEGORIES=    x11 wm
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff -r 4479961480e1 -r 9772dfaca09a wm/enlightenment/options.mk
--- a/wm/enlightenment/options.mk       Sun Dec 08 13:07:41 2019 +0000
+++ b/wm/enlightenment/options.mk       Sun Dec 08 13:26:55 2019 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: options.mk,v 1.2 2019/12/07 05:11:27 gutteridge Exp $
+# $NetBSD: options.mk,v 1.3 2019/12/08 13:26:55 nia Exp $
 
 # e16 is used here instead of enlightenment to avoid
 # potential conflict with x11/enlightenment.
 PKG_OPTIONS_VAR=       PKG_OPTIONS.e16
 
-PKG_SUPPORTED_OPTIONS= pango pulseaudio vera-ttf
+PKG_OPTIONS_OPTIONAL_GROUPS=   sound
+PKG_OPTIONS_GROUP.sound=       pulseaudio esound
+
+PKG_SUPPORTED_OPTIONS=         pango pulseaudio vera-ttf
+PKG_SUGGESTED_OPTIONS=         pango esound
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,11 +24,14 @@
 CONFIGURE_ARGS+=       --with-sndldr=sndfile
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
-.else
+.elif !empty(PKG_OPTIONS:Mesound)
 CONFIGURE_ARGS+=       --enable-sound=esound
 CONFIGURE_ARGS+=       --with-sndldr=audiofile
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-sound=no
+CONFIGURE_ARGS+=       --with-sndldr=none
 .endif
 
 # The upstream package includes its own Vera fonts. Because these