4 files changed, 15 insertions, 55 deletions

diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 94ffcb18774c..5e3192ae0f0b 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	osalp
-PORTVERSION=	0.7.3
-PORTREVISION=	2
+PORTVERSION=	0.7.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,6 +33,6 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-CONFLICTS=	libaudiofile-*
+CONFLICTS=	libaudiofile-[0-9]*
 
 .include <bsd.port.mk>
diff --git a/audio/osalp/distinfo b/audio/osalp/distinfo
index 3ae3dc00ee01..c66b84231eb9 100644
--- a/audio/osalp/distinfo
+++ b/audio/osalp/distinfo
@@ -1,3 +1,3 @@
-MD5 (osalp-0.7.3.tar.gz) = 5cadd32241f37ece1716364289186ebf
-SHA256 (osalp-0.7.3.tar.gz) = c792525d763b0c726904634a19bf727076228d818ecf63c7772327ad5689bec8
-SIZE (osalp-0.7.3.tar.gz) = 1025642
+MD5 (osalp-0.7.4.tar.gz) = a987b35a78050e2c9cf346297332ef3a
+SHA256 (osalp-0.7.4.tar.gz) = 47b4c6e467a839a7e973bea2bc7d2dc9f64bdb60bba0f80803b91d316da347fc
+SIZE (osalp-0.7.4.tar.gz) = 1398173
diff --git a/audio/osalp/files/patch-config::ltmain.sh b/audio/osalp/files/patch-config::ltmain.sh
deleted file mode 100644
index dab9e73129cc..000000000000
--- a/audio/osalp/files/patch-config::ltmain.sh
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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 2d3831366035..1f1b8edfffd6 100644
--- a/audio/osalp/pkg-plist
+++ b/audio/osalp/pkg-plist
@@ -48,8 +48,18 @@ lib/aflib/libaflibOggFile-%%VERSION%%.so
 lib/aflib/libaflibOggFile.so
 lib/aflib/libaflibWavFile-%%VERSION%%.so
 lib/aflib/libaflibWavFile.so
+
+lib/aflib/libaflibDevFile.la
+lib/aflib/libaflibAifcFile.la
+lib/aflib/libaflibAiffFile.la
+lib/aflib/libaflibAuFile.la
+lib/aflib/libaflibWavFile.la
+lib/aflib/libaflibOggFile.la
+lib/aflib/libaflibMpgFile.la
+
 lib/libaflib-%%VERSION%%.so
 lib/libaflib.so
+lib/libaflib.la
 share/aclocal/audiofile.m4
 @dirrm lib/aflib
 @dirrm include/aflib