3 files changed, 17 insertions, 108 deletions

diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile
index ef1d39d5083b..057c9edae113 100644
--- a/net/asterisk-chan_sccp/Makefile
+++ b/net/asterisk-chan_sccp/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	chan_sccp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.2
-DISTVERSIONSUFFIX=	-zeta
-PORTREVISION=	4
+DISTVERSIONSUFFIX=	-eta
+PORTREVISION=	5
 CATEGORIES=	net
 PKGNAMEPREFIX=	asterisk-
 
@@ -18,7 +18,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 FLAVORS=	asterisk16 asterisk18 asterisk13
 FLAVOR?=	${FLAVORS:[1]}
 
-USES=           autoreconf compiler:c11 gettext-tools iconv libtool localbase
+LIB_DEPENDS=	libltdl.so:devel/libltdl
+
+USES=		autoreconf compiler:c11 gettext-tools iconv libtool \
+		localbase ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chan-sccp
@@ -62,6 +65,14 @@ VIDEO_DESC=			Enable Video Support
 CONFERENCE_CONFIGURE_ENABLE=	conference
 VIDEO_CONFIGURE_ENABLE=		video
 
+.if ${FLAVOR} == asterisk13
+CONFIGURE_ARGS+=		--with-asterisk-version=13
+.elif ${FLAVOR} == asterisk16
+CONFIGURE_ARGS+=		--with-asterisk-version=16
+.elif ${FLAVOR} == asterisk18
+CONFIGURE_ARGS+=		--with-asterisk-version=18
+.endif
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/asterisk
 	${INSTALL_DATA} ${WRKSRC}/conf/sccp.conf \
diff --git a/net/asterisk-chan_sccp/distinfo b/net/asterisk-chan_sccp/distinfo
index 112d24f934c4..e94269f49f3c 100644
--- a/net/asterisk-chan_sccp/distinfo
+++ b/net/asterisk-chan_sccp/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1605805369
+SHA256 (chan-sccp-chan-sccp-v4.3.2-eta_GH0.tar.gz) = 78aa27bbd4dc3fbb647d0c37736eca5434b6cc4cc736897c2577f5883f102836
+SIZE (chan-sccp-chan-sccp-v4.3.2-eta_GH0.tar.gz) = 1678306
diff --git a/net/asterisk-chan_sccp/files/patch-a61c6d2cec b/net/asterisk-chan_sccp/files/patch-a61c6d2cec
deleted file mode 100644
index 44200134b3f0..000000000000
--- a/net/asterisk-chan_sccp/files/patch-a61c6d2cec
+++ /dev/null
@@ -1,102 +0,0 @@
-From a61c6d2cecdd149db767307cd71b736e77913251 Mon Sep 17 00:00:00 2001
-From: Diederik de Groot <ddegroot@talon.nl>
-Date: Mon, 26 Oct 2020 18:11:16 +0100
-Subject: [PATCH] Fix: compilation on FreeBSD
-
-Signed-off-by: Diederik de Groot <ddegroot@talon.nl>
----
- 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 <stdbool.h>
- #endif
-+#if HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
-+#if HAVE_PTHREAD_H
-+#include <pthread.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#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 <pthread.h>
--
- /*!
-  * \note most of these should be moved to autoconf/asterisk.m4 and be defined in config.h
-  */