Mon Jan 20 21:17:51 2020 UTC ()
golem: Remove esound support


(nia)
diff -r1.35 -r1.36 pkgsrc/wm/golem/Makefile
diff -r1.3 -r1.4 pkgsrc/wm/golem/PLIST
cvs diff -r1.35 -r1.36 pkgsrc/wm/golem/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/golem/Makefile 2020/01/18 23:35:40 1.35
+++ pkgsrc/wm/golem/Makefile 2020/01/20 21:17:51 1.36
@@ -1,49 +1,38 @@ @@ -1,49 +1,38 @@
1# $NetBSD: Makefile,v 1.35 2020/01/18 23:35:40 rillig Exp $ 1# $NetBSD: Makefile,v 1.36 2020/01/20 21:17:51 nia Exp $
2# 2#
3 3
4DISTNAME= golem-0.0.5 4DISTNAME= golem-0.0.5
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= wm 6CATEGORIES= wm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://golem.sourceforge.net/ 10HOMEPAGE= https://golem.sourceforge.net/
11COMMENT= Fast and lightweight yet customizable window manager 11COMMENT= Fast and lightweight yet customizable window manager
12 12
13USE_TOOLS+= gmake yacc lex 13USE_TOOLS+= gmake yacc lex
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15 15
16CONFIGURE_ARGS+= --enable-i18n 16CONFIGURE_ARGS+= --enable-i18n
 17CONFIGURE_ARGS+= --disable-sound
17 18
18.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
19 20
20.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h) 21.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h)
21CONFIGURE_ARGS+= --enable-xinerama 22CONFIGURE_ARGS+= --enable-xinerama
22.include "../../x11/libXinerama/buildlink3.mk" 23.include "../../x11/libXinerama/buildlink3.mk"
23.endif 24.endif
24 25
25PKG_OPTIONS_VAR= PKG_OPTIONS.golem 
26PKG_SUPPORTED_OPTIONS= esound 
27 
28.include "../../mk/bsd.options.mk" 
29 
30PLIST_VARS+= esound 
31.if !empty(PKG_OPTIONS:Mesound) 
32CONFIGURE_ARGS+= --enable-sound 
33PLIST.esound= yes 
34.include "../../audio/esound/buildlink3.mk" 
35.endif 
36 
37CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 26CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
38 27
39EGDIR= ${PREFIX}/share/examples/golem 28EGDIR= ${PREFIX}/share/examples/golem
40CONF_FILES= ${EGDIR}/golemrc.default ${PKG_SYSCONFDIR}/golemrc 29CONF_FILES= ${EGDIR}/golemrc.default ${PKG_SYSCONFDIR}/golemrc
41 30
42SUBST_CLASSES+= paths 31SUBST_CLASSES+= paths
43SUBST_FILES.paths= sample.golem/golemrc 32SUBST_FILES.paths= sample.golem/golemrc
44SUBST_VARS.paths= PREFIX 33SUBST_VARS.paths= PREFIX
45SUBST_STAGE.paths= pre-configure 34SUBST_STAGE.paths= pre-configure
46 35
47INSTALLATION_DIRS= ${EGDIR} 36INSTALLATION_DIRS= ${EGDIR}
48INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ 37INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
49 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 38 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
cvs diff -r1.3 -r1.4 pkgsrc/wm/golem/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/golem/PLIST 2009/06/14 18:18:59 1.3
+++ pkgsrc/wm/golem/PLIST 2020/01/20 21:17:51 1.4
@@ -1,41 +1,39 @@ @@ -1,41 +1,39 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:59 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/01/20 21:17:51 nia Exp $
2bin/golem 2bin/golem
3bin/golem.install 3bin/golem.install
4lib/golem/plugins/animations.so 4lib/golem/plugins/animations.so
5lib/golem/plugins/box_iconify.so 5lib/golem/plugins/box_iconify.so
6lib/golem/plugins/gnome.so 6lib/golem/plugins/gnome.so
7lib/golem/plugins/mwm_hints.so 7lib/golem/plugins/mwm_hints.so
8lib/golem/plugins/pager.so 8lib/golem/plugins/pager.so
9lib/golem/plugins/pier.so 9lib/golem/plugins/pier.so
10lib/golem/plugins/setroot.so 10lib/golem/plugins/setroot.so
11lib/golem/plugins/simple_menus.so 11lib/golem/plugins/simple_menus.so
12${PLIST.esound}lib/golem/plugins/sound.so 
13lib/golem/plugins/start_slide.so 12lib/golem/plugins/start_slide.so
14lib/golem/plugins/wmclass_defs.so 13lib/golem/plugins/wmclass_defs.so
15man/man1/golem.1 14man/man1/golem.1
16share/examples/golem/golemrc.default 15share/examples/golem/golemrc.default
17share/golem/plugins/animations/rc 16share/golem/plugins/animations/rc
18share/golem/plugins/box_iconify/rc 17share/golem/plugins/box_iconify/rc
19share/golem/plugins/box_iconify/tile.xpm 18share/golem/plugins/box_iconify/tile.xpm
20share/golem/plugins/gnome/rc 19share/golem/plugins/gnome/rc
21share/golem/plugins/mwm_hints/rc 20share/golem/plugins/mwm_hints/rc
22share/golem/plugins/pager/rc 21share/golem/plugins/pager/rc
23share/golem/plugins/pier/daemon.xpm 22share/golem/plugins/pier/daemon.xpm
24share/golem/plugins/pier/netscape.xpm 23share/golem/plugins/pier/netscape.xpm
25share/golem/plugins/pier/rc 24share/golem/plugins/pier/rc
26share/golem/plugins/setroot/rc 25share/golem/plugins/setroot/rc
27share/golem/plugins/simple_menus/rc 26share/golem/plugins/simple_menus/rc
28${PLIST.esound}share/golem/plugins/sound/rc 
29share/golem/plugins/start_slide/README 27share/golem/plugins/start_slide/README
30share/golem/plugins/start_slide/rc 28share/golem/plugins/start_slide/rc
31share/golem/plugins/wmclass_defs/rc 29share/golem/plugins/wmclass_defs/rc
32share/golem/themes/AbsoluteE/bar_focused_far.xpm 30share/golem/themes/AbsoluteE/bar_focused_far.xpm
33share/golem/themes/AbsoluteE/bar_focused_mid.xpm 31share/golem/themes/AbsoluteE/bar_focused_mid.xpm
34share/golem/themes/AbsoluteE/bar_focused_near.xpm 32share/golem/themes/AbsoluteE/bar_focused_near.xpm
35share/golem/themes/AbsoluteE/bar_normal_far.xpm 33share/golem/themes/AbsoluteE/bar_normal_far.xpm
36share/golem/themes/AbsoluteE/bar_normal_mid.xpm 34share/golem/themes/AbsoluteE/bar_normal_mid.xpm
37share/golem/themes/AbsoluteE/bar_normal_near.xpm 35share/golem/themes/AbsoluteE/bar_normal_near.xpm
38share/golem/themes/AbsoluteE/border_horiz_far.xpm 36share/golem/themes/AbsoluteE/border_horiz_far.xpm
39share/golem/themes/AbsoluteE/border_horiz_far_foc.xpm 37share/golem/themes/AbsoluteE/border_horiz_far_foc.xpm
40share/golem/themes/AbsoluteE/border_horiz_mid.xpm 38share/golem/themes/AbsoluteE/border_horiz_mid.xpm
41share/golem/themes/AbsoluteE/border_horiz_mid_foc.xpm 39share/golem/themes/AbsoluteE/border_horiz_mid_foc.xpm