Update to 0.7.3.

11 files changed, 131 insertions, 119 deletions

diff --git a/net/asterisk-oh323/Makefile b/net/asterisk-oh323/Makefile
index 979e42e3ab97..8848d257a162 100644
--- a/net/asterisk-oh323/Makefile
+++ b/net/asterisk-oh323/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk-oh323
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.7.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.inaccessnetworks.com/projects/asterisk-oh323/download/
 
@@ -19,15 +18,11 @@ BUILD_DEPENDS= 	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
 	    	${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
 
 USE_GMAKE=	yes
-
-PLIST_FILES=	lib/liboh323wrap_s.a
-PLIST_FILES+=	lib/asterisk/modules/chan_oh323.so
-PLIST_FILES+=	etc/asterisk/oh323.conf.sample
-
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
 		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
-		CPP="${CXX}"
+		CPP="${CXX}" \
+		USE_OLD_CAPABILITIES_API="yes"
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/net/asterisk-oh323/distinfo b/net/asterisk-oh323/distinfo
index 3337f01fa517..19dde123458c 100644
--- a/net/asterisk-oh323/distinfo
+++ b/net/asterisk-oh323/distinfo
@@ -1,2 +1,3 @@
-MD5 (asterisk-oh323-0.6.5.tar.gz) = 4cf3ff5362bb5db498f2a2dfb8b24087
-SIZE (asterisk-oh323-0.6.5.tar.gz) = 87112
+MD5 (asterisk-oh323-0.7.3.tar.gz) = 66dc098a20ac11f098edbbaed307c085
+SHA256 (asterisk-oh323-0.7.3.tar.gz) = c34cd6e9ddee64c1716ce2be66458f145ebe1425ea284330d9437c0fc3397bd1
+SIZE (asterisk-oh323-0.7.3.tar.gz) = 93440
diff --git a/net/asterisk-oh323/files/patch-Makefile b/net/asterisk-oh323/files/patch-Makefile
index 57096640f842..58c2db27d589 100644
--- a/net/asterisk-oh323/files/patch-Makefile
+++ b/net/asterisk-oh323/files/patch-Makefile
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -39,7 +39,7 @@
+--- Makefile.orig	Wed Jan 18 10:54:59 2006
++++ Makefile	Wed Jan 18 11:50:59 2006
+@@ -41,7 +41,7 @@
  # Install everything under this directory. If this is empty, then everything
  # will be installed under /
  #
@@ -12,32 +9,32 @@ $FreeBSD$
  
  #
  # Set PWLIBDIR variable to the directory containing the sources of 
-@@ -49,7 +49,7 @@
+@@ -51,7 +51,7 @@
  # compile asterisk-oh323. Do not use the installed library of your
  # distribution. It won't work.
  #
--PWLIBDIR=/root/src/oh323/pwlib
-+PWLIBDIR?=/root/src/oh323/pwlib
+-PWLIBDIR=/usr/src/pwlib
++PWLIBDIR?=/usr/src/pwlib
  
  #
  # Set OPENH323LIBDIR variable to the directory containing the sources of
-@@ -59,13 +59,13 @@
+@@ -61,13 +61,13 @@
  # compile asterisk-oh323. Do not use the installed library of your
  # distribution. It won't work.
  #
--OPENH323DIR=/root/src/oh323/openh323
-+OPENH323DIR?=/root/src/oh323/openh323
+-OPENH323DIR=/usr/src/openh323
++OPENH323DIR?=/usr/src/openh323
  
  #
  # Set ASTERISKINCDIR variable to the directory containing the include files of
  # Asterisk PBX.
  #
--ASTERISKINCDIR=/root/src/asterisk/include
+-ASTERISKINCDIR=/usr/src/asterisk/include
 +ASTERISKINCDIR=$(LOCALBASE)/include
  
  #
  # Set ASTERISKMODDIR variable to the directory where ASTERISK's modules reside.
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
  #
  # Note: This directory is created under $DESTDIR.
  #
@@ -46,7 +43,7 @@ $FreeBSD$
  
  #
  # Set ASTERISKETCDIR variable to the directory where ASTERISK's configuration
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,7 @@
  #
  # Note: This directory is created under $DESTDIR.
  #
@@ -54,41 +51,4 @@ $FreeBSD$
 +OH323WRAPLIBDIR=/lib
  
  #
- # Set SSLINCDIR variable to the directory where ssl/crypto
-@@ -157,9 +157,8 @@
- SUBDIRS=wrapper asterisk-driver
- .PHONY: all build install clean subdirs_build subdir_install subdir_clean \
- 		rpm rpm_clean help $(SUBDIRS)
--CC=gcc
--CPP=g++
--MAKE=make
-+CC?=gcc
-+CPP?=g++
- INSTALL=install
- TOUCH=touch
- AR=ar
-@@ -191,12 +190,12 @@
- ifdef	P_PTHREADS
- OPENH323USERFLAGS += P_PTHREADS=1
- endif
--OPENH323FLAGS=$(shell make $(OPENH323USERFLAGS) --no-print-directory -s \
-+OPENH323FLAGS=$(shell $(MAKE) $(OPENH323USERFLAGS) --no-print-directory -s \
- 		-C $(OPENH323DIR) \
- 		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) ccflags)
--CPPFLAGS=$(OPENH323FLAGS) -Wall -x c++ -Os
-+CPPFLAGS=$(CXXFLAGS) $(OPENH323FLAGS) -Wall -x c++ -Os
- ASTERISKINCLUDE=-I$(ASTERISKINCDIR) -I../wrapper
--CFLAGS=-Wall
-+CFLAGS+=-Wall
- ifdef	HAS_OH323MODS
- CPPFLAGS += -DHAS_OH323MODS
- CFLAGS += -DHAS_OH323MODS
-@@ -223,7 +222,7 @@
-  
- clean: subdirs_clean rpm_clean
- 
--all: subdirs_build subdirs_strip subdirs_install
-+all: subdirs_build
- 
- subdirs_build:
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x build || exit 1 ; done
+ # Set WRAPTRACING to 1 to enable tracing information from the OpenH323Wrap
diff --git a/net/asterisk-oh323/files/patch-asterisk-driver::Makefile b/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
index 74e8a42106de..69de678ad6bd 100644
--- a/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
+++ b/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
@@ -1,42 +1,15 @@
-
-$FreeBSD$
-
---- asterisk-driver/Makefile.orig
-+++ asterisk-driver/Makefile
-@@ -33,9 +33,9 @@
- 
- ifndef SKIP_SUFFIX
- 	ifeq ($(OH323STAT),1)
--		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*s.a))
-+		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*.a))
- 	else
--		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*r.so))
-+		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*.so))
- 	endif
- 	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
- 	LIBPTSSUF=$(findstring _r_s,$(LIBPTNAME))	# Static lib suffix
-@@ -54,9 +54,9 @@
- 		LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*s.a))
- 	else
- 		ifdef NOTRACE
--			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*n.so))
-+			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*.so))
- 		else
--			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*r.so))
-+			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*.so))
- 		endif
- 	endif
- 	LIBH323NAME=$(subst lib,,$(basename $(notdir $(LIBH323PATH))))
-@@ -76,7 +76,7 @@
- endif
+--- asterisk-driver/Makefile.orig	Wed Jan 18 11:43:28 2006
++++ asterisk-driver/Makefile	Wed Jan 18 11:55:34 2006
+@@ -90,7 +90,7 @@
+ LIBH323=$(LIBH323NAME)
  
  ifndef SKIP_EXTLIBS
 -	EXTLIBS=$(shell $(PWLIBDIR)/make/ptlib-config --libs)
 +	EXTLIBS=$(shell $(PWLIBDIR)/make/ptlib-config --ldflags --libs)
  endif
  
- CFLAGS += -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes \
-@@ -95,14 +95,15 @@
+ CFLAGS += -pipe -Wstrict-prototypes -Wmissing-prototypes \
+@@ -110,14 +110,15 @@
  
  install:
  	if [ ! -d $(DESTDIR)$(ASTERISKMODDIR) ]; then \
@@ -49,7 +22,7 @@ $FreeBSD$
 -		$(INSTALL) -d $(DESTDIR)$(ASTERISKETCDIR); \
 +		$(MKDIR) $(DESTDIR)$(ASTERISKETCDIR); \
  	fi
-+	$(BSD_INSTALL_DATA) oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf.sample
++	$(BSD_INSTALL_DATA) oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf.sample; \
  	if [ ! -f $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf ]; then \
 -		$(INSTALL) -m 0644 oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf; \
 +		$(BSD_INSTALL_DATA) oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf; \
diff --git a/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c b/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c
index d9fe81a1df01..5e7463680a59 100644
--- a/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c
+++ b/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c
@@ -1,28 +1,25 @@
---- asterisk-driver/chan_oh323.c.orig	Tue Dec 21 17:28:11 2004
-+++ asterisk-driver/chan_oh323.c	Fri Jun 17 13:23:19 2005
-@@ -56,6 +56,7 @@
+--- asterisk-driver/chan_oh323.c.orig	Wed Jan 18 11:25:02 2006
++++ asterisk-driver/chan_oh323.c	Wed Jan 18 11:37:09 2006
+@@ -43,10 +43,12 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <math.h>
 +#include <netinet/in_systm.h>
  #include <netinet/ip.h>
  #include <sys/signal.h>
++#include <stdio.h>
  
-@@ -1155,7 +1156,7 @@ static struct ast_frame *oh323_exception
- 	p->fr.src = type;
- 	p->fr.offset = 0;
- 	p->fr.mallocd = 0;
--	p->fr.src = __FUNCTION__;
-+	p->fr.src = "oh323_exception";
+-#include "asterisk.h"
++//#include "asterisk.h"
  
- 	/* -- User input */
- 	if (p->except_struct.type == OH323EXC_USER_INPUT_TONE) {
-@@ -1770,7 +1771,7 @@ static struct ast_frame *oh323_read(stru
- 	p->fr.src = type;
- 	p->fr.offset = AST_FRIENDLY_OFFSET;
- 	p->fr.samples = 0;
--	p->fr.src = __FUNCTION__;
-+	p->fr.src = "oh323_read";
- 
- 	/* Check the event pipe */
- 	//CHECK_BLOCKING(c);
+ #include "asterisk/lock.h"
+ #include "asterisk/channel.h"
+@@ -4429,7 +4431,7 @@ static int kill_monitor(void)
+ 				return(-1);
+ 			}
+ 		}
+-		monitor_thread = -2;
++		monitor_thread = AST_PTHREADT_STOP;
+ 	} else {
+ 		ast_log(LOG_WARNING, "Unable to lock the monitor.\n");
+ 		return(-1);
diff --git a/net/asterisk-oh323/files/patch-rules.mak b/net/asterisk-oh323/files/patch-rules.mak
new file mode 100644
index 000000000000..b556f40257a7
--- /dev/null
+++ b/net/asterisk-oh323/files/patch-rules.mak
@@ -0,0 +1,23 @@
+--- rules.mak.orig	Wed Jan 18 10:53:49 2006
++++ rules.mak	Wed Jan 18 11:45:16 2006
+@@ -42,9 +42,8 @@
+ SUBDIRS = wrapper asterisk-driver
+ .PHONY: all build install clean subdirs_build subdir_install subdir_clean \
+ 		rpm rpm_clean help $(SUBDIRS)
+-CC = gcc
+-CPP = g++
+-MAKE = make
++CC ?= gcc
++CPP ?= g++
+ INSTALL = install
+ TOUCH = touch
+ AR = ar
+@@ -108,7 +107,7 @@
+  
+ clean: subdirs_clean rpm_clean
+ 
+-all: subdirs_build subdirs_strip subdirs_install
++all: subdirs_build subdirs_strip
+ 
+ subdirs_build:
+ 	for x in $(SUBDIRS); do $(MAKE) -C $$x build || exit 1 ; done
diff --git a/net/asterisk-oh323/files/patch-wrapper::Makefile b/net/asterisk-oh323/files/patch-wrapper::Makefile
new file mode 100644
index 000000000000..41cdd9224b8e
--- /dev/null
+++ b/net/asterisk-oh323/files/patch-wrapper::Makefile
@@ -0,0 +1,27 @@
+--- wrapper/Makefile.orig	Wed Jan 18 11:00:26 2006
++++ wrapper/Makefile	Wed Jan 18 11:56:39 2006
+@@ -62,7 +62,7 @@
+ ifdef	OH323_SUPPRESS_H235
+ STDCCFLAGS  += -DOH323_SUPPRESS_H235
+ endif
+-OPENH323FLAGS = $(shell make $(OPENH323USERFLAGS) -f openh323flags.mak \
++OPENH323FLAGS = $(shell $(MAKE) $(OPENH323USERFLAGS) -f openh323flags.mak \
+ 		--no-print-directory -s \
+ 		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) oh323ccflags)
+ CPPFLAGS += $(OPENH323FLAGS)
+@@ -110,12 +110,12 @@
+ 
+ install:
+ 	if [ ! -d $(DESTDIR)$(OH323WRAPLIBDIR) ]; then \
+-		$(INSTALL) -d $(DESTDIR)$(OH323WRAPLIBDIR); \
++		$(MKDIR) $(DESTDIR)$(OH323WRAPLIBDIR); \
+ 	fi
+ ifeq ($(OH323STAT),1)
+-	$(INSTALL) -m 0644 liboh323wrap_s.a $(DESTDIR)$(OH323WRAPLIBDIR)
++	$(BSD_INSTALL_PROGRAM) liboh323wrap_s.a $(DESTDIR)$(OH323WRAPLIBDIR)
+ else
+-	$(INSTALL) liboh323wrap.so $(DESTDIR)$(OH323WRAPLIBDIR)
++	$(BSD_INSTALL_PROGRAM) liboh323wrap.so $(DESTDIR)$(OH323WRAPLIBDIR)
+ 	cd $(DESTDIR)$(OH323WRAPLIBDIR); rm -f ./liboh323wrap.so.1; rm -f ./liboh323wrap.so.1.1
+ 	cd $(DESTDIR)$(OH323WRAPLIBDIR); ln -s liboh323wrap.so liboh323wrap.so.1
+ 	cd $(DESTDIR)$(OH323WRAPLIBDIR); ln -s liboh323wrap.so liboh323wrap.so.1.1
diff --git a/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx b/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx
index 0a1a7c6e8b88..06676b63b1f0 100644
--- a/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx
+++ b/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx
@@ -1,5 +1,5 @@
---- wrapper/asteriskaudio.cxx.orig	Fri Jun 17 13:32:45 2005
-+++ wrapper/asteriskaudio.cxx	Fri Jun 17 13:33:19 2005
+--- wrapper/asteriskaudio.cxx.orig	Wed Jan 18 11:01:05 2006
++++ wrapper/asteriskaudio.cxx	Wed Jan 18 11:01:34 2006
 @@ -164,7 +164,7 @@ PAsteriskSoundChannel::~PAsteriskSoundCh
  	WRAPTRACE(3, "Total I/Os: read=" << readCount << ", write=" << writeCount);
  	WRAPTRACE(3, "Short I/Os: write=" << shortWriteCount);
diff --git a/net/asterisk-oh323/files/patch-wrapper::wrapendpoint.cxx b/net/asterisk-oh323/files/patch-wrapper::wrapendpoint.cxx
new file mode 100644
index 000000000000..e85320ba3b57
--- /dev/null
+++ b/net/asterisk-oh323/files/patch-wrapper::wrapendpoint.cxx
@@ -0,0 +1,20 @@
+--- wrapper/wrapendpoint.cxx.orig	Wed Jan 18 11:11:31 2006
++++ wrapper/wrapendpoint.cxx	Wed Jan 18 11:12:23 2006
+@@ -1206,7 +1206,7 @@ WrapH323EndPoint::CreateConnection(unsig
+ 				WRAPTRACE(2, "Incoming connection with no calling party number in SETUP.");
+ 				ud.calling_num[0] = '\0';
+ 			}
+-			tmp.MakeEmpty();
++			tmp = PString();
+ 			/* Get Called party number */
+ 			(setupPDU->GetQ931()).GetCalledPartyNumber(tmp);
+ 			if (!tmp.IsEmpty()) {
+@@ -1230,7 +1230,7 @@ WrapH323EndPoint::CreateConnection(unsig
+ 				WRAPTRACE(2, "Incoming connection with no called party number in SETUP.");
+ 				ud.called_num[0] = '\0';
+ 			}
+-			tmp.MakeEmpty();
++			tmp = PString();
+ 			/* Get Redirecting number */
+ 			(setupPDU->GetQ931()).GetRedirectingNumber(tmp);
+ 			if (!tmp.IsEmpty()) {
diff --git a/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx b/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx
new file mode 100644
index 000000000000..2ffdcbd79922
--- /dev/null
+++ b/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx
@@ -0,0 +1,11 @@
+--- wrapper/wrapper.cxx.orig	Wed Jan 18 11:15:33 2006
++++ wrapper/wrapper.cxx	Wed Jan 18 11:15:36 2006
+@@ -570,7 +570,7 @@ extern "C" {
+ 		{ H323Connection::EndedByTemporaryFailure, OH323END_TEMP_FAILURE, "Temporary failure" },
+ 		{ H323Connection::EndedByQ931Cause, OH323END_Q931CAUSE, "Call ended with Q.931 cause" },
+ 		{ H323Connection::EndedByDurationLimit, OH323END_DURATION_LIMIT, "Call ended due to enforced duration limit" },
+-		{ H323Connection::EndedByInvalidConferenceID, OH323END_INVALIDCID, "Call cleared due to invalid conference ID" },
++//		{ H323Connection::EndedByInvalidConferenceID, OH323END_INVALIDCID, "Call cleared due to invalid conference ID" },
+ 		{ -1, -1, "Unknown reason" },
+ 	};
+ 
diff --git a/net/asterisk-oh323/pkg-plist b/net/asterisk-oh323/pkg-plist
new file mode 100644
index 000000000000..09c7649f185d
--- /dev/null
+++ b/net/asterisk-oh323/pkg-plist
@@ -0,0 +1,5 @@
+@unexec if cmp -s %D/etc/asterisk/oh323.conf %D/etc/asterisk/oh323.conf.sample; then rm -f %D/etc/asterisk/oh323.conf; fi
+etc/asterisk/oh323.conf.sample
+@exec [ -f %B/oh323.conf ] || cp %B/%f %B/oh323.conf
+lib/liboh323wrap_s.a
+lib/asterisk/modules/chan_oh323.so