diff --git a/comms/gstreamer1-plugins-spandsp/Makefile b/comms/gstreamer1-plugins-spandsp/Makefile index cc82fd04ac9f..8ab43117c1a0 100644 --- a/comms/gstreamer1-plugins-spandsp/Makefile +++ b/comms/gstreamer1-plugins-spandsp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= comms COMMENT= Gstreamer DSP library and software FAX machine plugin diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile index af68bf3a9766..2179bf3dbbb5 100644 --- a/comms/spandsp-devel/Makefile +++ b/comms/spandsp-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= spandsp DISTVERSION= 0.0.6pre21 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ PKGNAMESUFFIX= -devel @@ -15,11 +15,10 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff WRKSRC= ${WRKDIR}/spandsp-${DISTVERSION:C/pre.*//} -USES= gmake libtool pathfix tar:tgz -USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes -CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -C +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gmake libtool pathfix tar:tgz USE_LDCONFIG= yes INSTALL_TARGET= install-strip @@ -40,6 +39,9 @@ USE_GNOME+= libxslt CONFIGURE_ARGS+=--disable-doc .endif +post-patch: + @${REINPLACE_CMD} 's/tgmath\.h//' ${WRKSRC}/configure + post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/comms/spandsp-devel/files/patch-configure.ac b/comms/spandsp-devel/files/patch-configure.ac deleted file mode 100644 index 25ff48714358..000000000000 --- a/comms/spandsp-devel/files/patch-configure.ac +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 "]) - AC_CHECK_HEADERS([math.h], [INSERT_MATH_HEADER="#include "]) - 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 8a90d095d292..5f4fb2bfe2b5 100644 --- a/comms/spandsp-devel/pkg-plist +++ b/comms/spandsp-devel/pkg-plist @@ -143,6 +143,7 @@ include/spandsp/vector_int.h include/spandsp/version.h lib/libspandsp.a lib/libspandsp.so +lib/libspandsp.so.2 lib/libspandsp.so.2.0.0 libdata/pkgconfig/spandsp.pc @dirrm include/spandsp/private diff --git a/misc/libsupertone/Makefile b/misc/libsupertone/Makefile index df3604bc7c05..ef6c40b2ba49 100644 --- a/misc/libsupertone/Makefile +++ b/misc/libsupertone/Makefile @@ -3,7 +3,7 @@ PORTNAME= libsupertone PORTVERSION= 0.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= http://www.soft-switch.org/downloads/unicall/ @@ -13,7 +13,7 @@ COMMENT= Library for supervisory tone generation and detection LICENSE= LGPL21 LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile \ - libspandsp.so.2.0.0:${PORTSDIR}/comms/spandsp-devel \ + libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel \ libtiff.so:${PORTSDIR}/graphics/tiff \ libxml2.so:${PORTSDIR}/textproc/libxml2 diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 0887d33e1090..d66119e53e23 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -3,7 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.30.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -104,7 +104,7 @@ CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2.0.0:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile index 688aa6a87614..866087452965 100644 --- a/net/asterisk11/Makefile +++ b/net/asterisk11/Makefile @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.12.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -98,7 +98,7 @@ CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2.0.0:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile index 18e8192933ae..23a43c6f7b82 100644 --- a/net/mediastreamer/Makefile +++ b/net/mediastreamer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mediastreamer PORTVERSION= 2.10.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= SAVANNAH/linphone/mediastreamer @@ -57,7 +57,7 @@ OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus SPANDSP_CONFIGURE_ENABLE= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2.0.0:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel SPEEX_CONFIGURE_ENABLE= speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex diff --git a/net/opal/Makefile b/net/opal/Makefile index 21f727b73480..3896d557b0b5 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -3,7 +3,7 @@ PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= GNOME @@ -211,7 +211,7 @@ CONFIGURE_ARGS+= --disable-h281 # keep version in lib_depend, to see the difference between spandsp-devel and normal .if ${PORT_OPTIONS:MFAX} -LIB_DEPENDS+= libspandsp.so.2.0.0:${PORTSDIR}/comms/spandsp-devel +LIB_DEPENDS+= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38 PLIST_SUB+= FAX="" .else diff --git a/net/yate/Makefile b/net/yate/Makefile index 86d9610f68f4..259cbc68031b 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -3,7 +3,7 @@ PORTNAME= yate DISTVERSION= 5.4.0p1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://yate.null.ro/tarballs/yate5/ DISTNAME= ${PORTNAME}-5.4.0-1 @@ -105,7 +105,7 @@ PLIST_SUB+= WITH_AMRNB="@comment " .endif .if ${PORT_OPTIONS:MSPANDSP} -LIB_DEPENDS+= libspandsp.so.2.0.0:${PORTSDIR}/comms/spandsp-devel +LIB_DEPENDS+= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel CONFIGURE_ARGS+= --with-spandsp PLIST_SUB+= WITH_SPANDSP="" .else