Update to 0.2.41.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11767 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 297 insertions, 0 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
new file mode 100644
index 000000000..eb83a74c1
--- /dev/null
+++ b/audio/esound/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	esound
+# Date created:		19 July 1998
+# Whom:			Vanilla I. Shu <vanilla@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	esound
+PORTVERSION=	0.2.41
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+DIST_SUBDIR=	gnome
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A sound library for enlightenment package
+
+LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+
+USE_AUTOTOOLS=	libtool:15
+USE_BZIP2=	yes
+USE_GNOME=	gnometarget gnomehack
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=	JW=false
+
+CONFLICTS=	py*-ro-[0-9]*
+
+MAN1=	esd-config.1 esd.1 esdcat.1 esdctl.1 esddsp.1 esdfilt.1 esdloop.1 \
+	esdmon.1 esdplay.1 esdrec.1 esdsample.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|esdconf_DATA = esd.conf|esdconf_DATA = |g' \
+		${WRKSRC}/Makefile.in
+
+post-install:
+	if [ ! -f ${PREFIX}/etc/esd.conf ]; then \
+		${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf; \
+		${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf.default; \
+	else \
+		${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf.default; \
+	fi
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
new file mode 100644
index 000000000..d33ab14b5
--- /dev/null
+++ b/audio/esound/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome/esound-0.2.41.tar.bz2) = 8d9aad3d94d15e0d59ba9dc0ea990c6c
+SHA256 (gnome/esound-0.2.41.tar.bz2) = 5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911
+SIZE (gnome/esound-0.2.41.tar.bz2) = 396474
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa
new file mode 100644
index 000000000..a323a88f6
--- /dev/null
+++ b/audio/esound/files/patch-aa
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2008-07-17 13:45:22.000000000 -0400
++++ Makefile.in	2008-07-17 13:45:46.000000000 -0400
+@@ -342,7 +342,7 @@ bin_SCRIPTS = \
+ 
+ lib_LTLIBRARIES = libesd.la $(libesddsp_la)
+ libesd_la_CFLAGS = $(AM_CFLAGS)
+-libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) -no-undefined
++libesd_la_LDFLAGS = -version-info 2:0:0 -no-undefined
+ libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
+ libesd_la_SOURCES = \
+ 	esdlib.c	\
+@@ -373,7 +373,7 @@ AUDIO_BACKENDS = \
+ 	audio_solaris.c		\
+ 	audio_win32.c
+ 
+-libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
++libesddsp_la_LDFLAGS = -version-info 2:0:0
+ libesddsp_la_LIBADD = libesd.la $(DL_LIB) -lm
+ libesddsp_la_SOURCES = \
+ 	esddsp.c
diff --git a/audio/esound/files/patch-ac b/audio/esound/files/patch-ac
new file mode 100644
index 000000000..43ae57690
--- /dev/null
+++ b/audio/esound/files/patch-ac
@@ -0,0 +1,15 @@
+--- esd.c.orig	Tue Nov 28 13:27:30 2000
++++ esd.c	Fri Dec  1 15:12:41 2000
+@@ -212,8 +212,8 @@
+ #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
+-				  S_IRGRP|S_IWGRP|S_IXGRP|\
+-				  S_IROTH|S_IWOTH|S_IXOTH|S_ISVTX)
++				  S_IRGRP|S_IXGRP|\
++				  S_IROTH|S_IXOTH|S_ISVTX)
+ #else
+ #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
+-				  S_IRGRP|S_IWGRP|S_IXGRP|\
+-				  S_IROTH|S_IWOTH|S_IXOTH)
++				  S_IRGRP|S_IXGRP|\
++				  S_IROTH|S_IXOTH)
+ #endif
diff --git a/audio/esound/files/patch-ad b/audio/esound/files/patch-ad
new file mode 100644
index 000000000..68018a173
--- /dev/null
+++ b/audio/esound/files/patch-ad
@@ -0,0 +1,55 @@
+--- esdlib.c.orig	2008-11-18 15:35:19.000000000 -0500
++++ esdlib.c	2008-11-20 14:32:59.000000000 -0500
+@@ -21,6 +21,8 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <poll.h>
++#include <pwd.h>
++#include <limits.h>
+ 
+ #include <sys/un.h>
+ 
+@@ -928,7 +930,7 @@ int esd_open_sound( const char *rhost )
+ 		    putenv(preload2);
+ 		}
+ 	    cmd = malloc(strlen(SERVERDIR"/esd  -spawnfd 9999999999") + strlen(esd_spawn_options));
+-	    sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options, esd_pipe[1]);
++	    sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]);
+ 
+ 	    if(!fork()) {
+ 		/* child of child process.  Minimal so startup overhead is
+@@ -1747,3 +1749,34 @@ int esd_close( int esd )
+     return close( esd );
+ }
+ 
++char *
++esd_unix_socket_dir(void) {
++       static char *sockdir = NULL, sockdirbuf[PATH_MAX];
++       struct passwd *pw;
++
++       if (sockdir != NULL)
++               return (sockdir);
++       pw = getpwuid(getuid());
++       if (pw == NULL || pw->pw_dir == NULL) {
++               fprintf(stderr, "esd: could not find home directory\n");
++               exit(1);
++       }
++       snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir);
++       endpwent();
++       sockdir = sockdirbuf;
++       return (sockdir);
++}
++
++char *
++esd_unix_socket_name(void) {
++       static char *sockname = NULL, socknamebuf[PATH_MAX];
++
++       if (sockname != NULL)
++               return (sockname);
++       snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket",
++           esd_unix_socket_dir());
++       sockname = socknamebuf;
++       return (sockname);
++ }
++
++
diff --git a/audio/esound/files/patch-audio_oss.c b/audio/esound/files/patch-audio_oss.c
new file mode 100644
index 000000000..ba70a323c
--- /dev/null
+++ b/audio/esound/files/patch-audio_oss.c
@@ -0,0 +1,18 @@
+--- audio_oss.c.orig	2008-07-29 14:07:50.000000000 -0400
++++ audio_oss.c	2008-09-07 22:22:15.000000000 -0400
+@@ -12,8 +13,14 @@
+ 
+ #include <errno.h>
+ 
++#if defined(__sparc__) || defined(__powerpc__)
++#define AFMT_S16_NE AFMT_S16_BE
++#else
++#define AFMT_S16_NE AFMT_S16_LE
++#endif
++
+ /* FreeBSD uses a different identifier? what other BSDs? */
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#ifndef SNDCTL_DSP_SETDUPLEX
+ #define SNDCTL_DSP_SETDUPLEX DSP_CAP_DUPLEX
+ #endif
+ 
diff --git a/audio/esound/files/patch-esddsp.c b/audio/esound/files/patch-esddsp.c
new file mode 100644
index 000000000..3c24fc97e
--- /dev/null
+++ b/audio/esound/files/patch-esddsp.c
@@ -0,0 +1,85 @@
+--- esddsp.c.orig	2008-11-18 15:35:19.000000000 -0500
++++ esddsp.c	2008-11-20 14:35:02.000000000 -0500
+@@ -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
+@@ -228,16 +229,19 @@ open_wrapper (int (*func) (const char *,
+ 	      const char *pathname, int flags, ...)
+ {
+   va_list args;
+-  mode_t mode;
++  mode_t mode = 0;
+ 
+   dsp_init ();
+ 
+-  va_start (args, flags);
+-  if (sizeof (mode_t) < sizeof (int))
++  if ((flags & O_CREAT) != 0)
++    {
++      va_start (args, flags);
++      if (sizeof (mode_t) < sizeof (int))
+ 	  mode = va_arg (args, int);
+-  else
++      else
+ 	  mode = va_arg (args, mode_t);
+-  va_end (args);
++      va_end (args);
++    }
+ 
+   if (!strcmp (pathname, "/dev/dsp"))
+     {
+@@ -268,7 +272,7 @@ open (const char *pathname, int flags, .
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+-  mode_t mode;
++  mode_t mode = 0;
+ 
+   DPRINTF ("open\n");
+ 
+@@ -283,9 +287,12 @@ open (const char *pathname, int flags, .
+ 	}
+     }
+ 
+-  va_start (args, flags);
+-  mode = va_arg (args, mode_t);
+-  va_end (args);
++  if ((flags & O_CREAT) != 0)
++    {
++      va_start (args, flags);
++      mode = va_arg (args, mode_t);
++      va_end (args);
++    }
+ 
+   return open_wrapper(func, pathname, flags, mode);
+ }
+@@ -295,7 +302,7 @@ open64 (const char *pathname, int flags,
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+-  mode_t mode;
++  mode_t mode = 0;
+ 
+   DPRINTF ("open64\n");
+ 
+@@ -310,9 +317,12 @@ open64 (const char *pathname, int flags,
+ 	}
+     }
+ 
+-  va_start (args, flags);
+-  mode = va_arg (args, mode_t);
+-  va_end (args);
++  if ((flags & O_CREAT) != 0)
++    {
++      va_start (args, flags);
++      mode = va_arg (args, mode_t);
++      va_end (args);
++    }
+ 
+   return open_wrapper(func, pathname, flags, mode);
+ }
diff --git a/audio/esound/files/patch-esddsp.in b/audio/esound/files/patch-esddsp.in
new file mode 100644
index 000000000..e7b108562
--- /dev/null
+++ b/audio/esound/files/patch-esddsp.in
@@ -0,0 +1,11 @@
+--- esddsp.in.orig	2008-07-15 12:05:18.000000000 -0400
++++ esddsp.in	2008-07-17 13:54:49.000000000 -0400
+@@ -106,7 +106,7 @@ fi
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ 
+-LD_PRELOAD="libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"
++LD_PRELOAD="libesddsp.so libesd.so $LD_PRELOAD"
+ export LD_PRELOAD
+ 
+ # invoke the program with the args given
diff --git a/audio/esound/pkg-descr b/audio/esound/pkg-descr
new file mode 100644
index 000000000..931afef0c
--- /dev/null
+++ b/audio/esound/pkg-descr
@@ -0,0 +1,13 @@
+[From the EsounD website:]
+
+[W]hen two or more applications want to play sounds at the same time,
+it's on a first-come, first-served basis. Whoever gets to the audio
+device first wins. EsounD changes all of that...
+
+The Enlightened Sound Daemon mixes several audio streams for playback by
+a single audio device. You can also pre-load samples, and play them back
+without having to send all the data for the sound. Network transparency
+is also built in, so you can play sounds on one machine, and listen to
+them on another.
+
+WWW: http://www.tux.org/~ricdude/EsounD.html
diff --git a/audio/esound/pkg-message b/audio/esound/pkg-message
new file mode 100644
index 000000000..afc45e262
--- /dev/null
+++ b/audio/esound/pkg-message
@@ -0,0 +1,6 @@
+The ESounD daemon (esd) must be started on a per-user basis.  This is typically
+done by the Session Manager in GNOME.  However, if you are not using the
+GNOME Desktop, you will need to add something like the following to your
+X Windows initialization script:
+
+esd -terminate -nobeeps -as 2
diff --git a/audio/esound/pkg-plist b/audio/esound/pkg-plist
new file mode 100644
index 000000000..6d443432f
--- /dev/null
+++ b/audio/esound/pkg-plist
@@ -0,0 +1,25 @@
+bin/esd
+bin/esd-config
+bin/esdcat
+bin/esdctl
+bin/esddsp
+bin/esdfilt
+bin/esdloop
+bin/esdmon
+bin/esdplay
+bin/esdrec
+bin/esdsample
+@unexec if cmp -s %D/etc/esd.conf %D/etc/esd.conf.default; then rm -f %D/etc/esd.conf; fi
+etc/esd.conf.default
+@exec [ -f %B/esd.conf ] || cp %B/%f %B/esd.conf
+include/esd.h
+lib/libesd.a
+lib/libesd.la
+lib/libesd.so
+lib/libesd.so.2
+lib/libesddsp.a
+lib/libesddsp.la
+lib/libesddsp.so
+lib/libesddsp.so.2
+libdata/pkgconfig/esound.pc
+share/aclocal/esd.m4