summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/Makefile9
-rw-r--r--audio/bmp-esound/DESCR3
-rw-r--r--audio/bmp-esound/Makefile18
-rw-r--r--audio/bmp-esound/PLIST2
-rw-r--r--audio/bmp/Makefile.common3
-rw-r--r--audio/esound/DESCR5
-rw-r--r--audio/esound/MESSAGE.Interix10
-rw-r--r--audio/esound/Makefile49
-rw-r--r--audio/esound/PLIST.FreeBSD4
-rw-r--r--audio/esound/PLIST.Linux4
-rw-r--r--audio/esound/PLIST.common26
-rw-r--r--audio/esound/buildlink3.mk15
-rw-r--r--audio/esound/distinfo9
-rw-r--r--audio/esound/options.mk13
-rw-r--r--audio/esound/patches/patch-aa16
-rw-r--r--audio/esound/patches/patch-ab24
-rw-r--r--audio/esound/patches/patch-ac14
-rw-r--r--audio/gst-plugins0.10-esound/DESCR13
-rw-r--r--audio/gst-plugins0.10-esound/Makefile12
-rw-r--r--audio/gst-plugins0.10-esound/PLIST2
-rw-r--r--audio/libao-esound/DESCR4
-rw-r--r--audio/libao-esound/Makefile17
-rw-r--r--audio/libao-esound/PLIST2
-rw-r--r--audio/libao/Makefile.common3
-rw-r--r--audio/mpg123-esound/DESCR2
-rw-r--r--audio/mpg123-esound/Makefile11
-rw-r--r--audio/mpg123-esound/PLIST2
-rw-r--r--audio/mpg123/Makefile.common3
-rw-r--r--audio/wsoundserver/Makefile11
-rw-r--r--audio/xine-esound/DESCR7
-rw-r--r--audio/xine-esound/Makefile26
-rw-r--r--audio/xine-esound/PLIST2
-rw-r--r--audio/xmms-esound/DESCR2
-rw-r--r--audio/xmms-esound/Makefile23
-rw-r--r--audio/xmms-esound/PLIST2
-rw-r--r--emulators/Makefile3
-rw-r--r--emulators/cygwin_esound/DESCR3
-rw-r--r--emulators/cygwin_esound/Makefile38
-rw-r--r--emulators/cygwin_esound/PLIST4
-rw-r--r--emulators/cygwin_esound/distinfo14
-rw-r--r--emulators/cygwin_esound/files/cygwin_esd.sh23
-rw-r--r--lang/Makefile3
-rw-r--r--lang/kaffe-esound/DESCR5
-rw-r--r--lang/kaffe-esound/Makefile26
-rw-r--r--lang/kaffe-esound/PLIST2
-rw-r--r--lang/kaffe/Makefile.common3
-rw-r--r--mk/defaults/options.description1
-rw-r--r--multimedia/gst-plugins0.10-good/Makefile.common3
-rw-r--r--multimedia/xine-lib/Makefile.common3
-rw-r--r--wm/enlightenment16/options.mk14
50 files changed, 13 insertions, 500 deletions
diff --git a/audio/Makefile b/audio/Makefile
index a54a94091d5..a2af5cfc8fa 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.582 2020/01/19 22:46:43 nia Exp $
+# $NetBSD: Makefile,v 1.583 2020/01/20 21:54:00 nia Exp $
#
COMMENT= Audio tools
@@ -37,7 +37,6 @@ SUBDIR+= blop
SUBDIR+= bml
SUBDIR+= bmp
SUBDIR+= bmp-crossfade
-SUBDIR+= bmp-esound
SUBDIR+= bmp-flac
SUBDIR+= bmp-mac
SUBDIR+= bmp-musepack
@@ -73,7 +72,6 @@ SUBDIR+= easyh10
SUBDIR+= easytag
SUBDIR+= eawpatches
SUBDIR+= emixer
-SUBDIR+= esound
SUBDIR+= espeak
SUBDIR+= exaile
SUBDIR+= eyeD3
@@ -152,7 +150,6 @@ SUBDIR+= gst-plugins0.10-a52
SUBDIR+= gst-plugins0.10-alsa
SUBDIR+= gst-plugins0.10-cdparanoia
SUBDIR+= gst-plugins0.10-dts
-SUBDIR+= gst-plugins0.10-esound
SUBDIR+= gst-plugins0.10-faac
SUBDIR+= gst-plugins0.10-faad
SUBDIR+= gst-plugins0.10-flac
@@ -217,7 +214,6 @@ SUBDIR+= liba52
SUBDIR+= libalac
SUBDIR+= libao
SUBDIR+= libao-alsa
-SUBDIR+= libao-esound
SUBDIR+= libao-macosx
SUBDIR+= libao-nas
SUBDIR+= libao-oss
@@ -317,7 +313,6 @@ SUBDIR+= mpc
SUBDIR+= mpdas
SUBDIR+= mpegaudio
SUBDIR+= mpg123
-SUBDIR+= mpg123-esound
SUBDIR+= mpg123-nas
SUBDIR+= mpg123-oss
SUBDIR+= mpg123-pulse
@@ -479,7 +474,6 @@ SUBDIR+= xfce4-mixer
SUBDIR+= xfce4-xmms-plugin
SUBDIR+= xhippo
SUBDIR+= xine-alsa
-SUBDIR+= xine-esound
SUBDIR+= xine-pulse
SUBDIR+= xjadeo
SUBDIR+= xmcd
@@ -488,7 +482,6 @@ SUBDIR+= xmmix
SUBDIR+= xmms
SUBDIR+= xmms-cdread
SUBDIR+= xmms-crossfade
-SUBDIR+= xmms-esound
SUBDIR+= xmms-flac
SUBDIR+= xmms-mac
SUBDIR+= xmms-mad
diff --git a/audio/bmp-esound/DESCR b/audio/bmp-esound/DESCR
deleted file mode 100644
index dd6108e4a79..00000000000
--- a/audio/bmp-esound/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-bmp-esound is an output plugin for the Beep Media Player program that
-allows it to output sound using the enlightened sound daemon (mainly
-used by the GNOME desktop).
diff --git a/audio/bmp-esound/Makefile b/audio/bmp-esound/Makefile
deleted file mode 100644
index 7a24f2ee6f8..00000000000
--- a/audio/bmp-esound/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.52 2020/01/18 21:48:41 jperkin Exp $
-#
-
-BMP_USE_ESD:= yes
-.include "../../audio/bmp/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/bmp/bmp-esound/}
-PKGREVISION= 39
-CATEGORIES+= gnome
-
-COMMENT= BMP plugin to output sound through the esound daemon
-
-DEPENDS+= bmp>=0.9.7.1:../../audio/bmp
-
-BUILD_DIRS= Output/esd
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp-esound/PLIST b/audio/bmp-esound/PLIST
deleted file mode 100644
index b75183d45ed..00000000000
--- a/audio/bmp-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:02 joerg Exp $
-lib/bmp/Output/libesdout.la
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index b3081c05fc0..798dc943a60 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.30 2020/01/18 23:29:58 rillig Exp $
+# $NetBSD: Makefile.common,v 1.31 2020/01/20 21:54:00 nia Exp $
#
# used by audio/bmp/Makefile
-# used by audio/bmp-esound/Makefile
DISTNAME= bmp-0.9.7.1
CATEGORIES= audio
diff --git a/audio/esound/DESCR b/audio/esound/DESCR
deleted file mode 100644
index 53bf8e54d83..00000000000
--- a/audio/esound/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-EsounD, the Enlightened Sound Daemon, is a server process that mixes
-several audio streams for playback by a single audio device. For
-example, if you're listening to music on a CD and you receive a
-sound-related event from ICQ, the two applications won't have to
-jockey for the use of your sound card.
diff --git a/audio/esound/MESSAGE.Interix b/audio/esound/MESSAGE.Interix
deleted file mode 100644
index aaa77197559..00000000000
--- a/audio/esound/MESSAGE.Interix
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.Interix,v 1.1 2004/10/11 22:18:45 tv Exp $
-
-On Interix, this package does not provide physical audio output support,
-nor is "autospawn" supported. For the server side of esound, you will
-need to install the emulators/cygwin_esound package, and start the
-cygwin_esd server using its included rc.d script. Once cygwin_esd is
-started, esound-enabled applications will use it automatically.
-
-===========================================================================
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
deleted file mode 100644
index a99209146b9..00000000000
--- a/audio/esound/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.86 2018/07/04 13:40:08 jperkin Exp $
-
-DISTNAME= esound-0.2.41
-PKGREVISION= 3
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/esound/0.2/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-#HOMEPAGE= https://www.tux.org/~ricdude/EsounD.html
-COMMENT= The Enlightened sound daemon
-LICENSE= gnu-lgpl-v2
-
-USE_LIBTOOL= YES
-USE_TOOLS+= pkg-config
-PKGCONFIG_OVERRIDE= esound.pc.in
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ENV+= ac_cv_prog_JW=false
-
-EGDIR= ${PREFIX}/share/examples/esound
-CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
-
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-# no sound output device, but can support a remote esound server
-CONFIGURE_ARGS+= --disable-local-sound
-.else
-.include "../../mk/oss.buildlink3.mk"
-MAKE_ENV+= AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= pre-configure
-SUBST_FILES.oss= configure
-SUBST_SED.oss= -e 's,-lossaudio,${LIBOSSAUDIO},g'
-SUBST_MESSAGE.oss= Fixing oss.
-.endif
-
-LDFLAGS.IRIX+= -lm
-LDFLAGS.DragonFly+= -lm
-LDFLAGS.FreeBSD+= -lm
-LDFLAGS.SunOS+= -lm -lsocket -lnsl
-
-REPLACE_SH+= esd-config.in
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/PLIST.FreeBSD b/audio/esound/PLIST.FreeBSD
deleted file mode 100644
index 4e950f569ff..00000000000
--- a/audio/esound/PLIST.FreeBSD
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.2 2007/05/06 16:36:06 wiz Exp $
-bin/esddsp
-lib/libesddsp.la
-man/man1/esddsp.1
diff --git a/audio/esound/PLIST.Linux b/audio/esound/PLIST.Linux
deleted file mode 100644
index 041efb32fed..00000000000
--- a/audio/esound/PLIST.Linux
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.6 2007/05/06 16:36:06 wiz Exp $
-bin/esddsp
-lib/libesddsp.la
-man/man1/esddsp.1
diff --git a/audio/esound/PLIST.common b/audio/esound/PLIST.common
deleted file mode 100644
index f1b8a7454ce..00000000000
--- a/audio/esound/PLIST.common
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.8 2009/06/14 17:32:05 joerg Exp $
-bin/esd
-bin/esd-config
-bin/esdcat
-bin/esdctl
-bin/esdfilt
-bin/esdloop
-bin/esdmon
-bin/esdplay
-bin/esdrec
-bin/esdsample
-include/esd.h
-lib/libesd.la
-lib/pkgconfig/esound.pc
-man/man1/esd-config.1
-man/man1/esd.1
-man/man1/esdcat.1
-man/man1/esdctl.1
-man/man1/esdfilt.1
-man/man1/esdloop.1
-man/man1/esdmon.1
-man/man1/esdplay.1
-man/man1/esdrec.1
-man/man1/esdsample.1
-share/aclocal/esd.m4
-share/examples/esound/esd.conf
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
deleted file mode 100644
index bf7f582d7c5..00000000000
--- a/audio/esound/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2012/01/13 10:54:45 obache Exp $
-
-BUILDLINK_TREE+= esound
-
-.if !defined(ESOUND_BUILDLINK3_MK)
-ESOUND_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.esound+= esound>=0.2.18
-BUILDLINK_ABI_DEPENDS.esound+= esound>=0.2.41nb1
-BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
-
-.include "../../audio/libaudiofile/buildlink3.mk"
-.endif # ESOUND_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -esound
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
deleted file mode 100644
index 696e6a59b7c..00000000000
--- a/audio/esound/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 01:12:28 agc Exp $
-
-SHA1 (esound-0.2.41.tar.bz2) = 6c343483b3789f439277935eaad7e478bee685ea
-RMD160 (esound-0.2.41.tar.bz2) = 72597ea46e507008e3a43efaaf5b4b9ef62b896f
-SHA512 (esound-0.2.41.tar.bz2) = 41f14573988a1af006207d3c9a838fccb3402efbedc9d17e4a8f3f2df3590bc2d6ac2d3abb74d9215153045ef7f95e71b73296ffb5ec5b4b00ad471e5798d416
-Size (esound-0.2.41.tar.bz2) = 396474 bytes
-SHA1 (patch-aa) = fa6d1bf07ceec181c01d57afe69a978d0a8ec401
-SHA1 (patch-ab) = 907078a1b00e26f131aa149bd89490fddfd405c6
-SHA1 (patch-ac) = e1e75d036c66221307ab1e9100a5c10a56f4145f
diff --git a/audio/esound/options.mk b/audio/esound/options.mk
deleted file mode 100644
index 24b05000dba..00000000000
--- a/audio/esound/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2017/09/27 13:45:53 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.esound
-PKG_SUPPORTED_OPTIONS= inet6
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
diff --git a/audio/esound/patches/patch-aa b/audio/esound/patches/patch-aa
deleted file mode 100644
index e38d0373e18..00000000000
--- a/audio/esound/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2011/09/09 15:20:59 wiz Exp $
-
-Install configuration into examples directory, and use
-CONF_FILES for installation.
-
---- Makefile.in.orig 2005-06-07 03:04:14.000000000 +0200
-+++ Makefile.in
-@@ -425,7 +425,7 @@ LDADD = libesd.la $(AUDIOFILE_LIBS)
- esd_LDADD = $(WRAP_LIB) $(LDADD)
- m4datadir = $(datadir)/aclocal
- m4data_DATA = esd.m4
--esdconfdir = $(sysconfdir)
-+esdconfdir = $(datadir)/examples/@PACKAGE@
- esdconf_DATA = esd.conf
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = esound.pc
diff --git a/audio/esound/patches/patch-ab b/audio/esound/patches/patch-ab
deleted file mode 100644
index 8c43a2d06e4..00000000000
--- a/audio/esound/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2011/09/09 15:20:59 wiz Exp $
-
-Adapt path to audio device.
-
---- audio_oss.c.orig 2008-11-18 20:35:19.000000000 +0000
-+++ audio_oss.c
-@@ -20,7 +20,7 @@
- #define ARCH_esd_audio_devices
- const char *esd_audio_devices()
- {
-- return "/dev/dsp, /dev/dsp2, etc.";
-+ return "/dev/audio, /dev/audio2, etc. or /dev/dsp, /dev/dsp2, etc.";
- }
-
- #define NFRAGS 32
-@@ -56,7 +56,7 @@ int esd_audio_open()
- mode |= O_NONBLOCK;
-
- /* open the sound device */
-- device = esd_audio_device ? esd_audio_device : "/dev/dsp";
-+ device = esd_audio_device ? esd_audio_device : DEV_DSP;
- if ((afd = open(device, mode, 0)) == -1)
- { /* Opening device failed */
- if (errno != ENOENT)
diff --git a/audio/esound/patches/patch-ac b/audio/esound/patches/patch-ac
deleted file mode 100644
index 3de63486ea8..00000000000
--- a/audio/esound/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2009/09/21 17:26:46 sno Exp $
-
-FreeBSD doesn't define off64_t
-
---- esddsp.c.orig 2009-09-19 19:15:30.000000000 +0200
-+++ esddsp.c 2009-09-19 19:22:16.000000000 +0200
-@@ -70,6 +70,7 @@
-
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__bsdi__)
- typedef unsigned long request_t;
-+typedef off_t off64_t;
- #else
- typedef int request_t;
- #endif
diff --git a/audio/gst-plugins0.10-esound/DESCR b/audio/gst-plugins0.10-esound/DESCR
deleted file mode 100644
index 334db30a1ac..00000000000
--- a/audio/gst-plugins0.10-esound/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'good' plugins for GStreamer. It provides the
-esound plugin for GStreamer, which allows playback and recording of sound
-through the Enlightened Sound Daemon.
diff --git a/audio/gst-plugins0.10-esound/Makefile b/audio/gst-plugins0.10-esound/Makefile
deleted file mode 100644
index 335cd137536..00000000000
--- a/audio/gst-plugins0.10-esound/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2012/09/15 10:03:37 obache Exp $
-#
-
-GST_PLUGINS0.10_NAME= esound
-GST_PLUGINS0.10_DIRS= ext/esd
-GST_PLUGINS0.10_FLAGS= esd
-PKGREVISION= 2
-
-.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-esound/PLIST b/audio/gst-plugins0.10-esound/PLIST
deleted file mode 100644
index 320b4544bd5..00000000000
--- a/audio/gst-plugins0.10-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:10 joerg Exp $
-lib/gstreamer-0.10/libgstesd.la
diff --git a/audio/libao-esound/DESCR b/audio/libao-esound/DESCR
deleted file mode 100644
index 08444ec5349..00000000000
--- a/audio/libao-esound/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Libao is a cross-platform audio library that allows programs to
-output audio using a simple API on a wide variety of platforms.
-
-This package provides an esound plugin for libao's core.
diff --git a/audio/libao-esound/Makefile b/audio/libao-esound/Makefile
deleted file mode 100644
index 3e313979155..00000000000
--- a/audio/libao-esound/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2019/11/24 00:35:56 nia Exp $
-
-.include "../../audio/libao/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/libao/libao-esound/}
-
-COMMENT+= (ESD plugin)
-
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/disable-esd/enable-esd/g}
-BUILD_DIRS= src/plugins/esd
-INSTALL_DIRS= src/plugins/esd
-
-_LIBAO_BUILDING_PLUGIN= yes
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-esound/PLIST b/audio/libao-esound/PLIST
deleted file mode 100644
index d68461b2773..00000000000
--- a/audio/libao-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2010/05/19 18:18:48 drochner Exp $
-lib/ao/plugins-4/libesd.la
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 3654aa931d8..0a5a718c83b 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.41 2019/12/24 05:07:45 dbj Exp $
+# $NetBSD: Makefile.common,v 1.42 2020/01/20 21:54:01 nia Exp $
#
# used by audio/libao-alsa/Makefile
# used by audio/libao-arts/Makefile
-# used by audio/libao-esound/Makefile
# used by audio/libao-macosx/Makefile
# used by audio/libao-nas/Makefile
# used by audio/libao-oss/Makefile
diff --git a/audio/mpg123-esound/DESCR b/audio/mpg123-esound/DESCR
deleted file mode 100644
index a0a4d362758..00000000000
--- a/audio/mpg123-esound/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Module for the mpg123 audio player to play back audio via the
-Enlightened Sound Daemon.
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
deleted file mode 100644
index 62108720f9c..00000000000
--- a/audio/mpg123-esound/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2014/05/20 19:59:10 adam Exp $
-
-MPG123_MODULE= esd
-
-.include "../../audio/mpg123/Makefile.common"
-
-USE_TOOLS+= pkg-config
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/mpg123/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-esound/PLIST b/audio/mpg123-esound/PLIST
deleted file mode 100644
index 9d0fd5f1b9c..00000000000
--- a/audio/mpg123-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2010/03/14 14:58:26 martin Exp $
-lib/mpg123/output_esd.la
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index d71543cbd66..8fa803a2dd4 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.51 2019/10/31 14:06:17 nia Exp $
+# $NetBSD: Makefile.common,v 1.52 2020/01/20 21:54:01 nia Exp $
#
# used by audio/mpg123-arts/Makefile
-# used by audio/mpg123-esound/Makefile
# used by audio/mpg123-nas/Makefile
# used by audio/mpg123-oss/Makefile
# used by audio/mpg123-pulse/Makefile
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index cdf1e8e81ed..72cca5d73ef 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2018/07/04 13:40:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.62 2020/01/20 21:54:01 nia Exp $
#
DISTNAME= WSoundServer-0.4.0
@@ -45,15 +45,6 @@ post-patch:
post-install:
${INSTALL_DATA} ${WRKSRC:Q}/WMSound ${DESTDIR}${EGDIR}
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-. include "../../audio/esound/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-esound
-.else
-. include "../../mk/oss.buildlink3.mk"
-.endif
-
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../audio/libaudiofile/buildlink3.mk"
diff --git a/audio/xine-esound/DESCR b/audio/xine-esound/DESCR
deleted file mode 100644
index b2f7631020b..00000000000
--- a/audio/xine-esound/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Xine is a free multimedia player library for playing back CDs, DVDs,
-and VCDs. It also decodes multimedia files like AVI, MOV, WMV, and MP3
-from local disk drives, and displays multimedia streamed over the
-Internet. It interprets many of the most common multimedia formats
-available -- and some of the most uncommon formats, too.
-
-This package provides the esound audio output plugin for xine-lib.
diff --git a/audio/xine-esound/Makefile b/audio/xine-esound/Makefile
deleted file mode 100644
index 8c1fd5f133d..00000000000
--- a/audio/xine-esound/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.51 2019/11/02 21:09:18 rillig Exp $
-
-PKGREVISION= 2
-.include "../../multimedia/xine-lib/Makefile.common"
-
-PKGNAME= ${XINE_PKGNAME:S/lib/esound/}
-CATEGORIES= audio
-COMMENT= The esound audio output plugin for xine-lib
-
-DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib
-
-BUILD_DIRS= src/audio_out
-CONFIGURE_ARGS+= --without-x --disable-xinerama
-CONFIGURE_ARGS+= --disable-vcd
-
-INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER}
-
-do-install:
- cd ${WRKSRC}/src/audio_out && \
- ${LIBTOOL} --mode=install ${INSTALL_DATA} \
- xineplug_ao_out_esd.la \
- ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xine-esound/PLIST b/audio/xine-esound/PLIST
deleted file mode 100644
index f22cb4affb2..00000000000
--- a/audio/xine-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.17 2011/11/17 13:43:11 obache Exp $
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_esd.la
diff --git a/audio/xmms-esound/DESCR b/audio/xmms-esound/DESCR
deleted file mode 100644
index 315b785fe4c..00000000000
--- a/audio/xmms-esound/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-xmms-esound is an output plugin for the XMMS program that allows it to output
-sound using the enlightened sound daemon (mainly used by the GNOME desktop).
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
deleted file mode 100644
index 6fcb82bb9f2..00000000000
--- a/audio/xmms-esound/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2015/04/25 14:20:25 tnn Exp $
-#
-
-.include "../../audio/xmms/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/xmms/xmms-esound/}
-PKGREVISION= 4
-CATEGORIES+= gnome
-
-COMMENT= XMMS plugin to output sound through the esound daemon
-
-CONFLICTS+= xmms<=1.2.7nb8
-
-BUILDLINK_API_DEPENDS.xmms+= xmms>=1.2.7nb9
-
-BUILD_DIRS= Output/esd
-INSTALL_DIRS= Output/esd
-
-USE_TOOLS+= pkg-config
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-esound/PLIST b/audio/xmms-esound/PLIST
deleted file mode 100644
index cfd39feb710..00000000000
--- a/audio/xmms-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:25 joerg Exp $
-lib/xmms/Output/libesdout.la
diff --git a/emulators/Makefile b/emulators/Makefile
index 7603eb1f60e..9346635d70d 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2020/01/10 11:11:36 nia Exp $
+# $NetBSD: Makefile,v 1.311 2020/01/20 21:54:02 nia Exp $
#
COMMENT= Emulators for other operating systems
@@ -48,7 +48,6 @@ SUBDIR+= compat61
SUBDIR+= compat61-x11
SUBDIR+= compat80
#SUBDIR+= compat_netbsd # only contains Makefile fragments
-SUBDIR+= cygwin_esound
SUBDIR+= cygwin_lib
SUBDIR+= darwin_lib
SUBDIR+= dega
diff --git a/emulators/cygwin_esound/DESCR b/emulators/cygwin_esound/DESCR
deleted file mode 100644
index 6dd498f93cc..00000000000
--- a/emulators/cygwin_esound/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the Enlightened Sound Daemon (EsounD) for Cygwin, providing the
-ability for Interix applications to output sound via the libesd client
-side library (audio/esound).
diff --git a/emulators/cygwin_esound/Makefile b/emulators/cygwin_esound/Makefile
deleted file mode 100644
index c98bf21f8eb..00000000000
--- a/emulators/cygwin_esound/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:08 agc Exp $
-#
-
-DISTNAME= esound-0.2.35-1
-PKGNAME= ${DISTNAME:S/-/!/:S/-/./g:S/!/-/:S/^/cygwin_/}
-PKGREVISION= 1
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_CYGWIN:=release/esound/}
-MASTER_SITES+= ${MASTER_SITE_CYGWIN:=release/esound/libesound0/}
-MASTER_SITES+= ${MASTER_SITE_CYGWIN:=release/audiofile/libaudiofile0/}
-EXTRACT_SUFX= .tar.bz2
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- libesound0-0.2.35-1.tar.bz2 \
- libaudiofile0-0.2.6-2.tar.bz2
-
-MAINTAINER= interix-pkg-people@NetBSD.org
-COMMENT= Enlightened sound daemon (daemon only) for Cygwin/Interix
-
-ONLY_FOR_PLATFORM= Interix-*-*
-
-DIST_SUBDIR= cygwin
-WRKSRC= ${WRKDIR}
-
-RCD_SCRIPTS= cygwin_esd
-INSTALLATION_DIRS= bin emul/cygwin/bin
-
-do-build: # nothing
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/cygaudiofile-0.dll \
- ${DESTDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/cygesd-0.dll \
- ${DESTDIR}${PREFIX}/bin/
- ${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/esd.exe \
- ${DESTDIR}${PREFIX}/emul/cygwin/bin/
-
-.include "../../emulators/cygwin_lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/cygwin_esound/PLIST b/emulators/cygwin_esound/PLIST
deleted file mode 100644
index c859c3224fa..00000000000
--- a/emulators/cygwin_esound/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:01 jperkin Exp $
-bin/cygaudiofile-0.dll
-bin/cygesd-0.dll
-emul/cygwin/bin/esd.exe
diff --git a/emulators/cygwin_esound/distinfo b/emulators/cygwin_esound/distinfo
deleted file mode 100644
index f8c388b100c..00000000000
--- a/emulators/cygwin_esound/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 20:30:56 agc Exp $
-
-SHA1 (cygwin/esound-0.2.35-1.tar.bz2) = 40dd08cfbf4aae24b8c2448c6038815e2ea21239
-RMD160 (cygwin/esound-0.2.35-1.tar.bz2) = 271d1bfe3d7fcf2180cc9194ec7e2c66bc1b641d
-SHA512 (cygwin/esound-0.2.35-1.tar.bz2) = 9931402d0c75033cfef7a29efbcf99584de14b9108d2d70e1bf0c0a112d919bab3ee3a954fa00e7cc5000f875fe329eab11e87124f5d35c8449ccb17ad896f4d
-Size (cygwin/esound-0.2.35-1.tar.bz2) = 125137 bytes
-SHA1 (cygwin/libesound0-0.2.35-1.tar.bz2) = 3219452e22a516995aa48713ad0a5999ff8e681a
-RMD160 (cygwin/libesound0-0.2.35-1.tar.bz2) = a31a073a8f0d76cf3ef90759d0be79229842beb8
-SHA512 (cygwin/libesound0-0.2.35-1.tar.bz2) = 547ac5d9345c5cad6f7c54504373a0a34dc2e58d013e7c4ff8782e37556889990b20d63b242ab54ab797f3114f12b4c56dad1cfabd915b021bd1021fc54be950
-Size (cygwin/libesound0-0.2.35-1.tar.bz2) = 11251 bytes
-SHA1 (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 7c568a4366214e69810fefe62923beafd92ea6c1
-RMD160 (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 7d808b0cba96b05fedc932b4445a7a5b6be58435
-SHA512 (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 08c8cbf11d5b1abc0361718d215c274cdfceedfd8d04786ac1f007ae9f765e82b67a4f5cc847d885b5489a373f8069fbc1179553e2e5bb2387baead8cad57c43
-Size (cygwin/libaudiofile0-0.2.6-2.tar.bz2) = 58049 bytes
diff --git a/emulators/cygwin_esound/files/cygwin_esd.sh b/emulators/cygwin_esound/files/cygwin_esd.sh
deleted file mode 100644
index 904158b217e..00000000000
--- a/emulators/cygwin_esound/files/cygwin_esd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: cygwin_esd.sh,v 1.3 2011/10/07 22:37:03 shattered Exp $
-#
-# PROVIDE: cygwin_esd
-# REQUIRE: DAEMON
-
-name="cygwin_esd"
-command="@PREFIX@/emul/cygwin/bin/esd.exe"
-command_args="-tcp"
-
-if [ ! -d /etc/rc.d ]
-then
- @ECHO@ -n ' ${name}'
- ${command} ${command_args} &
- exit
-fi
-
-. /etc/rc.subr
-
-load_rc_config $name
-command_args="${command_args} &"
-run_rc_command "$1"
diff --git a/lang/Makefile b/lang/Makefile
index 6902bc63523..feee91d461c 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.539 2020/01/15 12:41:28 pho Exp $
+# $NetBSD: Makefile,v 1.540 2020/01/20 21:54:02 nia Exp $
#
COMMENT= Programming languages
@@ -125,7 +125,6 @@ SUBDIR+= jimtcl
SUBDIR+= joos
SUBDIR+= js
SUBDIR+= kaffe
-SUBDIR+= kaffe-esound
SUBDIR+= kaffe-x11
SUBDIR+= kali
SUBDIR+= konoha
diff --git a/lang/kaffe-esound/DESCR b/lang/kaffe-esound/DESCR
deleted file mode 100644
index db2b18d0844..00000000000
--- a/lang/kaffe-esound/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Kaffe is a clean room implementation of Java virtual machine plus associated
-class libraries needed to provide a Java runtime environment.
-
-This package provides a plugin which enables sound support through the
-Enlightened Sound Daemon (esd, for short).
diff --git a/lang/kaffe-esound/Makefile b/lang/kaffe-esound/Makefile
deleted file mode 100644
index 412311b1689..00000000000
--- a/lang/kaffe-esound/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2012/01/13 10:55:16 obache Exp $
-#
-
-.include "../../lang/kaffe/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/kaffe/kaffe-esound/}
-PKGREVISION= 2
-
-COMMENT+= (sound support through esound)
-
-CONFIGURE_ARGS+= --disable-native-awt
-CONFIGURE_ARGS+= --disable-gtk-peer
-CONFIGURE_ARGS+= --without-x
-CONFIGURE_ARGS+= --with-esd
-
-BUILD_DIRS= config
-BUILD_DIRS+= libraries/javalib
-BUILD_DIRS+= libraries/clib/sound/esd
-INSTALL_DIRS= libraries/clib/sound/esd
-
-pre-build:
- cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} BUILD_ENVIRONMENT
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../lang/kaffe/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe-esound/PLIST b/lang/kaffe-esound/PLIST
deleted file mode 100644
index fe9191d3369..00000000000
--- a/lang/kaffe-esound/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:35 joerg Exp $
-java/kaffe/jre/lib/${MACHINE_ARCH}/libtritonusesd.la
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index 960ac8e2774..e2c5ce34742 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.27 2019/11/03 19:04:02 rillig Exp $
+# $NetBSD: Makefile.common,v 1.28 2020/01/20 21:54:02 nia Exp $
#
-# used by lang/kaffe-esound/Makefile
# used by lang/kaffe-x11/Makefile
DISTNAME= kaffe-1.1.7
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 9d22ef0f486..49f20be7a46 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -185,7 +185,6 @@ enchant-zemberek Add spell checking support for Turkish.
epoll Enable support for epoll I/O event notification facility.
epub Enable epub support.
erlang-hipe Enable HiPE support.
-esound Enable support for the Enlightment Sound Daemon.
evolution-data-server Enable support for evolution-data-server.
exim-build-eximon Also build the X based exim queue monitoring tool.
exim-content-scan Call virus and spam scanning direct from ACLs.
diff --git a/multimedia/gst-plugins0.10-good/Makefile.common b/multimedia/gst-plugins0.10-good/Makefile.common
index 97f2003d489..d9f03614c92 100644
--- a/multimedia/gst-plugins0.10-good/Makefile.common
+++ b/multimedia/gst-plugins0.10-good/Makefile.common
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.36 2012/02/28 18:31:00 drochner Exp $
+# $NetBSD: Makefile.common,v 1.37 2020/01/20 21:54:02 nia Exp $
#
-# used by audio/gst-plugins0.10-esound/Makefile
# used by audio/gst-plugins0.10-flac/Makefile
# used by audio/gst-plugins0.10-jack/Makefile
# used by audio/gst-plugins0.10-oss/Makefile
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index baecf0a136e..ae6e4079ce8 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.88 2019/11/03 17:12:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.89 2020/01/20 21:54:03 nia Exp $
#
# used by audio/xine-alsa/Makefile
-# used by audio/xine-esound/Makefile
# used by audio/xine-pulse/Makefile
# used by multimedia/xine-v4l/Makefile
# used by multimedia/xine-v4l2/Makefile
diff --git a/wm/enlightenment16/options.mk b/wm/enlightenment16/options.mk
index 49c0cd097d3..7b6bda28137 100644
--- a/wm/enlightenment16/options.mk
+++ b/wm/enlightenment16/options.mk
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2019/12/30 03:50:06 gutteridge Exp $
+# $NetBSD: options.mk,v 1.2 2020/01/20 21:54:03 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.enlightenment16
-PKG_OPTIONS_OPTIONAL_GROUPS= sound
-PKG_OPTIONS_GROUP.sound= pulseaudio esound
-
-PKG_SUPPORTED_OPTIONS= pango vera-ttf
-PKG_SUGGESTED_OPTIONS= pango esound vera-ttf
+PKG_SUPPORTED_OPTIONS= pango pulseaudio vera-ttf
+PKG_SUGGESTED_OPTIONS= pango pulseaudio vera-ttf
.include "../../mk/bsd.options.mk"
@@ -22,11 +19,6 @@ CONFIGURE_ARGS+= --enable-sound=pulseaudio
CONFIGURE_ARGS+= --with-sndldr=sndfile
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
-.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