7 files changed, 113 insertions, 52 deletions

diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index ea90f96d6863..e5e21fe2b54c 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -1,25 +1,27 @@
-# New ports collection makefile for:   libsidplay
-# Date created:        31 October 1996
-# Whom:                Stefan Zehl <sec@42.org>
+# New ports collection makefile for:	libsidplay2
+# Date created:				6 October 2002
+# Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libsidplay
-PORTVERSION=	1.36.57
+PORTNAME=	libsidplay2
+PORTVERSION=	2.0.7
 CATEGORIES=	audio emulators
-MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	sidplay2
+DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}-5
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	sec@42.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
+LIB_DEPENDS=	resid.2:${PORTSDIR}/audio/resid
 
-.include <bsd.port.pre.mk>
+WRKSRC=		${WRKDIR}/${PORTNAME:S/2//}-${PORTVERSION}
 
-.if (${ARCH} == i386)
-CONFIGURE_ARGS+=	--enable-optendian --enable-optfixpoint
-.endif
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo
index bdddf044077e..bae5d12226b0 100644
--- a/audio/libsidplay2/distinfo
+++ b/audio/libsidplay2/distinfo
@@ -1 +1 @@
-MD5 (libsidplay-1.36.57.tgz) = a935ec67d5600b079e22ecac58cc19d5
+MD5 (libsidplay-2.0.7-5.tgz) = 3c2d7e5b8f733a131a03fe14a97d76a0
diff --git a/audio/libsidplay2/files/patch-libtool b/audio/libsidplay2/files/patch-libtool
index 3087118bc186..d32b8a312bdf 100644
--- a/audio/libsidplay2/files/patch-libtool
+++ b/audio/libsidplay2/files/patch-libtool
@@ -1,11 +1,11 @@
---- configure.orig	Sat Jan 12 02:17:19 2002
-+++ configure	Sat Jan 12 02:18:08 2002
-@@ -6159,7 +6159,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+--- configure.orig	Mon May  7 19:23:11 2001
++++ configure	Mon Nov 18 05:04:02 2002
+@@ -1841,7 +1841,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +LIBTOOL='libtool'
  
- # Prevent multiple expansion
- 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/audio/libsidplay2/files/patch-src-player.cpp b/audio/libsidplay2/files/patch-src-player.cpp
new file mode 100644
index 000000000000..77b0365c449b
--- /dev/null
+++ b/audio/libsidplay2/files/patch-src-player.cpp
@@ -0,0 +1,73 @@
+--- 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/pkg-comment b/audio/libsidplay2/pkg-comment
index cced7b195bac..5a472bce421e 100644
--- a/audio/libsidplay2/pkg-comment
+++ b/audio/libsidplay2/pkg-comment
@@ -1 +1 @@
-A Commodore SID-chip emulator library to play SID music files
+Library to play Commodore 64 SID-tunes cycle accurate
diff --git a/audio/libsidplay2/pkg-descr b/audio/libsidplay2/pkg-descr
index e2604b8bdbf0..6dcdf731c012 100644
--- a/audio/libsidplay2/pkg-descr
+++ b/audio/libsidplay2/pkg-descr
@@ -1,17 +1,6 @@
-Basically, SIDPLAY is just an ordinary music player software. More
-specifically, it emulates the Sound Interface Device chip (MOS 6581,
-known as SID) and the Micro Processor Unit (MOS 6510) of the
-Commodore 64 on your computer. Its platform-independent software
-emulates hardware components. Therefore it is able to load and execute
-C64 machine code programs which produce music or sound. In general,
-these are independent fragments of code and data which have been
-ripped from games and demonstration programs and were transferred
-directly from the C64. All you need is a supported operating system and
-audio hardware with average PCM waveform playback capabilities. A
-fast CPU and a 16-bit sound card are recommended for better
-performance.
+Sidplay 2 is the second in the Sidplay series originally developed by Michael
+Schwendt. This version is written by Simon White and is cycle accurate for
+improved sound reproduction. Sidplay 2 is capable of playing all C64 mono and
+stereo file formats.
 
-This is just the library. To actually use it, you need one of the
-front-ends like 'sidplay' or 'xsidplay'.
-
-WWW: http://www.geocities.com/SiliconValley/Lakes/5147/index.html
+WWW: http://sidplay2.sourceforge.net/
diff --git a/audio/libsidplay2/pkg-plist b/audio/libsidplay2/pkg-plist
index e4c0e360ae51..84fe65071168 100644
--- a/audio/libsidplay2/pkg-plist
+++ b/audio/libsidplay2/pkg-plist
@@ -1,15 +1,12 @@
-include/sidplay/compconf.h
-include/sidplay/emucfg.h
-include/sidplay/fformat.h
-include/sidplay/fixpoint.h
-include/sidplay/libcfg.h
-include/sidplay/myendian.h
-include/sidplay/mytypes.h
-include/sidplay/player.h
-include/sidplay/sidtune.h
-include/sidplay/version.h
-lib/libsidplay.a
-lib/libsidplay.la
-lib/libsidplay.so
-lib/libsidplay.so.1
+include/sidplay/Buffer.h
+include/sidplay/SidTune.h
+include/sidplay/SmartPtr.h
+include/sidplay/sidconfig.h
+include/sidplay/sidendian.h
+include/sidplay/sidplay2.h
+include/sidplay/sidtypes.h
+lib/libsidplay2.a
+lib/libsidplay2.la
+lib/libsidplay2.so
+lib/libsidplay2.so.0
 @dirrm include/sidplay