4 files changed, 79 insertions, 25 deletions

diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 12ebc107ef4f..69cb224414a6 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -7,34 +7,27 @@
 #
 
 PORTNAME=	osalp
-PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTVERSION=	0.7.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
+		mpg123:${PORTSDIR}/audio/mpg123
+LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-CONFIGURE_ARGS=	--enable-blade --enable-mpg123 --enable-sox
+CONFIGURE_ARGS=	--enable-all
+
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500035
-BROKEN=		"Does not compile on 5.0"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/lib/aflib|${PREFIX}/lib/aflib|g' \
-		${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/osalp/distinfo b/audio/osalp/distinfo
index 2a68cbc38a05..786b9278efdd 100644
--- a/audio/osalp/distinfo
+++ b/audio/osalp/distinfo
@@ -1 +1 @@
-MD5 (osalp-0.7.2.tar.gz) = 52df6f63978bebd16c87899e501323ea
+MD5 (osalp-0.7.3.tar.gz) = 5cadd32241f37ece1716364289186ebf
diff --git a/audio/osalp/files/patch-config::ltmain.sh b/audio/osalp/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..dab9e73129cc
--- /dev/null
+++ b/audio/osalp/files/patch-config::ltmain.sh
@@ -0,0 +1,49 @@
+--- config/ltmain.sh.orig	Mon May 27 06:17:51 2002
++++ config/ltmain.sh	Sat Oct 26 02:10:42 2002
+@@ -956,6 +956,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -1043,14 +1044,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2442,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4210,10 +4211,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/osalp/pkg-plist b/audio/osalp/pkg-plist
index 8f6e06a93553..2d3831366035 100644
--- a/audio/osalp/pkg-plist
+++ b/audio/osalp/pkg-plist
@@ -1,3 +1,7 @@
+bin/audiofile-config
+include/af_vfs.h
+include/audiofile.h
+include/aupvlist.h
 include/aflib/aflib.h
 include/aflib/aflibAudio.h
 include/aflib/aflibAudioBWFilter.h
@@ -19,6 +23,7 @@ include/aflib/aflibConverterLargeFilter.h
 include/aflib/aflibConverterSmallFilter.h
 include/aflib/aflibData.h
 include/aflib/aflibDateTime.h
+include/aflib/aflibDebug.h
 include/aflib/aflibEditClip.h
 include/aflib/aflibEnvFile.h
 include/aflib/aflibFFT.h
@@ -29,15 +34,22 @@ include/aflib/aflibMemNode.h
 include/aflib/aflibMixerItem.h
 include/aflib/aflibRecorderItem.h
 include/aflib/aflibSampleData.h
-lib/aflib/libaflibBladeFile-%%VERSION%%.so
-lib/aflib/libaflibBladeFile.so
-lib/aflib/libaflibLameFile-%%VERSION%%.so
-lib/aflib/libaflibLameFile.so
+lib/aflib/libaflibAifcFile-%%VERSION%%.so
+lib/aflib/libaflibAifcFile.so
+lib/aflib/libaflibAiffFile-%%VERSION%%.so
+lib/aflib/libaflibAiffFile.so
+lib/aflib/libaflibAuFile-%%VERSION%%.so
+lib/aflib/libaflibAuFile.so
+lib/aflib/libaflibDevFile-%%VERSION%%.so
+lib/aflib/libaflibDevFile.so
 lib/aflib/libaflibMpgFile-%%VERSION%%.so
 lib/aflib/libaflibMpgFile.so
-lib/aflib/libaflibSoxFile-%%VERSION%%.so
-lib/aflib/libaflibSoxFile.so
+lib/aflib/libaflibOggFile-%%VERSION%%.so
+lib/aflib/libaflibOggFile.so
+lib/aflib/libaflibWavFile-%%VERSION%%.so
+lib/aflib/libaflibWavFile.so
 lib/libaflib-%%VERSION%%.so
 lib/libaflib.so
+share/aclocal/audiofile.m4
 @dirrm lib/aflib
 @dirrm include/aflib