Ticket #2772: esound.diff

audio/esound/Portfile

@@ -3 +3 @@
 PortSystem 1.0
 name            esound
 version         0.2.35
+revision        1
 categories      audio
-maintainers     gnome-darwinports@opendarwin.org
+maintainers     danchr@opendarwin.org
 description     Enlightened Sound Daemon
 homepage        http://www.tux.org/~ricdude/EsounD.html
 platforms       darwin
 master_sites    gnome:sources/esound/0.2
+use_autoconf    yes
 use_bzip2       yes
 depends_lib     lib:audiofile.0:audiofile
-checksums       md5 1566344f80a8909b5e6e4d6b6520c2c1
-configure.args  --mandir=${prefix}/share/man
+depends_build   path:${prefix}/bin/autoconf:autoconf \
+                path:${prefix}/bin/glibtool:libtool
+checksums       sha1 b3164f17d84fe57f1457bc0d0a50615f67c87de8
+configure.args  --enable-ipv6 --with-audiofile
+patchfiles      patch-esd.conf patch-esd_config.c patch-configure.in
 
 variant puredarwin {
                 configure.args-append   --disable-local-sound
 }
 
-variant darwin {
-        configure.env LDFLAGS="-framework CoreAudio"
+pre-configure {
+        system "cd ${worksrcpath} && glibtoolize --force && aclocal"
 }
 
 long_description EsounD, the Enlightened Sound Daemon, is a server \

audio/esound/files/patch-configure.in

@@ +1 @@
+--- configure.in.orig   Wed Mar 23 00:31:46 2005
++++ configure.in        Wed Mar 23 00:35:36 2005
+@@ -251,7 +251,8 @@
+    if test "${ac_cv_header_CoreAudio_CoreAudio_h}" = "yes"; then
+       found_sound=yes
+       AC_DEFINE(DRIVER_COREAUDIO)
+-      SOUND_LIBS="-Wl,-framework -Wl,CoreAudio"
++      SOUND_LIBS="-framework CoreAudio"
++      LIBS="$LIBS $SOUND_LIBS"
+    fi
+ 
+    if test "$found_sound" = "no"; then

audio/esound/files/patch-esd.conf

@@ +1 @@
++++ ../esound-0.2.35.bak/esd.conf       Wed Mar 23 00:04:57 2005
+--- esd.conf    Wed Mar 23 00:05:01 2005
+@@ -1,6 +1,6 @@
+ [esd]
+ auto_spawn=1
+ spawn_options=-terminate -nobeeps -as 2
+-spawn_wait_ms=100
++spawn_wait_ms=999
+ # default options are used in spawned and non-spawned mode
+ default_options=

audio/esound/files/patch-esd_config.c

@@ +1 @@
+--- ../esound-0.2.35.bak/esd_config.c   Wed Mar 23 00:04:57 2005
++++ esd_config.c        Wed Mar 23 00:05:01 2005
+@@ -9,7 +9,7 @@
+ int esd_no_spawn=1; /* If we can't even find the system config file,
+                       things are screwed up - don't try to make things
+                       worse. */
+-int esd_spawn_wait_ms=100; /* Time to wait trying to connect to an
++int esd_spawn_wait_ms=999; /* Time to wait trying to connect to an
+                              autospawned ESD, in milliseconds. */
+ char esd_spawn_options[LINEBUF_SIZE] = "-terminate -nobeeps -as 2";
+