5 files changed, 56 insertions, 51 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 4483c5f138f0..4d9686402315 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	esound
-# Version required:	0.2.4
+# Version required:	0.2.7
 # Date created:		19 July 1998
 # Whom:			Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:30:43 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/22 15:47:43 vanilla Exp $
 #
 
-DISTNAME=	esound-0.2.4
+DISTNAME=	esound-0.2.7
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
@@ -14,10 +14,9 @@ MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/esound
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 2c7f75364af9..68d8e0defe71 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1 +1 @@
-MD5 (esound-0.2.4.tar.gz) = 6a3d229644e31ba563777d24b9f5ee0d
+MD5 (esound-0.2.7.tar.gz) = 3a530a942880268f8b9aaf3df38fd478
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa
index 468aa6a5bb89..4371001c6757 100644
--- a/audio/esound/files/patch-aa
+++ b/audio/esound/files/patch-aa
@@ -1,14 +1,19 @@
---- audio_oss.c.orig	Sun Jul 19 12:13:08 1998
-+++ audio_oss.c	Sun Jul 19 12:14:39 1998
-@@ -29,9 +29,11 @@
- 
-     /* TODO: check that this is allowable */
-     /* set for full duplex operation, if recording */
-+    /*
-     if ( (esd_audio_format & ESD_MASK_FUNC) == ESD_RECORD ) {
-         ioctl( afd, SNDCTL_DSP_SETDUPLEX, 0 );
-     }
-+     */
- 
-     /* set the sound driver fragment size and number */
-     /* fragment = max_buffers << 16 + log2(buffer_size), (256 16) */
+--- Makefile.in.orig	Tue Dec 15 01:22:45 1998
++++ Makefile.in	Wed Dec 23 04:57:49 1998
+@@ -110,14 +110,14 @@
+ 	esdfile.c	\
+ 	audio.c
+ 
+-libesd_la_LDFLAGS = -version-info @ESD_VERSION_INFO@
++libesd_la_LDFLAGS = -version-info 0:2:0
+ 
+ libesd_la_LIBADD = @AUDIOFILE_LIBS@ -lm
+ 
+ EXTRA_LTLIBRARIES = \
+ 	libesddsp.la
+ 
+-libesddsp_la_LDFLAGS = -rpath $(libdir) -version-info @ESD_VERSION_INFO@
++libesddsp_la_LDFLAGS = -rpath $(libdir) -version-info 0:2:0
+ 
+ libesddsp_la_LIBADD = -ldl -lm
+ 
diff --git a/audio/esound/files/patch-ab b/audio/esound/files/patch-ab
index c6a217595615..0d4005a7686b 100644
--- a/audio/esound/files/patch-ab
+++ b/audio/esound/files/patch-ab
@@ -1,44 +1,36 @@
---- ltmain.sh.orig	Tue Sep 22 23:31:41 1998
-+++ ltmain.sh	Tue Sep 22 23:35:18 1998
-@@ -967,6 +967,16 @@
+--- ltmain.sh.orig	Tue Dec 15 01:22:13 1998
++++ ltmain.sh	Wed Dec 23 03:12:43 1998
+@@ -923,6 +923,18 @@
          versuffix="$current.$revision"
          ;;
  
-+      freebsd)
++      freebsd-aout)
 +        version_vars="$version_vars major versuffix"
 +        major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+        versuffix="$current";
-+	else
-+        versuffix="$current.$revision";
-+	fi
++        versuffix="$current.$revision"
++        ;;
++
++      freebsd-elf)
++        version_vars="$version_vars major versuffix"
++        major="$current"
++        versuffix="$current"
 +        ;;
 +
        *)
          $echo "$modename: unknown library version type \`$version_type'" 1>&2
          echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig	Tue Sep 22 23:31:38 1998
-+++ ltconfig	Tue Sep 22 23:37:19 1998
-@@ -1123,10 +1123,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+--- ltconfig.orig	Tue Dec 15 01:22:13 1998
++++ ltconfig	Wed Dec 23 03:14:11 1998
+@@ -1106,9 +1106,10 @@
    ;;
  
--freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd3*)
-+  version_type=freebsd
-+  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  fi
+ freebsd2* | freebsd3*)
+-  version_type=sunos
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
+   library_names_spec='$libname.so.$versuffix $libname.so'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
diff --git a/audio/esound/pkg-plist b/audio/esound/pkg-plist
index 66ec22350b52..9a4615024d30 100644
--- a/audio/esound/pkg-plist
+++ b/audio/esound/pkg-plist
@@ -1,14 +1,23 @@
 bin/esd
+bin/esd-config
 bin/esdcat
 bin/esdctl
+bin/esddsp
+bin/esdfilt
 bin/esdloop
 bin/esdmon
+bin/esdplay
 bin/esdrec
 bin/esdsample
 include/esd.h
 lib/libesd.a
 lib/libesd.la
 lib/libesd.so
-lib/libesd.so.0
+lib/libesd.so.0.2
+lib/libesddsp.a
+lib/libesddsp.la
+lib/libesddsp.so
+lib/libesddsp.so.0.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/esd.m4