Update to 2.1.0.

PR:		ports/47316
Submitted by:	Ports Fury

9 files changed, 204 insertions, 98 deletions

diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index ec24f64c2ea3..a57a7019f0dc 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	libsidplay2
-PORTVERSION=	2.0.7
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	audio emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sidplay2
-DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}-5
-EXTRACT_SUFX=	.tgz
+DISTNAME=	sidplay-libs-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	resid.2:${PORTSDIR}/audio/resid
-
-WRKSRC=		${WRKDIR}/${PORTNAME:S/2//}-${PORTVERSION}
+LD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-resid-includes=${LOCALBASE}/include \
-		--with-resid-library=${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${CHMOD} +rw ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
+	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \
+		${WRKSRC}/libsidutils/src/ini/ini.cpp
 
 .include <bsd.port.mk>
diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo
index bae5d12226b0..c083595cec84 100644
--- a/audio/libsidplay2/distinfo
+++ b/audio/libsidplay2/distinfo
@@ -1 +1 @@
-MD5 (libsidplay-2.0.7-5.tgz) = 3c2d7e5b8f733a131a03fe14a97d76a0
+MD5 (sidplay-libs-2.1.0.tar.gz) = 40e61c8edbce16e1a8d0e31169869d99
diff --git a/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh b/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh
new file mode 100644
index 000000000000..5c482d1a6882
--- /dev/null
+++ b/audio/libsidplay2/files/patch-builders::resid-builder::unix::ltmain.sh
@@ -0,0 +1,42 @@
+--- 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-configure b/audio/libsidplay2/files/patch-configure
deleted file mode 100644
index b38945858843..000000000000
--- a/audio/libsidplay2/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Tue May  8 02:23:11 2001
-+++ configure	Sun Dec  1 07:12:29 2002
-@@ -1838,7 +1838,8 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+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/libsidplay2/files/patch-libsidplay::unix::ltmain.sh b/audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh
new file mode 100644
index 000000000000..8136ce5a2769
--- /dev/null
+++ b/audio/libsidplay2/files/patch-libsidplay::unix::ltmain.sh
@@ -0,0 +1,42 @@
+--- 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
new file mode 100644
index 000000000000..fd66de2e0907
--- /dev/null
+++ b/audio/libsidplay2/files/patch-libsidutils::unix::ltmain.sh
@@ -0,0 +1,42 @@
+--- 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-src-player.cpp b/audio/libsidplay2/files/patch-src-player.cpp
deleted file mode 100644
index 77b0365c449b..000000000000
--- a/audio/libsidplay2/files/patch-src-player.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
---- src/player.cpp.orig	Mon May  7 17:09:39 2001
-+++ src/player.cpp	Sun Oct  6 20:53:45 2002
-@@ -580,34 +580,49 @@
- int player::loadFilter (const sid_fc_t *cutoffs, uint_least16_t points)
- {
- #ifndef HAVE_HARDSID
--    fc_point fc[0x800];
-- 
--    // Make sure there are enough filter points and they are legal
--    if ((points < 2) || (points > 0x800))
--        goto player_loadFilter_error;
-+    fc_point fc[0x802];
-+    const fc_point *f0 = fc;
-+    int   pnts = 0;
- 
-+    if (cutoffs == NULL)
-+    {   // Select default filter
-+        sid.fc_default  (f0, pnts);
-+        sid2.fc_default (f0, pnts);
-+    }
-+    else
-     {
--        const sid_fc_t *val, *valp, vals = {-1, 0};
--        // Last check, make sure they are list in numerical order
--        // for both axis
--        val = &vals; // (start)
--        for (int i = 0; i < points; i++)
-+        pnts = points;
-+        // Make sure there are enough filter points and they are legal
-+        if ((pnts < 2) || (pnts > 0x800))
-+            goto player_loadFilter_error;
-+
-         {
--            valp = val;
--            val  = &cutoffs[i];
--            if ((*valp)[0] >  (*val)[0])
--                goto player_loadFilter_error;
--//            if ((*valp)[1] >= (*val)[1])
--//                goto player_loadFilter_error;
--            fc[i][0] = (sound_sample) (*val)[0];
--            fc[i][1] = (sound_sample) (*val)[1];
-+            const sid_fc_t  fstart = {-1, 0};
-+            const sid_fc_t *fprev  = &fstart, *fin = cutoffs;
-+            fc_point *fout = fc;
-+            // Last check, make sure they are list in numerical order
-+            // for both axis
-+            while (pnts-- > 0)
-+            {
-+                if ((*fprev)[0] >= (*fin)[0])
-+                    goto player_loadFilter_error;
-+                fout++;
-+                (*fout)[0] = (sound_sample) (*fin)[0];
-+                (*fout)[1] = (sound_sample) (*fin)[1];
-+                fprev      = fin++;
-+            }
-+            // Updated ReSID interpolate requires we
-+            // repeat the end pnts
-+            *(fout+1) = *fout;
-+            fc[0]     = fc[1];
-+            pnts      = points + 2;
-         }
-     }
- 
-     // function from reSID
--    points--;
--    interpolate (fc, fc, fc + points, fc + points, sid.fc_plotter (), 1.0);
--    interpolate (fc, fc, fc + points, fc + points, sid2.fc_plotter(), 1.0);
-+    pnts--;
-+    interpolate (f0, f0 + pnts, sid.fc_plotter  (), 1.0);
-+    interpolate (f0, f0 + pnts, sid2.fc_plotter (), 1.0);
- return 0;
- 
- player_loadFilter_error:
diff --git a/audio/libsidplay2/files/patch-unix::ltmain.sh b/audio/libsidplay2/files/patch-unix::ltmain.sh
new file mode 100644
index 000000000000..aff50ed41547
--- /dev/null
+++ b/audio/libsidplay2/files/patch-unix::ltmain.sh
@@ -0,0 +1,42 @@
+--- 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 8643b25bb179..c625d8ea08bd 100644
--- a/audio/libsidplay2/pkg-plist
+++ b/audio/libsidplay2/pkg-plist
@@ -1,11 +1,34 @@
 include/sidplay/Buffer.h
 include/sidplay/SidTune.h
 include/sidplay/SmartPtr.h
+include/sidplay/builders/resid.h
+include/sidplay/c64env.h
+include/sidplay/component.h
+include/sidplay/event.h
+include/sidplay/sid2types.h
+include/sidplay/sidbuilder.h
 include/sidplay/sidconfig.h
 include/sidplay/sidendian.h
+include/sidplay/sidint.h
 include/sidplay/sidplay2.h
 include/sidplay/sidtypes.h
+include/sidplay/sidusage.h
+include/sidplay/utils/SidDatabase.h
+include/sidplay/utils/SidFilter.h
+include/sidplay/utils/SidTuneMod.h
+include/sidplay/utils/SidUsage.h
+include/sidplay/utils/libini.h
 lib/libsidplay2.a
 lib/libsidplay2.so
-lib/libsidplay2.so.0
+lib/libsidplay2.so.1
+lib/libsidutils.a
+lib/libsidutils.so
+lib/libsidutils.so.0
+lib/sidplay/builders/libresid-builder.a
+libdata/pkgconfig/libsidplay2.pc
+libdata/pkgconfig/libsidutils.pc
+@dirrm lib/sidplay/builders
+@dirrm lib/sidplay
+@dirrm include/sidplay/utils
+@dirrm include/sidplay/builders
 @dirrm include/sidplay