7 files changed, 11 insertions, 173 deletions

diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 55e143c7223c..90f26a25ebc0 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libsidplay2
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	audio emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sidplay2
@@ -19,7 +18,12 @@ COMMENT=	Library to play Commodore 64 SID-tunes cycle accurate
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+LIBTOOLFILES=	builders/hardsid-builder/configure \
+		builders/resid-builder/configure \
+		libsidplay/configure \
+		libsidutils/configure \
+		resid/configure
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo
index 59434d013e79..705029281bf3 100644
--- a/audio/libsidplay2/distinfo
+++ b/audio/libsidplay2/distinfo
@@ -1,2 +1,2 @@
-MD5 (sidplay-libs-2.1.0.tar.gz) = 40e61c8edbce16e1a8d0e31169869d99
-SIZE (sidplay-libs-2.1.0.tar.gz) = 1135771
+MD5 (sidplay-libs-2.1.1.tar.gz) = 7ea0ba5dc1da4604d15eaae001f7d2a7
+SIZE (sidplay-libs-2.1.1.tar.gz) = 1900252
diff --git a/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh b/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh
deleted file mode 100644
index 5c482d1a6882..000000000000
--- a/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- builders/resid-builder/unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
-+++ builders/resid-builder/unix/ltmain.sh	Wed Jan 22 04:51:36 2003
-@@ -1221,7 +1221,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
- 	    continue
- 	    ;;
-@@ -1233,7 +1233,7 @@
- 	fi
-         if test "X$arg" = "X-lc_r"; then
-          case $host in
--         *-*-openbsd*)
-+         *-*-openbsd* | *-*-freebsd*)
-            # Do not include libc_r directly, use -pthread flag.
-            continue
-            ;;
-@@ -2814,7 +2814,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--          *-*-openbsd*)
-+          *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
-             ;;
-  	  *)
-@@ -4672,10 +4672,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/libsidplay2/files/patch-libsidplay::unix::ltmain.sh b/audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh
deleted file mode 100644
index 8136ce5a2769..000000000000
--- a/audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- libsidplay/unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
-+++ libsidplay/unix/ltmain.sh	Wed Jan 22 04:51:36 2003
-@@ -1221,7 +1221,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
- 	    continue
- 	    ;;
-@@ -1233,7 +1233,7 @@
- 	fi
-         if test "X$arg" = "X-lc_r"; then
-          case $host in
--         *-*-openbsd*)
-+         *-*-openbsd* | *-*-freebsd*)
-            # Do not include libc_r directly, use -pthread flag.
-            continue
-            ;;
-@@ -2814,7 +2814,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--          *-*-openbsd*)
-+          *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
-             ;;
-  	  *)
-@@ -4672,10 +4672,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/libsidplay2/files/patch-libsidutils::unix::ltmain.sh b/audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh
deleted file mode 100644
index fd66de2e0907..000000000000
--- a/audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- libsidutils/unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
-+++ libsidutils/unix/ltmain.sh	Wed Jan 22 04:51:36 2003
-@@ -1221,7 +1221,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
- 	    continue
- 	    ;;
-@@ -1233,7 +1233,7 @@
- 	fi
-         if test "X$arg" = "X-lc_r"; then
-          case $host in
--         *-*-openbsd*)
-+         *-*-openbsd* | *-*-freebsd*)
-            # Do not include libc_r directly, use -pthread flag.
-            continue
-            ;;
-@@ -2814,7 +2814,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--          *-*-openbsd*)
-+          *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
-             ;;
-  	  *)
-@@ -4672,10 +4672,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/libsidplay2/files/patch-unix::ltmain.sh b/audio/libsidplay2/files/patch-unix::ltmain.sh
deleted file mode 100644
index aff50ed41547..000000000000
--- a/audio/libsidplay2/files/patch-unix::ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- unix/ltmain.sh.orig	Tue Dec 24 05:38:47 2002
-+++ unix/ltmain.sh	Wed Jan 22 04:51:36 2003
-@@ -1221,7 +1221,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
- 	    continue
- 	    ;;
-@@ -1233,7 +1233,7 @@
- 	fi
-         if test "X$arg" = "X-lc_r"; then
-          case $host in
--         *-*-openbsd*)
-+         *-*-openbsd* | *-*-freebsd*)
-            # Do not include libc_r directly, use -pthread flag.
-            continue
-            ;;
-@@ -2814,7 +2814,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--          *-*-openbsd*)
-+          *-*-openbsd* | *-*-freebsd*)
- 	    # OpenBSD uses either libc or libc_r.
-             ;;
-  	  *)
-@@ -4672,10 +4672,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/libsidplay2/pkg-plist b/audio/libsidplay2/pkg-plist
index c625d8ea08bd..079cf132d642 100644
--- a/audio/libsidplay2/pkg-plist
+++ b/audio/libsidplay2/pkg-plist
@@ -25,6 +25,8 @@ lib/libsidutils.a
 lib/libsidutils.so
 lib/libsidutils.so.0
 lib/sidplay/builders/libresid-builder.a
+lib/sidplay/builders/libresid-builder.so
+lib/sidplay/builders/libresid-builder.so.0
 libdata/pkgconfig/libsidplay2.pc
 libdata/pkgconfig/libsidutils.pc
 @dirrm lib/sidplay/builders