From 611a734e7730f12b513c098ef6ffc017f5ca6d0b Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Thu, 13 Jul 2006 01:24:41 +0000
Subject: [PATCH] o Don't call PIPSocket::SetDefaultIpAddressFamilyV6() - it
 causes all outgoing   TCP/UDP connections to be bound to IPv6 version of
 INADDR_ANY, which doesn't   really work for PF_INET sockets.

o use proper name for the shared library - libfoo.so.X, not libfoo.so.X.Y.
---
 net/asterisk-oh323/Makefile                   |  2 +-
 .../files/patch-wrapper::Makefile             | 31 ++++++++++++++-----
 .../files/patch-wrapper::wrapper.cxx          | 16 ++++++++++
 net/asterisk-oh323/pkg-plist                  |  1 -
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 net/asterisk-oh323/files/patch-wrapper::wrapper.cxx

diff --git a/net/asterisk-oh323/Makefile b/net/asterisk-oh323/Makefile
index 298c58d0e023..37c38174bf03 100644
--- a/net/asterisk-oh323/Makefile
+++ b/net/asterisk-oh323/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk-oh323
 PORTVERSION=	0.7.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.inaccessnetworks.com/projects/asterisk-oh323/download/
 
diff --git a/net/asterisk-oh323/files/patch-wrapper::Makefile b/net/asterisk-oh323/files/patch-wrapper::Makefile
index 41cdd9224b8e..f16dee73304a 100644
--- a/net/asterisk-oh323/files/patch-wrapper::Makefile
+++ b/net/asterisk-oh323/files/patch-wrapper::Makefile
@@ -1,5 +1,8 @@
---- wrapper/Makefile.orig	Wed Jan 18 11:00:26 2006
-+++ wrapper/Makefile	Wed Jan 18 11:56:39 2006
+
+$FreeBSD$
+
+--- wrapper/Makefile.orig
++++ wrapper/Makefile
 @@ -62,7 +62,7 @@
  ifdef	OH323_SUPPRESS_H235
  STDCCFLAGS  += -DOH323_SUPPRESS_H235
@@ -9,7 +12,16 @@
  		--no-print-directory -s \
  		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) oh323ccflags)
  CPPFLAGS += $(OPENH323FLAGS)
-@@ -110,12 +110,12 @@
+@@ -103,22 +103,22 @@
+ ifeq ($(OH323STAT),1)
+ 	$(AR) rc liboh323wrap_s.a $(WRAPOBJECTS)
+ else
+-	$(CC) -shared -Wl,-soname,liboh323wrap.so -o liboh323wrap.so $(WRAPOBJECTS)
++	$(CC) -shared -Wl,-soname,liboh323wrap.so.1 -o liboh323wrap.so.1 $(WRAPOBJECTS)
++	ln -sfh liboh323wrap.so.1 liboh323wrap.so
+ endif
+ 
+ strip:
  
  install:
  	if [ ! -d $(DESTDIR)$(OH323WRAPLIBDIR) ]; then \
@@ -21,7 +33,12 @@
 +	$(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
+-	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
++	$(BSD_INSTALL_PROGRAM) liboh323wrap.so.1 $(DESTDIR)$(OH323WRAPLIBDIR)
++	cd $(DESTDIR)$(OH323WRAPLIBDIR); rm -f ./liboh323wrap.so
++	cd $(DESTDIR)$(OH323WRAPLIBDIR); ln -s liboh323wrap.so.1 liboh323wrap.so
+ endif
+ 
+ clean:
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..b9c473c48c44
--- /dev/null
+++ b/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- wrapper/wrapper.cxx
++++ wrapper/wrapper.cxx
+@@ -133,10 +133,6 @@
+ 	{
+ 		WRAPTRACE(4, "Starting...");
+ 		PTrace::Initialise(log_lev, log_file);
+-#ifdef P_HAS_IPV6
+-		if (PIPSocket::IsIpAddressFamilyV6Supported())
+-			PIPSocket::SetDefaultIpAddressFamilyV6();
+-#endif
+ 		endPoint = new WrapH323EndPoint(prefixes, prefix_num);
+ 		//gkServer = new WrapGatekeeperServer((H323EndPoint &)*endPoint);
+ 		gkServer = NULL;
diff --git a/net/asterisk-oh323/pkg-plist b/net/asterisk-oh323/pkg-plist
index 7a210144376c..4593300c7d01 100644
--- a/net/asterisk-oh323/pkg-plist
+++ b/net/asterisk-oh323/pkg-plist
@@ -4,4 +4,3 @@ etc/asterisk/oh323.conf.sample
 lib/asterisk/modules/chan_oh323.so
 lib/liboh323wrap.so
 lib/liboh323wrap.so.1
-lib/liboh323wrap.so.1.1