diff options
19 files changed, 117 insertions, 25 deletions
diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile index 923a264b13ac..648afcbc3468 100644 --- a/comms/spandsp-devel/Makefile +++ b/comms/spandsp-devel/Makefile @@ -31,8 +31,8 @@ INSTALLS_SHLIB= yes post-patch: @${FIND} ${WRKSRC} -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' -.if ${OSVERSION} < 503000 - ${TOUCH} ${WRKSRC}/src/tgmath.h -.endif +.if ${OSVERSION} < 503000 + ${ECHO} '#define lrintf(x) ((int16_t)rintf(x))' > ${WRKSRC}/src/tgmath.h +.endif .include <bsd.port.post.mk> diff --git a/comms/spandsp-devel/files/patch-src-Makefile.in b/comms/spandsp-devel/files/patch-src-Makefile.in index b8f1b7b09c03..de339f157d18 100644 --- a/comms/spandsp-devel/files/patch-src-Makefile.in +++ b/comms/spandsp-devel/files/patch-src-Makefile.in @@ -3,9 +3,12 @@ $FreeBSD$ --- src/Makefile.in.orig +++ src/Makefile.in -@@ -197,7 +197,7 @@ +@@ -195,9 +195,9 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ target_alias = @target_alias@ - AM_CFLAGS = -std=c99 +-AM_CFLAGS = -std=c99 ++#AM_CFLAGS = -std=c99 MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_builddir) +#INCLUDES = -I$(top_builddir) diff --git a/comms/spandsp-devel/files/patch-src::t31.c b/comms/spandsp-devel/files/patch-src::t31.c new file mode 100644 index 000000000000..ba190efb6216 --- /dev/null +++ b/comms/spandsp-devel/files/patch-src::t31.c @@ -0,0 +1,21 @@ + +$FreeBSD$ + +--- src/t31.c ++++ src/t31.c +@@ -81,14 +81,7 @@ + .pulse_dial = FALSE, + .double_escape = FALSE, + .adaptive_receive = FALSE, +- .s_regs[0] = 0, +- .s_regs[3] = '\r', +- .s_regs[4] = '\n', +- .s_regs[5] = '\b', +- .s_regs[6] = 1, +- .s_regs[7] = 60, +- .s_regs[8] = 5, +- .s_regs[10] = 0 ++ .s_regs = { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0, 0 } + } + }; + diff --git a/comms/spandsp-devel5/Makefile b/comms/spandsp-devel5/Makefile index 923a264b13ac..648afcbc3468 100644 --- a/comms/spandsp-devel5/Makefile +++ b/comms/spandsp-devel5/Makefile @@ -31,8 +31,8 @@ INSTALLS_SHLIB= yes post-patch: @${FIND} ${WRKSRC} -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' -.if ${OSVERSION} < 503000 - ${TOUCH} ${WRKSRC}/src/tgmath.h -.endif +.if ${OSVERSION} < 503000 + ${ECHO} '#define lrintf(x) ((int16_t)rintf(x))' > ${WRKSRC}/src/tgmath.h +.endif .include <bsd.port.post.mk> diff --git a/comms/spandsp-devel5/files/patch-src-Makefile.in b/comms/spandsp-devel5/files/patch-src-Makefile.in index b8f1b7b09c03..de339f157d18 100644 --- a/comms/spandsp-devel5/files/patch-src-Makefile.in +++ b/comms/spandsp-devel5/files/patch-src-Makefile.in @@ -3,9 +3,12 @@ $FreeBSD$ --- src/Makefile.in.orig +++ src/Makefile.in -@@ -197,7 +197,7 @@ +@@ -195,9 +195,9 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ target_alias = @target_alias@ - AM_CFLAGS = -std=c99 +-AM_CFLAGS = -std=c99 ++#AM_CFLAGS = -std=c99 MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_builddir) +#INCLUDES = -I$(top_builddir) diff --git a/comms/spandsp-devel5/files/patch-src::t31.c b/comms/spandsp-devel5/files/patch-src::t31.c new file mode 100644 index 000000000000..ba190efb6216 --- /dev/null +++ b/comms/spandsp-devel5/files/patch-src::t31.c @@ -0,0 +1,21 @@ + +$FreeBSD$ + +--- src/t31.c ++++ src/t31.c +@@ -81,14 +81,7 @@ + .pulse_dial = FALSE, + .double_escape = FALSE, + .adaptive_receive = FALSE, +- .s_regs[0] = 0, +- .s_regs[3] = '\r', +- .s_regs[4] = '\n', +- .s_regs[5] = '\b', +- .s_regs[6] = 1, +- .s_regs[7] = 60, +- .s_regs[8] = 5, +- .s_regs[10] = 0 ++ .s_regs = { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0, 0 } + } + }; + diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile index 923a264b13ac..648afcbc3468 100644 --- a/comms/spandsp/Makefile +++ b/comms/spandsp/Makefile @@ -31,8 +31,8 @@ INSTALLS_SHLIB= yes post-patch: @${FIND} ${WRKSRC} -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' -.if ${OSVERSION} < 503000 - ${TOUCH} ${WRKSRC}/src/tgmath.h -.endif +.if ${OSVERSION} < 503000 + ${ECHO} '#define lrintf(x) ((int16_t)rintf(x))' > ${WRKSRC}/src/tgmath.h +.endif .include <bsd.port.post.mk> diff --git a/comms/spandsp/files/patch-src-Makefile.in b/comms/spandsp/files/patch-src-Makefile.in index b8f1b7b09c03..de339f157d18 100644 --- a/comms/spandsp/files/patch-src-Makefile.in +++ b/comms/spandsp/files/patch-src-Makefile.in @@ -3,9 +3,12 @@ $FreeBSD$ --- src/Makefile.in.orig +++ src/Makefile.in -@@ -197,7 +197,7 @@ +@@ -195,9 +195,9 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ target_alias = @target_alias@ - AM_CFLAGS = -std=c99 +-AM_CFLAGS = -std=c99 ++#AM_CFLAGS = -std=c99 MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_builddir) +#INCLUDES = -I$(top_builddir) diff --git a/comms/spandsp/files/patch-src::t31.c b/comms/spandsp/files/patch-src::t31.c new file mode 100644 index 000000000000..ba190efb6216 --- /dev/null +++ b/comms/spandsp/files/patch-src::t31.c @@ -0,0 +1,21 @@ + +$FreeBSD$ + +--- src/t31.c ++++ src/t31.c +@@ -81,14 +81,7 @@ + .pulse_dial = FALSE, + .double_escape = FALSE, + .adaptive_receive = FALSE, +- .s_regs[0] = 0, +- .s_regs[3] = '\r', +- .s_regs[4] = '\n', +- .s_regs[5] = '\b', +- .s_regs[6] = 1, +- .s_regs[7] = 60, +- .s_regs[8] = 5, +- .s_regs[10] = 0 ++ .s_regs = { 0, 0, 0, '\r', '\n', '\b', 1, 60, 5, 0, 0 } + } + }; + diff --git a/net/asterisk/files/patch-apps::app_rxfax.c b/net/asterisk/files/patch-apps::app_rxfax.c index d294ecdfd5e2..cabfb1a98604 100644 --- a/net/asterisk/files/patch-apps::app_rxfax.c +++ b/net/asterisk/files/patch-apps::app_rxfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_rxfax.c.orig +++ apps/app_rxfax.c -@@ -0,0 +1,391 @@ +@@ -0,0 +1,393 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk/files/patch-apps::app_txfax.c b/net/asterisk/files/patch-apps::app_txfax.c index 0a3a1d5d52ac..8d81a55ae13c 100644 --- a/net/asterisk/files/patch-apps::app_txfax.c +++ b/net/asterisk/files/patch-apps::app_txfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_txfax.c.orig +++ apps/app_txfax.c -@@ -0,0 +1,318 @@ +@@ -0,0 +1,320 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk10/files/patch-apps::app_rxfax.c b/net/asterisk10/files/patch-apps::app_rxfax.c index d294ecdfd5e2..cabfb1a98604 100644 --- a/net/asterisk10/files/patch-apps::app_rxfax.c +++ b/net/asterisk10/files/patch-apps::app_rxfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_rxfax.c.orig +++ apps/app_rxfax.c -@@ -0,0 +1,391 @@ +@@ -0,0 +1,393 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk10/files/patch-apps::app_txfax.c b/net/asterisk10/files/patch-apps::app_txfax.c index 0a3a1d5d52ac..8d81a55ae13c 100644 --- a/net/asterisk10/files/patch-apps::app_txfax.c +++ b/net/asterisk10/files/patch-apps::app_txfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_txfax.c.orig +++ apps/app_txfax.c -@@ -0,0 +1,318 @@ +@@ -0,0 +1,320 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk12/files/patch-apps::app_rxfax.c b/net/asterisk12/files/patch-apps::app_rxfax.c index d294ecdfd5e2..cabfb1a98604 100644 --- a/net/asterisk12/files/patch-apps::app_rxfax.c +++ b/net/asterisk12/files/patch-apps::app_rxfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_rxfax.c.orig +++ apps/app_rxfax.c -@@ -0,0 +1,391 @@ +@@ -0,0 +1,393 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk12/files/patch-apps::app_txfax.c b/net/asterisk12/files/patch-apps::app_txfax.c index 0a3a1d5d52ac..8d81a55ae13c 100644 --- a/net/asterisk12/files/patch-apps::app_txfax.c +++ b/net/asterisk12/files/patch-apps::app_txfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_txfax.c.orig +++ apps/app_txfax.c -@@ -0,0 +1,318 @@ +@@ -0,0 +1,320 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk14/files/patch-apps::app_rxfax.c b/net/asterisk14/files/patch-apps::app_rxfax.c index d294ecdfd5e2..cabfb1a98604 100644 --- a/net/asterisk14/files/patch-apps::app_rxfax.c +++ b/net/asterisk14/files/patch-apps::app_rxfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_rxfax.c.orig +++ apps/app_rxfax.c -@@ -0,0 +1,391 @@ +@@ -0,0 +1,393 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk14/files/patch-apps::app_txfax.c b/net/asterisk14/files/patch-apps::app_txfax.c index 0a3a1d5d52ac..8d81a55ae13c 100644 --- a/net/asterisk14/files/patch-apps::app_txfax.c +++ b/net/asterisk14/files/patch-apps::app_txfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_txfax.c.orig +++ apps/app_txfax.c -@@ -0,0 +1,318 @@ +@@ -0,0 +1,320 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk16/files/patch-apps::app_rxfax.c b/net/asterisk16/files/patch-apps::app_rxfax.c index d294ecdfd5e2..cabfb1a98604 100644 --- a/net/asterisk16/files/patch-apps::app_rxfax.c +++ b/net/asterisk16/files/patch-apps::app_rxfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_rxfax.c.orig +++ apps/app_rxfax.c -@@ -0,0 +1,391 @@ +@@ -0,0 +1,393 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> diff --git a/net/asterisk16/files/patch-apps::app_txfax.c b/net/asterisk16/files/patch-apps::app_txfax.c index 0a3a1d5d52ac..8d81a55ae13c 100644 --- a/net/asterisk16/files/patch-apps::app_txfax.c +++ b/net/asterisk16/files/patch-apps::app_txfax.c @@ -3,7 +3,7 @@ $FreeBSD$ --- apps/app_txfax.c.orig +++ apps/app_txfax.c -@@ -0,0 +1,318 @@ +@@ -0,0 +1,320 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * @@ -27,7 +27,9 @@ $FreeBSD$ +#endif +#include <pthread.h> +#include <errno.h> ++#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 +#include <tgmath.h> ++#endif +#include <tiffio.h> + +#include <spandsp.h> |