Updated to latest pre-release, 0.0.6pre21. No ChangeLog. pkgsrc changes:

Commented 2/3 patches. Added gsed to USE_TOOLS. Buildlink'd pthread. Added
fortran77 to USE_LANGUAGES. Included options.mk file to enable the user to
build with mmx, sse, and "tests" option, which uses pcap, X11, sndfile,
libxml2, fltk, and fftw to run some tests. All of these options are
disabled by default. Some of these changes were already present in
wip/spandsp and were merged into this package after its removal. All
PKG_OPTIONS are disabled by default. There are no noticeable changes to
the package from this update.

5 files changed, 44 insertions, 13 deletions

diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index bea6ef54190..276796691f6 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2013/01/26 21:36:15 adam Exp $
+# $NetBSD: Makefile,v 1.6 2013/06/09 22:36:12 rodent Exp $
 #
 
-DISTNAME=	spandsp-0.0.6pre18
-PKGREVISION=	2
+DISTNAME=	spandsp-0.0.6pre21
 CATEGORIES=	comms
 MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/
 EXTRACT_SUFX=	.tgz
@@ -14,16 +13,19 @@ LICENSE=	gnu-lgpl-v2.1
 
 WRKSRC=		${WRKDIR}/spandsp-0.0.6
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
+USE_TOOLS+=	gsed pkg-config
+USE_LANGUAGES=	c c++ fortran77
 USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=	spandsp.pc.in
 
 INSTALLATION_DIRS=	share/doc/${PKGBASE}
 
+.include "options.mk"
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/DueDiligence ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/spandsp/distinfo b/comms/spandsp/distinfo
index 3477b90bfbe..9e5586cce5c 100644
--- a/comms/spandsp/distinfo
+++ b/comms/spandsp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/09/01 09:22:30 jnemeth Exp $
+$NetBSD: distinfo,v 1.3 2013/06/09 22:36:12 rodent Exp $
 
-SHA1 (spandsp-0.0.6pre18.tgz) = 66d85049ad3942471e0ef5e9d9312c4d0a9dd4f8
-RMD160 (spandsp-0.0.6pre18.tgz) = cfbce55ab6fae0b6e433af00f020930f9d0bd300
-Size (spandsp-0.0.6pre18.tgz) = 3241122 bytes
-SHA1 (patch-aa) = 808f65446ad04343096d7a25aeec0b26047833db
-SHA1 (patch-ab) = 547058f6a9983a0b61ce674bac712c1ed8767900
+SHA1 (spandsp-0.0.6pre21.tgz) = 6b4084ac700cbce2cbfe8e3050a0252ba00657d3
+RMD160 (spandsp-0.0.6pre21.tgz) = 183a8e42d45f7b026064d696a361f0b64dad68bb
+Size (spandsp-0.0.6pre21.tgz) = 3278758 bytes
+SHA1 (patch-aa) = 9367cb23f8413d6adcff23ddecda914d9de27e0c
+SHA1 (patch-ab) = 11162d011e061172140b766c6c5fe7714f662eb8
 SHA1 (patch-src_gsm0610__rpe.c) = c35359c79940923e6cb0667df101410c179acc96
diff --git a/comms/spandsp/options.mk b/comms/spandsp/options.mk
new file mode 100644
index 00000000000..f2276144ce5
--- /dev/null
+++ b/comms/spandsp/options.mk
@@ -0,0 +1,25 @@
+# $NetBSD: options.mk,v 1.1 2013/06/09 22:36:12 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.spandsp
+PKG_SUPPORTED_OPTIONS=	mmx sse tests
+PKG_SUGGESTED_OPTIONS+=	# blank
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmmx)
+CONFIGURE_ARGS+=	--enable-mmx
+.endif
+
+.if !empty(PKG_OPTIONS:Msse)
+CONFIGURE_ARGS+=	--enable-sse
+.endif
+
+.if !empty(PKG_OPTIONS:Mtests)
+.include "../../textproc/libxml2/buildlink3.mk"
+CFLAGS+=	-I${BUILDLINK_PREFIX.libxml2}/include/libxml2
+.include "../../math/fftw/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.endif
diff --git a/comms/spandsp/patches/patch-aa b/comms/spandsp/patches/patch-aa
index c6f3f7864b5..a99f63e7b69 100644
--- a/comms/spandsp/patches/patch-aa
+++ b/comms/spandsp/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/02/06 08:32:06 jnemeth Exp $
+$NetBSD: patch-aa,v 1.2 2013/06/09 22:36:12 rodent Exp $
+
+Fix portability failure.
 
 --- configure.orig	2011-02-06 01:41:29.000000000 +0000
 +++ configure
diff --git a/comms/spandsp/patches/patch-ab b/comms/spandsp/patches/patch-ab
index d97892939f4..7de4f891cf9 100644
--- a/comms/spandsp/patches/patch-ab
+++ b/comms/spandsp/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/02/06 08:32:06 jnemeth Exp $
+$NetBSD: patch-ab,v 1.2 2013/06/09 22:36:12 rodent Exp $
+
+Fix portability failure.
 
 --- unpack_gsm0610_data.sh.orig	2010-07-24 16:28:33.000000000 +0000
 +++ unpack_gsm0610_data.sh