Index: head/net/asterisk-chan_sccp/Makefile =================================================================== --- head/net/asterisk-chan_sccp/Makefile (revision 553384) +++ head/net/asterisk-chan_sccp/Makefile (revision 553385) @@ -1,67 +1,72 @@ # Created by: Diederik de Groot # $FreeBSD$ PORTNAME= chan_sccp DISTVERSIONPREFIX= v DISTVERSION= 4.3.2 -DISTVERSIONSUFFIX= -epsilon -PORTREVISION= 3 +DISTVERSIONSUFFIX= -zeta +PORTREVISION= 4 CATEGORIES= net PKGNAMEPREFIX= asterisk- MAINTAINER= ddegroot@talon.nl COMMENT= Replacement for the SCCP channel driver in Asterisk LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/COPYING -FLAVORS= asterisk16 asterisk13 +FLAVORS= asterisk16 asterisk18 asterisk13 FLAVOR?= ${FLAVORS:[1]} -USES= autoreconf compiler:c11 gettext-tools iconv libtool localbase +USES= autoreconf compiler:c11 gettext-tools iconv libtool localbase USE_GITHUB= yes GH_ACCOUNT= chan-sccp GH_PROJECT= chan-sccp GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-advanced-functions \ --with-hash-size=3001 \ ${ICONV_CONFIGURE_ARG} INSTALL_TARGET= install-strip CPPFLAGS+= -I${ICONV_INCLUDE_PATH} LDFLAGS+= -L${LOCALBASE}/lib \ ${ICONV_LIB} PLIST_FILES= etc/asterisk/sccp.conf.annotated \ "@sample etc/asterisk/sccp.conf.sample" \ lib/asterisk/modules/chan_sccp.so \ share/asterisk/documentation/thirdparty/chan_sccp-en_US.xml asterisk13_PKGNAMEPREFIX= asterisk13- -asterisk13_CONFLICTS_INSTALL= asterisk16-chan_sccp +asterisk13_CONFLICTS_INSTALL= asterisk16-chan_sccp asterisk18-chan_sccp asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_CONFLICTS_INSTALL= asterisk13-chan_sccp +asterisk16_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk18-chan_sccp asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 + +asterisk18_PKGNAMEPREFIX= asterisk18- +asterisk18_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk16-chan_sccp +asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 +asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 OPTIONS_DEFINE= CONFERENCE VIDEO OPTIONS_DEFAULT= CONFERENCE VIDEO CONFERENCE_DESC= Enable Conference Support VIDEO_DESC= Enable Video Support CONFERENCE_CONFIGURE_ENABLE= conference VIDEO_CONFIGURE_ENABLE= video post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/asterisk ${INSTALL_DATA} ${WRKSRC}/conf/sccp.conf \ ${STAGEDIR}${PREFIX}/etc/asterisk/sccp.conf.sample ${INSTALL_DATA} ${WRKSRC}/conf/sccp.conf.annotated \ ${STAGEDIR}${PREFIX}/etc/asterisk .include Index: head/net/asterisk-chan_sccp/distinfo =================================================================== --- head/net/asterisk-chan_sccp/distinfo (revision 553384) +++ head/net/asterisk-chan_sccp/distinfo (revision 553385) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574625072 -SHA256 (chan-sccp-chan-sccp-v4.3.2-epsilon_GH0.tar.gz) = 9a3cc7ac5b6e917c6a6b326212b0d144ae0042dae07bb85cb0e719944e1ee572 -SIZE (chan-sccp-chan-sccp-v4.3.2-epsilon_GH0.tar.gz) = 1999074 +TIMESTAMP = 1603703805 +SHA256 (chan-sccp-chan-sccp-v4.3.2-zeta_GH0.tar.gz) = 38c7cd27dba771c54842348bf11c9e97353d392c3a0f008fd6f5eafe7f35958d +SIZE (chan-sccp-chan-sccp-v4.3.2-zeta_GH0.tar.gz) = 1672351 Index: head/net/asterisk-chan_sccp/files/patch-a61c6d2cec =================================================================== --- head/net/asterisk-chan_sccp/files/patch-a61c6d2cec (nonexistent) +++ head/net/asterisk-chan_sccp/files/patch-a61c6d2cec (revision 553385) @@ -0,0 +1,102 @@ +From a61c6d2cecdd149db767307cd71b736e77913251 Mon Sep 17 00:00:00 2001 +From: Diederik de Groot +Date: Mon, 26 Oct 2020 18:11:16 +0100 +Subject: [PATCH] Fix: compilation on FreeBSD + +Signed-off-by: Diederik de Groot +--- + autoconf/extra.m4 | 2 +- + configure | 2 +- + src/Makefile.am | 3 +++ + src/Makefile.in | 3 +++ + src/common.h | 9 +++++++++ + src/define.h | 2 -- + 6 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/autoconf/extra.m4 b/autoconf/extra.m4 +index 9a9f2c6a8..abb97e8be 100644 +--- autoconf/extra.m4 ++++ autoconf/extra.m4 +@@ -253,7 +253,7 @@ dnl ]) + AC_CHECK_FUNCS([gethostbyname inet_ntoa mkdir]) + AC_HEADER_STDC + AC_HEADER_STDBOOL +- AC_CHECK_HEADERS([netinet/in.h fcntl.h sys/signal.h stdio.h errno.h ctype.h assert.h sys/sysinfo.h]) ++ AC_CHECK_HEADERS([netinet/in.h fcntl.h signal.h sys/signal.h stdio.h errno.h ctype.h assert.h sys/sysinfo.h]) + AC_STRUCT_TM + AC_STRUCT_TIMEZONE + CS_WITH_LIBSSL +diff --git a/configure b/configure +index 38dfabc8e..ba3af8e21 100755 +--- configure ++++ configure +@@ -23944,7 +23944,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h + + fi + +- for ac_header in netinet/in.h fcntl.h sys/signal.h stdio.h errno.h ctype.h assert.h sys/sysinfo.h ++ for ac_header in netinet/in.h fcntl.h signal.h sys/signal.h stdio.h errno.h ctype.h assert.h sys/sysinfo.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +diff --git a/src/Makefile.am b/src/Makefile.am +index 7c305b46c..495a3772a 100644 +--- src/Makefile.am ++++ src/Makefile.am +@@ -13,6 +13,9 @@ EXTRA_DIST = sccp_enum.in sccp_config_entries.hh + BUILT_SOURCES = revision.h sccp_enum.h sccp_enum.c + CLEANFILES = revision.h sccp_enum.h sccp_enum.c stamp-g1 + .PHONY: force ++ ++force: ++ + # generated files + revision.gen: + @echo " REV revision.h"; +diff --git a/src/Makefile.in b/src/Makefile.in +index d3f42fdbf..0cc248ade 100644 +--- src/Makefile.in ++++ src/Makefile.in +@@ -1461,6 +1461,9 @@ uninstall-am: uninstall-csmodLTLIBRARIES + .PRECIOUS: Makefile + + .PHONY: force ++ ++force: ++ + # generated files + revision.gen: + @echo " REV revision.h"; +diff --git a/src/common.h b/src/common.h +index 2b70ba3e2..10b5d4943 100644 +--- src/common.h ++++ src/common.h +@@ -39,6 +39,15 @@ + #if HAVE_STDBOOL_H + #include + #endif ++#if HAVE_SIGNAL_H ++#include ++#endif ++#if HAVE_PTHREAD_H ++#include ++#endif ++#if HAVE_SYS_STAT_H ++#include ++#endif + + #include "define.h" + #include "forward_declarations.h" +diff --git a/src/define.h b/src/define.h +index 6f277ef10..423674fc6 100644 +--- src/define.h ++++ src/define.h +@@ -17,8 +17,6 @@ + + #pragma once + #include "config.h" +-#include +- + /*! + * \note most of these should be moved to autoconf/asterisk.m4 and be defined in config.h + */ Property changes on: head/net/asterisk-chan_sccp/files/patch-a61c6d2cec ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/asterisk-chan_sccp/files/patch-src_define.h =================================================================== --- head/net/asterisk-chan_sccp/files/patch-src_define.h (revision 553384) +++ head/net/asterisk-chan_sccp/files/patch-src_define.h (revision 553385) @@ -1,17 +1,17 @@ ---- src/define.h.orig 2020-02-04 11:13:32 UTC +--- src/define.h.orig 2020-10-24 14:42:40 UTC +++ src/define.h -@@ -103,10 +103,10 @@ SCCP_LINE unsigned long long __bswap_64(unsigned long - #define htolel(x) (x) - #define htoles(x) (x) - #else --#define letohs(x) __bswap_16(x) --#define htoles(x) __bswap_16(x) --#define letohl(x) __bswap_32(x) --#define htolel(x) __bswap_32(x) -+#define letohs(x) bswap16(x) -+#define htoles(x) bswap16(x) -+#define letohl(x) bswap32(x) -+#define htolel(x) bswap32(x) +@@ -98,10 +98,10 @@ SCCP_LINE unsigned long long ___bswap_64(unsigned long + # define htolel(x) (uint16_t)(x) + # define htoles(x) (uint16_t)(x) + # else +-# define letohs(x) ___bswap_16(x) +-# define htoles(x) ___bswap_16(x) +-# define letohl(x) ___bswap_32(x) +-# define htolel(x) ___bswap_32(x) ++# define letohs(x) bswap16(x) ++# define htoles(x) bswap16(x) ++# define letohl(x) bswap32(x) ++# define htolel(x) bswap32(x) + # endif #endif - #define SCCP_TECHTYPE_STR "SCCP"