- Fix problem with speex shared library version;

- build/install h323 channel module.

42 files changed, 910 insertions, 63 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ b/net/asterisk-bristuff/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk-bristuff/files/patch-channels::Makefile
+++ b/net/asterisk-bristuff/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk-bristuff/files/patch-channels::chan_h323.c b/net/asterisk-bristuff/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk-bristuff/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk-bristuff/files/patch-channels::h323::Makefile b/net/asterisk-bristuff/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk-bristuff/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk-devel/Makefile
+++ b/net/asterisk-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk-devel/files/patch-Makefile b/net/asterisk-devel/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk-devel/files/patch-Makefile
+++ b/net/asterisk-devel/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk-devel/files/patch-channels::Makefile b/net/asterisk-devel/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk-devel/files/patch-channels::Makefile
+++ b/net/asterisk-devel/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk-devel/files/patch-channels::chan_h323.c b/net/asterisk-devel/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk-devel/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk-devel/files/patch-channels::h323::Makefile b/net/asterisk-devel/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk-devel/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk-devel/pkg-plist b/net/asterisk-devel/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk-devel/pkg-plist
+++ b/net/asterisk-devel/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk/files/patch-channels::Makefile b/net/asterisk/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk/files/patch-channels::Makefile
+++ b/net/asterisk/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk/files/patch-channels::chan_h323.c b/net/asterisk/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk/files/patch-channels::h323::Makefile b/net/asterisk/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk10/files/patch-channels::Makefile
+++ b/net/asterisk10/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk10/files/patch-channels::chan_h323.c b/net/asterisk10/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk10/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk10/files/patch-channels::h323::Makefile b/net/asterisk10/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk10/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk12/files/patch-Makefile
+++ b/net/asterisk12/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk12/files/patch-channels::Makefile
+++ b/net/asterisk12/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk12/files/patch-channels::chan_h323.c b/net/asterisk12/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk12/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk12/files/patch-channels::h323::Makefile b/net/asterisk12/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk12/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk12/pkg-plist
+++ b/net/asterisk12/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk14/files/patch-Makefile b/net/asterisk14/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk14/files/patch-Makefile
+++ b/net/asterisk14/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk14/files/patch-channels::Makefile
+++ b/net/asterisk14/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk14/files/patch-channels::chan_h323.c b/net/asterisk14/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk14/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk14/files/patch-channels::h323::Makefile b/net/asterisk14/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk14/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk14/pkg-plist
+++ b/net/asterisk14/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 89b4dbc958c9..3ecd86e63f8b 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,8 +15,11 @@ MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=  ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client \
+		${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+LIB_DEPENDS=	speex.2:${PORTSDIR}/audio/speex \
+		ldap.2:${PORTSDIR}/net/openldap20-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,10 @@ CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}"
+		MKDIR="${MKDIR}" \
+		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		OSVERSION=${OSVERSION} \
+		CXX="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index a11dc52ae1b5..9d225b6e1723 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Makefile.orig	Tue Sep  2 03:33:42 2003
-+++ Makefile	Fri Oct 17 13:33:58 2003
++++ Makefile	Sun Oct 19 10:02:05 2003
 @@ -39,10 +39,10 @@
  #K6OPT  = -DK6OPT
  
@@ -246,10 +246,11 @@ $FreeBSD$
  
  samples: all datafiles adsi
 -	mkdir -p $(ASTETCDIR)
-+	$(MKDIR) $(ASTETCDIR)
- 	for x in configs/*.sample; do \
+-	for x in configs/*.sample; do \
 -		if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 -			mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \
++	$(MKDIR) $(ASTETCDIR)
++	for x in configs/*.sample channels/h323/*.sample; do \
 +		$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample`-dist ;\
 +		if ! [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \
 +			$(BSD_INSTALL_DATA) $$x $(ASTETCDIR)/`basename $$x .sample` ;\
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index 5c04f9ee8533..9754d5555252 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -2,7 +2,16 @@
 $FreeBSD$
 
 --- channels/Makefile.orig	Tue Aug 19 19:42:30 2003
-+++ channels/Makefile	Fri Oct 17 12:39:34 2003
++++ channels/Makefile	Sun Oct 19 11:08:13 2003
+@@ -25,7 +25,7 @@
+ #CHANNEL_LIBS+=chan_vofr
+ 
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=chan_h323.so
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 @@ -95,7 +95,7 @@
  ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
@@ -12,7 +21,19 @@ $FreeBSD$
  endif
  
  chan_zap.o: $(CHANZAP)
-@@ -127,7 +127,7 @@
+@@ -119,15 +119,17 @@
+ chan_vpb.so: chan_vpb.o
+ 	 $(CXX) -shared -Xlinker -x -o $@ $< -lvpb -lpthread -lm -ldl
+ 
+-chan_h323.so: chan_h323.o h323/libchanh323.a
+-	$(CC) -shared -Xlinker -x -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++chan_h323.so: chan_h323.o h323/ast_h323.o
++	$(CXX) -shared -Xlinker -x -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
+ 
++h323/ast_h323.o:
++	$(MAKE) -C h323 ast_h323.o
+ 
+ #chan_modem.so : chan_modem.o
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk16/files/patch-channels::chan_h323.c b/net/asterisk16/files/patch-channels::chan_h323.c
new file mode 100644
index 000000000000..26256ec21152
--- /dev/null
+++ b/net/asterisk16/files/patch-channels::chan_h323.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- channels/chan_h323.c	2003/10/19 06:39:00	1.1
++++ channels/chan_h323.c	2003/10/19 06:52:18
+@@ -54,6 +54,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <sys/signal.h>
++#include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+ 
diff --git a/net/asterisk16/files/patch-channels::h323::Makefile b/net/asterisk16/files/patch-channels::h323::Makefile
new file mode 100644
index 000000000000..2d67f5b74b9d
--- /dev/null
+++ b/net/asterisk16/files/patch-channels::h323::Makefile
@@ -0,0 +1,75 @@
+
+$FreeBSD$
+
+--- channels/h323/Makefile.orig	Wed Aug 27 19:05:14 2003
++++ channels/h323/Makefile	Sun Oct 19 10:49:58 2003
+@@ -16,6 +16,8 @@
+ ASTETCDIR=/etc/asterisk
+ endif
+ 
++CXX?=g++
++
+ # Uncomment if u want to attempt to include the G.729 stuff
+ # This is a quick fix to work around the missing H323Capability
+ # in Open H.323. As of Open H.323 1.12.0 the H323Capability for
+@@ -25,7 +27,7 @@
+ #
+ # This needs to be updated to deal with more than just little endian machines
+ #
+-CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
++CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
+ 
+ 
+ #############################################
+@@ -33,13 +35,13 @@
+ # Only change below if you know WTF your doing
+ #
+ CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+-CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
+-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -Wall -fPIC
++CFLAGS += -DP_FREEBSD=$(OSVERSION) -D_REENTRANT -D_GNU_SOURCE
+ CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+ CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+ CFLAGS += -I../../include
+ CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include 
+-CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
++CFLAGS += -I$(OPENH323DIR)/include
+ 
+ 
+ all:   	libchanh323.a
+@@ -61,26 +63,27 @@
+  
+ 
+ samples: 
+-	if [ -f $(ASTETCDIR)/h323.conf ]; then \
+-		mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \
++	$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf-dist
++	if ! [ -f $(ASTETCDIR)/h323.conf ]; then \
++		$(BSD_INSTALL_DATA) h323.conf.sample $(ASTETCDIR)/h323.conf; \
+ 	fi ; 
+-	install h323.conf.sample $(ASTETCDIR)/h323.conf
+  
+ 
+ ast_h323.o:	ast_h323.cpp
+-	g++ -g -c -o $@ $(CFLAGS) $<
++	$(CXX) -c -o $@ $(CFLAGS) $<
+ 
+ libchanh323.a:	ast_h323.o
+ 	ar cr libchanh323.a ast_h323.o
+ 
+ chan_h323.so:	
+-	g++  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_d.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_d $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
+ 
+ chan_h323_s.so:	chan_h323.o ast_h323.o
+-	g++  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
++	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s $(PTHREAD_LIBS) -lcrypto -lssl -lexpat
++
+ clean:
+ 	rm -f *.o *.so core.* libchanh323.a
+ 
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index 6832731cf683..3bcfc7d403d8 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -28,6 +28,9 @@ etc/asterisk/extensions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
 @exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.conf
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf
@@ -179,6 +182,7 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_mysql.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so