4 files changed, 19 insertions, 64 deletions

diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index dceacbc31fb0..4dda0546c34d 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	belle-sip
-PORTVERSION=	1.5.0
-PORTREVISION=	4
+PORTVERSION=	1.6.3
 CATEGORIES=	net java
-MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
+MASTER_SITES=	https://www.linphone.org/releases/sources/belle-sip/ \
 		http://www.antlr3.org/download/:source2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		antlr-3.4-complete.jar:source2
@@ -13,7 +12,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Belle-sip is a SIP (RFC3261) implementation written in C
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=		fails to build: Exception in thread "main" java.lang.OutOfMemoryError: Java heap space
@@ -21,23 +20,20 @@ BROKEN_aarch64=		fails to build: Exception in thread "main" java.lang.OutOfMemor
 LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
 		libbctoolbox.so:net/bctoolbox
 
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-strict --disable-tests \
-		--with-antlr=${LOCALBASE}
-INSTALL_TARGET=	install-strip
-USES=		compiler:c11 gmake libtool pathfix pkgconfig
+USES=		cmake
 USE_JAVA=	yes
+USE_LDCONFIG=	yes
+
+CMAKE_ARGS=	-DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TESTS=NO \
+		-DANTLR3_JAR_PATH:FILEPATH=${WRKDIR}/antlr3.jar
 JAVA_BUILD=	jre
 JAVA_VERSION=	1.6+
-USE_LDCONFIG=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}-0
 
 post-extract:
-	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar
+	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%WRKDIR%%|${WRKDIR}|' -e 's|-lrt||' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} '/clock_gettime/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/net/belle-sip/distinfo b/net/belle-sip/distinfo
index a7aad5d72509..dbadde2f8d91 100644
--- a/net/belle-sip/distinfo
+++ b/net/belle-sip/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1476371157
-SHA256 (belle-sip-1.5.0.tar.gz) = 4bc44ee83f8455fb6248d3b3045c38ab6e71e6699cde3f0cc5d67493bb38a43a
-SIZE (belle-sip-1.5.0.tar.gz) = 756785
+TIMESTAMP = 1506002640
+SHA256 (belle-sip-1.6.3.tar.gz) = 3f3807078b177e50a5ed97aaf8d7f6e77532df3205153e1b2957f557df9ba568
+SIZE (belle-sip-1.6.3.tar.gz) = 610200
 SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
 SIZE (antlr-3.4-complete.jar) = 2388361
diff --git a/net/belle-sip/files/patch-configure b/net/belle-sip/files/patch-configure
deleted file mode 100644
index 23888e984985..000000000000
--- a/net/belle-sip/files/patch-configure
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.orig	2015-11-02 13:36:49 UTC
-+++ configure
-@@ -16787,10 +16787,10 @@ libresolv_have_res_get_servers=no
- resolv_h_hav_res_ndestroy=no
- LIBS_save=$LIBS
- 
--LIBS="$LIBS -lresolv"
- 
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <netinet/in.h>
- #include <resolv.h>
- int
- main ()
-@@ -16814,7 +16814,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- 
--ac_fn_c_check_decl "$LINENO" "res_ndestroy" "ac_cv_have_decl_res_ndestroy" "#include <resolv.h>
-+ac_fn_c_check_decl "$LINENO" "res_ndestroy" "ac_cv_have_decl_res_ndestroy" "#include <netinet/in.h>
-+#include <resolv.h>
- "
- if test "x$ac_cv_have_decl_res_ndestroy" = xyes; then :
-   resolv_h_hav_res_ndestroy=yes
-@@ -16877,17 +16878,11 @@ fi
- 
- 
- if test $ANTLR = "no" ; then
--antlr_java_prefixes="$antlr_prefix/share/java /usr/local/share/java /usr/share/java /opt/local/share/java"
-+antlr_java_prefixes="%%WRKDIR%%"
- 
- 	for antlr_java_prefix in $antlr_java_prefixes
- 	do
--		antlr_jar=$antlr_java_prefix/antlr.jar
--		if test -f $antlr_jar ; then
--			break
--		else
--			antlr_jar=no
--		fi
--		antlr_jar=$antlr_java_prefix/antlr3.jar
-+		antlr_jar=$antlr_java_prefix/antlr-complete.jar
- 		if test -f $antlr_jar ; then
- 			break
- 		else
diff --git a/net/belle-sip/pkg-plist b/net/belle-sip/pkg-plist
index e00d8f5519bb..edce3a9205d7 100644
--- a/net/belle-sip/pkg-plist
+++ b/net/belle-sip/pkg-plist
@@ -25,8 +25,11 @@ include/belle-sip/sipstack.h
 include/belle-sip/transaction.h
 include/belle-sip/types.h
 include/belle-sip/utils.h
-lib/libbellesip.a
+include/belle-sip/wakelock.h
 lib/libbellesip.so
 lib/libbellesip.so.0
-lib/libbellesip.so.0.0.0
 libdata/pkgconfig/belle-sip.pc
+share/BelleSIP/cmake/BelleSIPConfig.cmake
+share/BelleSIP/cmake/BelleSIPConfigVersion.cmake
+share/BelleSIP/cmake/BelleSIPTargets-%%CMAKE_BUILD_TYPE%%.cmake
+share/BelleSIP/cmake/BelleSIPTargets.cmake