Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Feb 2019 12:15:17 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r493852 - in head/x11-wm: epplets golem icewm
Message-ID:  <201902251215.x1PCFHB9019819@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Feb 25 12:15:17 2019
New Revision: 493852
URL: https://svnweb.freebsd.org/changeset/ports/493852

Log:
  First step at deorbitting esound:
  remove esound options where it is possible to, categories x11*

Modified:
  head/x11-wm/epplets/Makefile
  head/x11-wm/epplets/pkg-plist
  head/x11-wm/golem/Makefile
  head/x11-wm/golem/pkg-plist
  head/x11-wm/icewm/Makefile

Modified: head/x11-wm/epplets/Makefile
==============================================================================
--- head/x11-wm/epplets/Makefile	Mon Feb 25 12:13:16 2019	(r493851)
+++ head/x11-wm/epplets/Makefile	Mon Feb 25 12:15:17 2019	(r493852)
@@ -3,7 +3,7 @@
 
 PORTNAME=	epplets
 PORTVERSION=	0.14
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}
 
@@ -22,14 +22,10 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-auto-respawn
+CONFIGURE_ARGS=	--disable-auto-respawn \
+		--disable-esound
 
-OPTIONS_DEFINE=	ESOUND
-OPTIONS_DEFAULT=ESOUND
 OPTIONS_SUB=	yes
-
-ESOUND_CONFIGURE_ENABLE=	esd
-ESOUND_USE=			GNOME=esound
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<machine/soundcard\.h>|<sys/soundcard.h>|g' \

Modified: head/x11-wm/epplets/pkg-plist
==============================================================================
--- head/x11-wm/epplets/pkg-plist	Mon Feb 25 12:13:16 2019	(r493851)
+++ head/x11-wm/epplets/pkg-plist	Mon Feb 25 12:15:17 2019	(r493852)
@@ -20,7 +20,6 @@ bin/E-Pants.epplet
 bin/E-Pinger.epplet
 bin/E-PlayCD.epplet
 bin/E-Power.epplet
-%%ESOUND%%bin/E-SD.epplet
 bin/E-ScreenSave.epplet
 bin/E-ScreenShoot.epplet
 bin/E-Slides.epplet
@@ -143,9 +142,6 @@ share/e16/epplet_data/E-Power/E-Power-Bat-60.png
 share/e16/epplet_data/E-Power/E-Power-Bat-70.png
 share/e16/epplet_data/E-Power/E-Power-Bat-80.png
 share/e16/epplet_data/E-Power/E-Power-Bat-90.png
-%%ESOUND%%share/e16/epplet_data/E-SD/ABOUT/MAIN
-%%ESOUND%%share/e16/epplet_data/E-SD/E-SD_minitime.png
-%%ESOUND%%share/e16/epplet_data/E-SD/E-SD_standby.png
 share/e16/epplet_data/E-ScreenSave/ABOUT/MAIN
 share/e16/epplet_data/E-ScreenShoot/ABOUT/E_ScreenShoot_buttons.png
 share/e16/epplet_data/E-ScreenShoot/ABOUT/E_ScreenShoot_cloak.png
@@ -194,7 +190,6 @@ share/e16/epplet_icons/E-Pants.icon
 share/e16/epplet_icons/E-Pinger.icon
 share/e16/epplet_icons/E-PlayCD.icon
 share/e16/epplet_icons/E-Power.icon
-%%ESOUND%%share/e16/epplet_icons/E-SD.icon
 share/e16/epplet_icons/E-ScreenSave.icon
 share/e16/epplet_icons/E-ScreenShoot.icon
 share/e16/epplet_icons/E-Slides.icon

Modified: head/x11-wm/golem/Makefile
==============================================================================
--- head/x11-wm/golem/Makefile	Mon Feb 25 12:13:16 2019	(r493851)
+++ head/x11-wm/golem/Makefile	Mon Feb 25 12:15:17 2019	(r493852)
@@ -3,7 +3,7 @@
 
 PORTNAME=	golem
 PORTVERSION=	0.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -25,12 +25,9 @@ MAKE_ARGS=	DEVEL=1
 CFLAGS_amd64=	-fPIC
 CFLAGS_i386=	-fPIC
 
-OPTIONS_DEFINE=	ESOUND XINERAMA
+OPTIONS_DEFINE=	XINERAMA
 OPTIONS_DEFAULT=	XINERAMA
 OPTIONS_SUB=	yes
-
-ESOUND_USE=	GNOME=esound
-ESOUND_CONFIGURE_ON=	--enable-sound
 
 XINERAMA_USE=	XORG=xinerama
 XINERAMA_CONFIGURE_ON=	--enable-xinerama

Modified: head/x11-wm/golem/pkg-plist
==============================================================================
--- head/x11-wm/golem/pkg-plist	Mon Feb 25 12:13:16 2019	(r493851)
+++ head/x11-wm/golem/pkg-plist	Mon Feb 25 12:15:17 2019	(r493852)
@@ -9,7 +9,6 @@ lib/golem/plugins/pier.so
 lib/golem/plugins/session.so
 lib/golem/plugins/setroot.so
 lib/golem/plugins/simple_menus.so
-%%ESOUND%%lib/golem/plugins/sound.so
 lib/golem/plugins/start_slide.so
 lib/golem/plugins/tasklist.so
 lib/golem/plugins/wmclass_defs.so
@@ -28,7 +27,6 @@ man/man1/golem.1.gz
 %%DATADIR%%/plugins/session/rc
 %%DATADIR%%/plugins/setroot/rc
 %%DATADIR%%/plugins/simple_menus/rc
-%%ESOUND%%%%DATADIR%%/plugins/sound/rc
 %%DATADIR%%/plugins/start_slide/README
 %%DATADIR%%/plugins/start_slide/rc
 %%DATADIR%%/plugins/tasklist/rc

Modified: head/x11-wm/icewm/Makefile
==============================================================================
--- head/x11-wm/icewm/Makefile	Mon Feb 25 12:13:16 2019	(r493851)
+++ head/x11-wm/icewm/Makefile	Mon Feb 25 12:15:17 2019	(r493852)
@@ -3,7 +3,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.3.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
 
@@ -22,13 +22,14 @@ USE_GNOME=	gdkpixbuf2
 USE_XORG=	ice sm x11 xext xrender
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-guievents \
+		--with-icesound=oss \
 		--with-cfgdir=${DATADIR} \
 		--with-libdir=${DATADIR} \
 		--with-kdedatadir=${LOCALBASE}/share \
 		--with-docdir=${PREFIX}/share/doc \
 		--with-mkfontdir=${NONEXISTENT}
 
-OPTIONS_DEFINE=		BEASTIE ESOUND GNOME LITE MENUFIX NLS XFT XINERAMA \
+OPTIONS_DEFINE=		BEASTIE GNOME LITE MENUFIX NLS XFT XINERAMA \
 			XRANDR DOCS
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT=	BEASTIE MENUFIX XFT XINERAMA XRANDR
@@ -36,9 +37,6 @@ OPTIONS_DEFAULT_i386=	ASM
 OPTIONS_SUB=		yes
 
 BEASTIE_DESC=		Use Beastie'fied startup button
-ESOUND_USE=		GNOME=esound
-ESOUND_CONFIGURE_ON=	--with-icesound=esound
-ESOUND_CONFIGURE_OFF=	--with-icesound=oss
 GNOME_DESC=		Display GNOME 2 menus
 GNOME_USE=		GNOME=gnomedesktop,libgnomeui
 GNOME_CONFIGURE_ENABLE=	menus-gnome2



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902251215.x1PCFHB9019819>