CVS commit: pkgsrc/wm/enlightenment

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Dec  8 13:26:55 UTC 2019

Modified Files:
        pkgsrc/wm/enlightenment: Makefile options.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/wm/enlightenment/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/enlightenment/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/wm/enlightenment/Makefile
diff -u pkgsrc/wm/enlightenment/Makefile:1.74 pkgsrc/wm/enlightenment/Makefile:1.75
--- pkgsrc/wm/enlightenment/Makefile:1.74       Sat Dec  7 05:34:10 2019
+++ pkgsrc/wm/enlightenment/Makefile    Sun Dec  8 13:26:55 2019
@@ -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/}
 

Index: pkgsrc/wm/enlightenment/options.mk
diff -u pkgsrc/wm/enlightenment/options.mk:1.2 pkgsrc/wm/enlightenment/options.mk:1.3
--- pkgsrc/wm/enlightenment/options.mk:1.2      Sat Dec  7 05:11:27 2019
+++ pkgsrc/wm/enlightenment/options.mk  Sun Dec  8 13:26:55 2019
@@ -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+=    --enable-sound=pulseaud
 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