5 files changed, 33 insertions, 177 deletions

diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile
index 1b954fbd4d0e..f97f501de94b 100644
--- a/comms/spandsp-devel/Makefile
+++ b/comms/spandsp-devel/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	spandsp-devel
-# Date created:		2007-01-13
-# Whom:			Joe Holden <joe@joeholden.co.uk>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	spandsp
-DISTVERSION=	0.0.6pre17
+DISTVERSION=	0.0.6pre21
 CATEGORIES=	comms
 MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/ \
 		http://www.soft-switch.org/downloads/spandsp/old/
@@ -19,8 +14,9 @@ COMMENT=	A DSP library and software FAX machine
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 WRKSRC=		${WRKDIR}/spandsp-${DISTVERSION:C/pre.*//}
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	libtool autoconf
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -31,22 +27,23 @@ USE_LDCONFIG=	yes
 
 CONFLICTS=	spandsp-[0-9]*
 
-.ifndef(WITH_DOXYGEN)
-NOPORTDOCS=	yes
-CONFIGURE_ARGS+=--disable-doc
-.else
+OPTIONS_DEFINE=	DOXYGEN
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOXYGEN}
 CONFIGURE_ARGS+=--enable-doc
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PORTDOCS=	*
+.else
+CONFIGURE_ARGS+=--disable-doc
 .endif
 
-post-configure:
-	${REINPLACE_CMD} -e 's/\/pkgconfig/data\/pkgconfig/' ${WRKSRC}/Makefile
-
 post-install:
 .if defined(WITH_DOXYGEN)
 	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR} "-type d -or -mindepth 1")
-PORTDOCS=	*
+	(cd ${WRKSRC}/doc && \
+		${COPYTREE_SHARE} \* ${DOCSDIR} "-type d -or -mindepth 1")
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/spandsp-devel/distinfo b/comms/spandsp-devel/distinfo
index 100f42c8794f..4e5d57c1d90b 100644
--- a/comms/spandsp-devel/distinfo
+++ b/comms/spandsp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spandsp-0.0.6pre17.tgz) = 6c7267c9a5de7dc72ad323c10bc6524621df5041912ebf48e62907e3ae44d8f2
-SIZE (spandsp-0.0.6pre17.tgz) = 2597301
+SHA256 (spandsp-0.0.6pre21.tgz) = bd152152bf0b204661ab9439c5a649098bcb8cefebcbfa959dd602442739aa50
+SIZE (spandsp-0.0.6pre21.tgz) = 3278758
diff --git a/comms/spandsp-devel/files/patch-configure b/comms/spandsp-devel/files/patch-configure
deleted file mode 100644
index 8ce967573fa5..000000000000
--- a/comms/spandsp-devel/files/patch-configure
+++ /dev/null
@@ -1,159 +0,0 @@
---- configure.orig	2012-05-30 23:37:25.000000000 -0500
-+++ configure	2012-05-30 23:38:24.000000000 -0500
-@@ -24814,156 +24814,6 @@
- done
- 
- 
--for ac_header in tgmath.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-- INSERT_TGMATH_HEADER="#include <tgmath.h>"
--fi
--
--done
--
--
- for ac_header in math.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/comms/spandsp-devel/files/patch-configure.ac b/comms/spandsp-devel/files/patch-configure.ac
new file mode 100644
index 000000000000..25ff48714358
--- /dev/null
+++ b/comms/spandsp-devel/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2012-09-01 12:05:10.795461874 +0100
++++ configure.ac	2012-09-01 12:05:47.473457036 +0100
+@@ -194,7 +194,6 @@
+ AC_CHECK_HEADERS([string.h])
+ AC_CHECK_HEADERS([strings.h])
+ AC_CHECK_HEADERS([malloc.h])
+-AC_CHECK_HEADERS([tgmath.h], [INSERT_TGMATH_HEADER="#include <tgmath.h>"])
+ AC_CHECK_HEADERS([math.h], [INSERT_MATH_HEADER="#include <math.h>"])
+ AC_CHECK_HEADERS([float.h])
+ AC_CHECK_HEADERS([fcntl.h])
diff --git a/comms/spandsp-devel/pkg-plist b/comms/spandsp-devel/pkg-plist
index 2c1359698ad8..fbfddd6f8a9c 100644
--- a/comms/spandsp-devel/pkg-plist
+++ b/comms/spandsp-devel/pkg-plist
@@ -31,6 +31,7 @@ include/spandsp/g726.h
 include/spandsp/gsm0610.h
 include/spandsp/hdlc.h
 include/spandsp/ima_adpcm.h
+include/spandsp/image_translate.h
 include/spandsp/logging.h
 include/spandsp/lpc10.h
 include/spandsp/modem_connect_tones.h
@@ -58,6 +59,7 @@ include/spandsp/private/g726.h
 include/spandsp/private/gsm0610.h
 include/spandsp/private/hdlc.h
 include/spandsp/private/ima_adpcm.h
+include/spandsp/private/image_translate.h
 include/spandsp/private/logging.h
 include/spandsp/private/lpc10.h
 include/spandsp/private/modem_connect_tones.h
@@ -79,8 +81,11 @@ include/spandsp/private/t38_gateway.h
 include/spandsp/private/t38_non_ecm_buffer.h
 include/spandsp/private/t38_terminal.h
 include/spandsp/private/t4_rx.h
+include/spandsp/private/t4_t6_decode.h
+include/spandsp/private/t4_t6_encode.h
 include/spandsp/private/t4_tx.h
 include/spandsp/private/time_scale.h
+include/spandsp/private/timezone.h
 include/spandsp/private/tone_detect.h
 include/spandsp/private/tone_generate.h
 include/spandsp/private/v17rx.h
@@ -113,9 +118,12 @@ include/spandsp/t38_gateway.h
 include/spandsp/t38_non_ecm_buffer.h
 include/spandsp/t38_terminal.h
 include/spandsp/t4_rx.h
+include/spandsp/t4_t6_decode.h
+include/spandsp/t4_t6_encode.h
 include/spandsp/t4_tx.h
 include/spandsp/telephony.h
 include/spandsp/time_scale.h
+include/spandsp/timezone.h
 include/spandsp/timing.h
 include/spandsp/tone_detect.h
 include/spandsp/tone_generate.h