CVS commit: pkgsrc/wm/golem

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jan 20 21:17:51 UTC 2020

Modified Files:
        pkgsrc/wm/golem: Makefile PLIST

Log Message:
golem: Remove esound support


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/wm/golem/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/golem/PLIST

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

Modified files:

Index: pkgsrc/wm/golem/Makefile
diff -u pkgsrc/wm/golem/Makefile:1.35 pkgsrc/wm/golem/Makefile:1.36
--- pkgsrc/wm/golem/Makefile:1.35       Sat Jan 18 23:35:40 2020
+++ pkgsrc/wm/golem/Makefile    Mon Jan 20 21:17:51 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2020/01/18 23:35:40 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2020/01/20 21:17:51 nia Exp $
 #
 
 DISTNAME=      golem-0.0.5
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    wm
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=golem/}
 
@@ -14,6 +14,7 @@ USE_TOOLS+=   gmake yacc lex
 GNU_CONFIGURE= YES
 
 CONFIGURE_ARGS+=       --enable-i18n
+CONFIGURE_ARGS+=       --disable-sound
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -22,18 +23,6 @@ CONFIGURE_ARGS+=     --enable-xinerama
 .include "../../x11/libXinerama/buildlink3.mk"
 .endif
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.golem
-PKG_SUPPORTED_OPTIONS= esound
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=           esound
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=       --enable-sound
-PLIST.esound=          yes
-.include "../../audio/esound/buildlink3.mk"
-.endif
-
 CFLAGS+=       -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 EGDIR=         ${PREFIX}/share/examples/golem

Index: pkgsrc/wm/golem/PLIST
diff -u pkgsrc/wm/golem/PLIST:1.3 pkgsrc/wm/golem/PLIST:1.4
--- pkgsrc/wm/golem/PLIST:1.3   Sun Jun 14 18:18:59 2009
+++ pkgsrc/wm/golem/PLIST       Mon Jan 20 21:17:51 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/20 21:17:51 nia Exp $
 bin/golem
 bin/golem.install
 lib/golem/plugins/animations.so
@@ -9,7 +9,6 @@ lib/golem/plugins/pager.so
 lib/golem/plugins/pier.so
 lib/golem/plugins/setroot.so
 lib/golem/plugins/simple_menus.so
-${PLIST.esound}lib/golem/plugins/sound.so
 lib/golem/plugins/start_slide.so
 lib/golem/plugins/wmclass_defs.so
 man/man1/golem.1
@@ -25,7 +24,6 @@ share/golem/plugins/pier/netscape.xpm
 share/golem/plugins/pier/rc
 share/golem/plugins/setroot/rc
 share/golem/plugins/simple_menus/rc
-${PLIST.esound}share/golem/plugins/sound/rc
 share/golem/plugins/start_slide/README
 share/golem/plugins/start_slide/rc
 share/golem/plugins/wmclass_defs/rc