diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 4a0d164b45d0..e7a735258a34 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	esound
-PORTVERSION=	0.2.29
+PORTVERSION=	0.2.30
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/esound/0.2
@@ -20,8 +20,8 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 USE_GETOPT_LONG=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
+USE_GNOME=	gnometarget gnomehack
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	esd-config.1 esd.1 esdcat.1 esdctl.1 esddsp.1 esdfilt.1 esdloop.1 \
 	esdmon.1 esdplay.1 esdrec.1 esdsample.1
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 34403457b920..2750506c4156 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1 +1 @@
-MD5 (gnome/esound-0.2.29.tar.bz2) = 58bea6f744613da37a5970e1c18a04f8
+MD5 (gnome/esound-0.2.30.tar.bz2) = 1d384836b74849da9e11eeff61027665
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa
index 38ce8fa3d3fa..7ae18832d866 100644
--- a/audio/esound/files/patch-aa
+++ b/audio/esound/files/patch-aa
@@ -1,18 +1,15 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Tue Apr 23 15:24:15 2002
-+++ Makefile.in	Wed Apr 24 18:24:39 2002
-@@ -110,7 +110,7 @@
+--- Makefile.in.orig	Fri Aug  1 12:37:56 2003
++++ Makefile.in	Fri Aug  1 12:38:59 2003
+@@ -115,7 +115,7 @@
  
  lib_LTLIBRARIES = libesd.la $(libesddsp_la)
  
--libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
-+libesd_la_LDFLAGS = -version-info 2:0:0
+-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		esdmgr.c		esdfile.c		esd_config.c		audio.c			genrand.c		genrand.h
-@@ -120,7 +120,7 @@
+ libesd_la_SOURCES =  	esdlib.c		esdmgr.c		esdfile.c		esd-config.h		esd_config.c		audio.c			genrand.c		genrand.h		util.c
+@@ -125,7 +125,7 @@
  AUDIO_BACKENDS =  	audio_aix.c		audio_alsa.c		audio_alsa09.c  	audio_hpux.c		audio_irix.c		audio_none.c		audio_oss.c		audio_mklinux.c		audio_solaris.c	
  
  
@@ -21,12 +18,3 @@ $FreeBSD$
  libesddsp_la_LIBADD = $(DL_LIB) -lm
  
  libesddsp_la_SOURCES =  	esddsp.c
-@@ -169,7 +169,7 @@
- esdconfdir = $(sysconfdir)
- esdconf_DATA = esd.conf
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = esound.pc
- 
- EXTRA_DIST =  	esddsp			esound.pc.in		esound.spec		esound.spec.in		esd-config.in	        esd.conf        	esd.m4 			TIPS 			test-script 		test.wav 		getopt.h 		TODO			MAINTAINERS		$(AUDIO_BACKENDS)