6 files changed, 32 insertions, 5 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index c426a7d5e075..79be9903c550 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -7,22 +7,30 @@
 #
 
 PORTNAME=	libsndfile
-PORTVERSION=	0.0.28
+PORTVERSION=	1.0.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.zip.com.au/~erikd/libsndfile/
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--enable-justsrc --disable-gcc-pipe
 INSTALLS_SHLIB=	yes
 
+MAN1=		sndfile-info.1 sndfile-play.1
+
 PORTDOCS=	ChangeLog NEWS api.html bugs.html index.html libsndfile.jpg \
 		new_file_type.HOWTO sndfile_info.html
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-g -O2 ||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|libdir[)]/pkgconfig|prefix)/libdata/pkgconfig|g' \
+			${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 0c9e031e19fa..e45b3fc271f7 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1 +1 @@
-MD5 (libsndfile-0.0.28.tar.gz) = 611bde6c4d774a70d377d7d9da40f8ae
+MD5 (libsndfile-1.0.1.tar.gz) = bb328567ad639b72d22f7bf3b31550c7
diff --git a/audio/libsndfile/files/patch-configure b/audio/libsndfile/files/patch-configure
new file mode 100644
index 000000000000..66bb1b3ea544
--- /dev/null
+++ b/audio/libsndfile/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Sep 13 18:56:06 2002
++++ configure	Wed Sep 18 04:21:29 2002
+@@ -5432,6 +5432,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist
index dc452e6a0858..ac53e7ef13fc 100644
--- a/audio/libsndfile/pkg-plist
+++ b/audio/libsndfile/pkg-plist
@@ -1,7 +1,8 @@
 include/sndfile.h
 lib/libsndfile.a
 lib/libsndfile.so
-lib/libsndfile.so.0
+lib/libsndfile.so.1
+libdata/pkgconfig/sndfile.pc
 %%PORTDOCS%%share/doc/libsndfile/ChangeLog
 %%PORTDOCS%%share/doc/libsndfile/NEWS
 %%PORTDOCS%%share/doc/libsndfile/api.html
@@ -10,4 +11,10 @@ lib/libsndfile.so.0
 %%PORTDOCS%%share/doc/libsndfile/libsndfile.jpg
 %%PORTDOCS%%share/doc/libsndfile/new_file_type.HOWTO
 %%PORTDOCS%%share/doc/libsndfile/sndfile_info.html
+share/octave/site/m/sndfile_load.m
+share/octave/site/m/sndfile_play.m
+share/octave/site/m/sndfile_save.m
+@unexec rmdir %D/share/octave/site/m 2>/dev/null || true
+@unexec rmdir %D/share/octave/site 2>/dev/null || true
+@unexec rmdir %D/share/octave 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/libsndfile
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index d6ff9ac22a48..3109dd1126cf 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -8,12 +8,13 @@
 
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mtek.chalmers.se/~hjormagn/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	sndfile.0:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
 
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index d51e9b96e568..166672f11e51 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	xmms-sndfile
 PORTVERSION=	1.0.p6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.zipworld.com.au/~erikd/XMMS/
 DISTNAME=	xmms_sndfile-${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	dyeske@yahoo.com
 
-LIB_DEPENDS=	sndfile.0:${PORTSDIR}/audio/libsndfile \
+LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		xmms.3:${PORTSDIR}/audio/xmms
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"