--- rtpproxy/Makefile   2015-08-24 00:54:31.000000000 +0800	
+++ rtpproxy/Makefile   2015-08-24 00:54:31.000000000 +0800	
@@ -1,19 +1,23 @@ 
-# Created by: sobomax
-# $FreeBSD: head/net/rtpproxy/Makefile 365277 2014-08-18 11:52:27Z wg $
+# Created by: Euan Thoms <euan@potensol.com>
+# $FreeBSD$
 
 PORTNAME=      rtpproxy
-PORTVERSION=   1.2.1
-PORTREVISION=  1
+PORTVERSION=   2.0.0
 CATEGORIES=    net
-MASTER_SITES=  http://www.rtpproxy.org/chrome/site/
+MASTER_SITES=  https://github.com/sippy/rtpproxy/archive/
+DISTNAME=      v${PORTVERSION}
 
-MAINTAINER=    ports@FreeBSD.org
-COMMENT=       High-performance RTP proxy server for the SIP Express Router (SER)
+MAINTAINER=    euan@potensol.com
+COMMENT=       High-performance RTP proxy server for the SIP Routers
 
 LICENSE=       BSD2CLAUSE
 
 LIB_DEPENDS=   libgsm.so:${PORTSDIR}/audio/gsm
 
+WRKSRC=                ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_RC_SUBR=   rtpproxy
+
 GNU_CONFIGURE= yes
 CPPFLAGS+=     -I${LOCALBASE}/include
 LIBS+=         -L${LOCALBASE}/lib
@@ -21,11 +25,4 @@ 
 USERS=         ${PORTNAME}
 GROUPS=                ${PORTNAME}
 
-post-build:
-       ${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%RC_SUBR%%|/etc/rc.subr|g' \
-           ${WRKSRC}/freebsd/rtpproxy.in > ${WRKDIR}/rtpproxy
-
-post-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/rtpproxy ${STAGEDIR}${PREFIX}/etc/rc.d/rtpproxy
-
 .include <bsd.port.mk>
--- rtpproxy/distinfo   2015-08-24 00:54:31.000000000 +0800	
+++ rtpproxy/distinfo   2015-08-24 00:54:31.000000000 +0800	
@@ -1,2 +1,2 @@ 
-SHA256 (rtpproxy-1.2.1.tar.gz) = aba667136420adfc6dbf6ff94a778e1e2484116ed13ea5196f3293d4d645df85
-SIZE (rtpproxy-1.2.1.tar.gz) = 203334
+SHA256 (v2.0.0.tar.gz) = b52bf2a302a8f08c269217e5d507f3c3ba38f4b627bb7029c8dac8ec268b23c6
+SIZE (v2.0.0.tar.gz) = 1091661
--- rtpproxy/files/patch-freebsd_rtpproxy.in    1970-01-01 07:30:00.000000000 +0730	
+++ rtpproxy/files/patch-freebsd_rtpproxy.in    1970-01-01 07:30:00.000000000 +0730	
@@ -1,14 +0,0 @@ 
---- freebsd/rtpproxy.in.orig
-+++ freebsd/rtpproxy.in
-@@ -25,7 +25,10 @@
- 
- rtpproxy_enable=${rtpproxy_enable:-"NO"}
- rtpproxy_laddr=${rtpproxy_laddr:-"0.0.0.0"}
-+rtpproxy_usr=${rtpproxy_usr:-"rtpproxy"}
-+rtpproxy_grp=${rtpproxy_grp:-"rtpproxy"}
- 
--command_args="-l ${rtpproxy_laddr} -p /var/run/rtpproxy.pid"
-+command_args="-l ${rtpproxy_laddr} -p /var/run/rtpproxy.pid \
-+  -u ${rtpproxy_usr}:${rtpproxy_grp}"
- 
- run_rc_command "${1}"
--- rtpproxy/files/rtpproxy.in  2015-08-24 00:54:31.000000000 +0800	
+++ rtpproxy/files/rtpproxy.in  2015-08-24 00:54:31.000000000 +0800	
@@ -0,0 +1,35 @@ 
+#!/bin/sh
+#
+# $Id: rtpproxy.in,v 1.3 2008/06/17 03:34:50 sobomax Exp $
+#
+
+# Add the following lines to /etc/rc.conf to enable RTPproxy:
+#
+# rtpproxy_enable="YES"
+
+# PROVIDE: rtpproxy
+# REQUIRE: DAEMON
+# BEFORE: opensips kamailio
+
+prefix=/usr/local
+
+. /etc/rc.subr
+
+name=rtpproxy
+rcvar=`set_rcvar`
+
+command="${prefix}/bin/rtpproxy"
+pidfile="/var/run/rtpproxy.pid"
+
+load_rc_config ${name}
+
+rtpproxy_enable=${rtpproxy_enable:-"NO"}
+rtpproxy_laddr=${rtpproxy_laddr:-"0.0.0.0"}
+rtpproxy_ctrl_socket=${rtpproxy_ctrl_socket:-"udp:0.0.0.0:7722"}
+rtpproxy_paddr=${rtpproxy_paddr:-"0.0.0.0"}
+rtpproxy_usr=${rtpproxy_usr:-"rtpproxy"}
+rtpproxy_grp=${rtpproxy_grp:-"rtpproxy"}
+
+command_args="-u ${rtpproxy_usr}:${rtpproxy_grp} -A ${rtpproxy_paddr} -F -l ${rtpproxy_laddr} -s ${rtpproxy_ctrl_socket} -d INFO -p /var/run/rtpproxy.pid"
+
+run_rc_command "${1}"
--- rtpproxy/pkg-descr  2015-08-24 00:54:31.000000000 +0800	
+++ rtpproxy/pkg-descr  2015-08-24 00:54:31.000000000 +0800	
@@ -1,7 +1,7 @@ 
 The Sippy RTPproxy is a high-performance software proxy for RTP streams that
-can work together with SIP Express Router (SER), OpenSER or Sippy B2BUA or
-any other SIP proxy or SIP B2BUA capable of rewriting SDP bodies in SIP
-messages that it relays.
+can work together with Kamailio, OpenSIPS or Sippy B2BUA or any other SIP 
+proxy or SIP B2BUA capable of rewriting SDP bodies in SIP messages that it 
+relays.
 
 The main purpose of RTPproxy is to make the communication between SIP user
 agents behind NAT(s) (Network Address Translator) possible. Several cases
--- rtpproxy/pkg-plist  2015-08-24 00:54:31.000000000 +0800	
+++ rtpproxy/pkg-plist  2015-08-24 00:54:31.000000000 +0800	
@@ -1,4 +1,4 @@ 
-etc/rc.d/rtpproxy
 bin/makeann
 bin/rtpproxy
+bin/rtpproxy_debug
 man/man8/rtpproxy.8.gz