Update openh323 to 1.15.1

Same as with devel/pwlib, the main development site stealthly moved
to sourceforge without notice on the main openh323 page. This update
catches up with the last two years of development.

6 files changed, 142 insertions, 149 deletions

diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 56e55f5ad51..fbd99c20630 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2004/10/09 01:15:56 mjl Exp $
+# $NetBSD: Makefile,v 1.25 2004/10/09 16:01:23 mjl Exp $
 #
 
-DISTNAME=	openh323_1.12.2
-PKGNAME=	${DISTNAME:S/_/-/}
+DISTNAME=	openh323-v1_15_1-src
+PKGNAME=	${DISTNAME:S/_/./g:S/-v/-/:S/-src//}
 # PKGREVISION=	2
+EXTRACT_SUFX=	-tar.gz
 CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.us1.openh323.org/bin/ \
-		http://www.us2.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.at.openh323.org/bin/ \
-		http://www.cz.openh323.org/bin/
+MASTER_SITES=	http://www.voxgratia.org/releases/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.openh323.org/
@@ -27,24 +23,29 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	opt
 
+post-extract:
+	cd ${WRKDIR}; ${TAR} -xf ${DISTNAME:S/$/-tar/}
+
 post-patch:
-		cd ${WRKSRC}/include; ${LN} -s . openh323
-		${_PKG_SILENT}cd ${WRKSRC};			\
-		for f in openh323u.mak.in; do			\
-			${SED} ${FILES_SUBST_SED} $$f > $$f.sed;\
-			${MV} -f $$f.sed $$f;			\
-		done
+	cd ${WRKSRC}/include; ${LN} -s . openh323
+	${_PKG_SILENT}cd ${WRKSRC};			\
+	for f in openh323u.mak.in; do			\
+		${SED} ${FILES_SUBST_SED} $$f > $$f.sed;\
+		${MV} -f $$f.sed $$f;			\
+	done
 
 # override the openh323 install - it uses cp -d, and isn't libtool-aware
 do-install:
-		cd ${WRKSRC}/src; ${MAKE_ENV} ${GMAKE} install
-		${INSTALL_DATA_DIR} ${PREFIX}/include/openh323
-		cd ${WRKSRC}/include;				\
+	cd ${WRKSRC}/src; ${MAKE_ENV} ${GMAKE} install
+	${INSTALL_DATA_DIR} ${PREFIX}/include/openh323
+	cd ${WRKSRC}/include;				\
 		for f in \*.h ; \
 			do ${INSTALL_DATA} $$f ${PREFIX}/include/openh323; done
-		cd ${WRKSRC}/samples/simple; ${MAKE_ENV} ${GMAKE} install
-		-${INSTALL_DATA_DIR} ${PREFIX}/share/openh323
-		cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323
+	cd ${WRKSRC}; ${INSTALL_DATA} version.h ${PREFIX}/include/openh323
+	cd ${WRKSRC}/samples/simple; ${MAKE_ENV} ${GMAKE} install
+	-${INSTALL_DATA_DIR} ${PREFIX}/share/openh323
+	cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323
+	cd ${WRKSRC}/plugins; ${GMAKE} install
 
 .include "../../devel/pwlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/openh323/PLIST b/net/openh323/PLIST
index c7ccb6ed69d..10d3f44e111 100644
--- a/net/openh323/PLIST
+++ b/net/openh323/PLIST
@@ -1,9 +1,22 @@
-@comment $NetBSD: PLIST,v 1.4 2004/10/09 01:15:56 mjl Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/10/09 16:01:23 mjl Exp $
 lib/libh323.la
 bin/simph323
-include/openh323/dllcodec.h
+lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
+lib/pwlib/codecs/audio/speex_audio_pwplugin.so
+lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
+lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
+lib/pwlib/codecs/audio/g726_audio_pwplugin.so
+lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
+include/openh323/cu30codec.h
 include/openh323/dynacodec.h
 include/openh323/ffh263codec.h
+include/openh323/h261codec.h
+include/openh323/h263codec.h
+include/openh323/h323pluginmgr.h
+include/openh323/h4503.h
+include/openh323/h460.h
+include/openh323/opalplugin.h
+include/openh323/rfc2190avcodec.h
 include/openh323/h248.h
 include/openh323/h323annexg.h
 include/openh323/h323trans.h
@@ -13,29 +26,21 @@ include/openh323/h4508.h
 include/openh323/h4509.h
 include/openh323/h501.h
 include/openh323/h501pdu.h
-include/openh323/ilbccodec.h
 include/openh323/openh323buildopts.h
 include/openh323/peclient.h
 include/openh323/svcctrl.h
 include/openh323/QTIoctl.h
 include/openh323/channels.h
 include/openh323/codecs.h
-include/openh323/cu30codec.h
-include/openh323/g7231codec.h
-include/openh323/g726codec.h
-include/openh323/g729codec.h
 include/openh323/gccpdu.h
 include/openh323/gkclient.h
 include/openh323/gkserver.h
-include/openh323/gsmcodec.h
 include/openh323/guid.h
 include/openh323/h225.h
 include/openh323/h225ras.h
 include/openh323/h235.h
 include/openh323/h235auth.h
 include/openh323/h245.h
-include/openh323/h261codec.h
-include/openh323/h263codec.h
 include/openh323/h323.h
 include/openh323/h323caps.h
 include/openh323/h323con.h
@@ -57,25 +62,26 @@ include/openh323/ixjidb.h
 include/openh323/ixjlid.h
 include/openh323/jitter.h
 include/openh323/lid.h
-include/openh323/lpc10codec.h
 include/openh323/mcspdu.h
 include/openh323/mediafmt.h
-include/openh323/mscodecs.h
 include/openh323/opalvxml.h
 include/openh323/opalwavfile.h
 include/openh323/q931.h
 include/openh323/rfc2833.h
 include/openh323/rtp.h
 include/openh323/rtp2wav.h
-include/openh323/speexcodec.h
 include/openh323/t120proto.h
 include/openh323/t38.h
 include/openh323/t38proto.h
 include/openh323/transports.h
 include/openh323/vblasterlid.h
+include/openh323/version.h
 include/openh323/vpblid.h
 include/openh323/x224.h
 include/openh323/x880.h
 share/openh323/openh323u.mak
 @dirrm share/openh323
 @dirrm include/openh323
+@dirrm lib/pwlib/codecs/audio
+@dirrm lib/pwlib/codecs
+@dirrm lib/pwlib
diff --git a/net/openh323/distinfo b/net/openh323/distinfo
index 064573a04bf..880680c9f29 100644
--- a/net/openh323/distinfo
+++ b/net/openh323/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2004/10/09 06:51:01 mjl Exp $
+$NetBSD: distinfo,v 1.8 2004/10/09 16:01:23 mjl Exp $
 
-SHA1 (openh323_1.12.2.tar.gz) = 47fd3f5db6936231aeb937c8e70ea956ce7abccd
-Size (openh323_1.12.2.tar.gz) = 2343354 bytes
-SHA1 (patch-aa) = c3de38c53c815904cc4772a5bb049e058af2f159
-SHA1 (patch-ac) = b4281c6a0e2434f7446bd6ba9904c142badcb539
-SHA1 (patch-ba) = c7701d6aec425fceedb542369b48bc0df70ce055
+SHA1 (openh323-v1_15_1-src-tar.gz) = feecbcc8782006470b639cbf4cc4be6fd9644b06
+Size (openh323-v1_15_1-src-tar.gz) = 3839797 bytes
+SHA1 (patch-aa) = 212a661357da355cc6c600b3de9d431bbd90a66e
+SHA1 (patch-ac) = e4958f7f4922166d64829fc61de1882c574e3a6f
+SHA1 (patch-ba) = 4ee6617e55fe605bdb0559a54ad1de14ba175dc0
diff --git a/net/openh323/patches/patch-aa b/net/openh323/patches/patch-aa
index f641521bd18..0ecabaa9a75 100644
--- a/net/openh323/patches/patch-aa
+++ b/net/openh323/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/10/09 01:15:57 mjl Exp $
+$NetBSD: patch-aa,v 1.6 2004/10/09 16:01:23 mjl Exp $
 
---- src/Makefile.orig	2003-08-04 02:03:29.000000000 +0200
-+++ src/Makefile	2004-10-08 23:20:53.000000000 +0200
-@@ -837,7 +837,7 @@
+--- src/Makefile.orig	2004-06-10 15:16:31.000000000 +0200
++++ src/Makefile	2004-10-09 15:48:09.000000000 +0200
+@@ -336,7 +336,7 @@
  
  ####################################################
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/09 01:15:57 mjl Exp $
  
  ####################################################
  
-@@ -849,7 +849,7 @@
+@@ -348,7 +348,7 @@
  LIB_BASENAME=$(OH323_BASE)
  LIB_FILENAME=$(OH323_FILE)
  
@@ -20,10 +20,13 @@ $NetBSD: patch-aa,v 1.5 2004/10/09 01:15:57 mjl Exp $
  
  ####################################################
  
-@@ -878,15 +878,7 @@
+@@ -374,86 +374,25 @@
+ endif
+ export LD_LIBRARY_PATH
  
- # If we're cross compiling, we want the host's asnparser
- # otherwise use the one for the current platform
+-
+-# If we're cross compiling, we want the host's asnparser
+-# otherwise use the one for the current platform
 -ASNPARSE_DIR = $(HOSTPWLIBDIR)/tools/asnparser
 -ASNPARSER = $(ASNPARSE_DIR)/obj_$(HOST_PLATFORM_TYPE)_r/asnparser
 -
@@ -33,101 +36,78 @@ $NetBSD: patch-aa,v 1.5 2004/10/09 01:15:57 mjl Exp $
 -$(ASNPARSER):
 -	$(MAKE) -C $(ASNPARSE_DIR) opt
 -endif
-+ASNPARSER = $(PREFIX)/bin/asnparser
- 
- 
- ifdef ASN_EXCLUDE
-@@ -1107,79 +1099,79 @@
+-
+-
+-asnparser.version: $(ASNPARSER)
+-	$(ASNPARSER) --version | awk '{print $$1,$$2,$$3}' > asnparser.version.new
+-	if test -f asnparser.version && diff asnparser.version.new asnparser.version >/dev/null 2>&1 ; \
+-		then rm asnparser.version.new ; \
+-		else mv asnparser.version.new asnparser.version ; \
+-	fi
+-
+-asnfiles: $(ASNPARSER)
+-	$(ASNPARSER) -s3 -m H245 -c --classheader "H245_AudioCapability=#ifndef PASN_NOPRINTON\nvoid PrintOn(ostream & strm) const;\n#endif" h245.asn
+-	mv $(OH323_SRCDIR)/h245.h $(OH323_INCDIR)/h245.h
+-	$(ASNPARSER) -m H235 -c h235.asn
+-	mv $(OH323_SRCDIR)/h235.h $(OH323_INCDIR)/h235.h
+-	$(ASNPARSER) -s2 -m H225 -r MULTIMEDIA-SYSTEM-CONTROL=H245 -c h225.asn
+-	mv $(OH323_SRCDIR)/h225.h $(OH323_INCDIR)/h225.h
+-	$(ASNPARSER) -m H248 -c h248.asn
+-	mv $(OH323_SRCDIR)/h248.h $(OH323_INCDIR)/h248.h
+-	$(ASNPARSER) -m H4501 -c h4501.asn
+-	mv $(OH323_SRCDIR)/h4501.h $(OH323_INCDIR)/h4501.h
+-	$(ASNPARSER) -m H4502 -c h4502.asn
+-	mv $(OH323_SRCDIR)/h4502.h $(OH323_INCDIR)/h4502.h
+-	$(ASNPARSER) -m H4504 -c h4504.asn
+-	mv $(OH323_SRCDIR)/h4504.h $(OH323_INCDIR)/h4504.h
+-	$(ASNPARSER) -m H4505 -c h4505.asn
+-	mv $(OH323_SRCDIR)/h4505.h $(OH323_INCDIR)/h4505.h
+-	$(ASNPARSER) -m H4506 -c h4506.asn
+-	mv $(OH323_SRCDIR)/h4506.h $(OH323_INCDIR)/h4506.h
+-	$(ASNPARSER) -m H4507 -c h4507.asn
+-	mv $(OH323_SRCDIR)/h4507.h $(OH323_INCDIR)/h4507.h
+-	$(ASNPARSER) -m H4508 -c h4508.asn
+-	mv $(OH323_SRCDIR)/h4508.h $(OH323_INCDIR)/h4508.h
+-	$(ASNPARSER) -m H4509 -c h4509.asn
+-	mv $(OH323_SRCDIR)/h4509.h $(OH323_INCDIR)/h4509.h
+-	$(ASNPARSER) -m H45010 -c h45010.asn
+-	mv $(OH323_SRCDIR)/h45010.h $(OH323_INCDIR)/h45010.h
+-	$(ASNPARSER) -m H45011 -c h45011.asn
+-	mv $(OH323_SRCDIR)/h45011.h $(OH323_INCDIR)/h45011.h
+-	$(ASNPARSER) -m X880 -c x880.asn
+-	mv $(OH323_SRCDIR)/x880.h $(OH323_INCDIR)/x880.h
+-	$(ASNPARSER) -m H501 -c h501.asn
+-	mv $(OH323_SRCDIR)/h501.h $(OH323_INCDIR)/h501.h
+-	$(ASNPARSER) -m T38 -c t38.asn
+-	mv $(OH323_SRCDIR)/t38.h $(OH323_INCDIR)/t38.h
+-	$(ASNPARSER) -m MCS -c mcspdu.asn
+-	mv $(OH323_SRCDIR)/mcspdu.h $(OH323_INCDIR)/mcspdu.h
+-	$(ASNPARSER) -m GCC -c gccpdu.asn
+-	mv $(OH323_SRCDIR)/gccpdu.h $(OH323_INCDIR)/gccpdu.h
+-
+ # Build rules for VIC codecs
  
  $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.cxx
  	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.c
  	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(DEPDIR)/%.dep : $(VIC_DIR)/%.c
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
  	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@
  
  $(DEPDIR)/%.dep : $(VIC_DIR)/%.cxx
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
  	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
- 
- 
- # Build rules for the GSM codec
- 
- $(OH323_OBJDIR)/%.o : $(GSM_SRCDIR)/%.c
- 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
- 
- $(DEPDIR)/%.dep : $(GSM_SRCDIR)/%.c
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) -ansi -I$(GSM_INCDIR) -DWAV49 -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
- 
- 
- # Build rules for the G.726 codec
- 
- $(OH323_OBJDIR)/%.o : $(G726_DIR)/%.c
- 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
- 
- $(DEPDIR)/%.dep : $(G726_DIR)/%.c
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CC) $(OPTCCFLAGS) $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(OPTCCFLAGS) $(CFLAGS) -M $< >> $@
- 
- 
- # Build rules for the LPC10 codec
- 
- $(OH323_OBJDIR)/%.o : $(LPC10_SRCDIR)/%.c
- 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
- 
- $(DEPDIR)/%.dep : $(LPC10_SRCDIR)/%.c
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
- 
- # Build rules for the iLBC codec
- 
- $(OH323_OBJDIR)/%.o : $(ILBC_DIR)/%.c
- 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
- 
- $(DEPDIR)/%.dep : $(ILBC_DIR)/%.c
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CC) $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -M $< >> $@
- 
- # Build rules for the Speex codec
- 
- $(OH323_OBJDIR)/%.o : $(SPEEX_SRCDIR)/%.c
- 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
--	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
- 
- $(DEPDIR)/%.dep : $(SPEEX_SRCDIR)/%.c
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OH323_OBJDIR)/ > $@
--	$(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(SPEEX_FLAGS) -I$(SPEEX_INCDIR) $(CFLAGS) -M $< >> $@
- 
+-	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS:-g=) $(CFLAGS) -M $< >> $@
  
  notrace::
+ 	$(MAKE) NOTRACE=1 opt
diff --git a/net/openh323/patches/patch-ac b/net/openh323/patches/patch-ac
index 843690a6776..3e663b5c67b 100644
--- a/net/openh323/patches/patch-ac
+++ b/net/openh323/patches/patch-ac
@@ -1,32 +1,32 @@
-$NetBSD: patch-ac,v 1.4 2004/10/09 06:50:43 mjl Exp $
+$NetBSD: patch-ac,v 1.5 2004/10/09 16:01:23 mjl Exp $
 
---- openh323u.mak.in.orig	2003-08-04 02:03:09.000000000 +0200
-+++ openh323u.mak.in	2004-10-09 04:36:34.000000000 +0200
-@@ -126,7 +126,7 @@
+--- openh323u.mak.in.orig	2004-06-10 15:16:30.000000000 +0200
++++ openh323u.mak.in	2004-10-09 17:48:43.000000000 +0200
+@@ -156,7 +156,7 @@
  # Added auto inclusion of ptlib make rules
  #
  
 -PWLIBDIR	= @PWLIBDIR@
-+PWLIBDIR	= /usr/pkg
++PWLIBDIR	= $(PREFIX)
+ OPENH323DIR	= @OPENH323DIR@
  STDCCFLAGS	+= @STDCCFLAGS@
  LDFLAGS		+= @LDFLAGS@
- ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
-@@ -134,12 +134,12 @@
- H323_VICH263	= @H323_VICH263@      
+@@ -170,12 +170,12 @@
+ NOTRACE	             = @NOTRACE@
  
  ifdef LIBRARY_MAKEFILE
 -include $(PWLIBDIR)/make/unix.mak
 +include $(PWLIBDIR)/share/pwlib/make/unix.mak
  else
- ifdef NOTRACE
+ ifeq ($(NOTRACE), 1)
  OBJDIR_SUFFIX := n
  endif
 -include $(PWLIBDIR)/make/ptlib.mak
 +include $(PWLIBDIR)/share/pwlib/make/ptlib.mak
  endif
  
- 
-@@ -150,10 +150,10 @@
+ LIBDIRS += $(OPENH323DIR)
+@@ -184,9 +184,9 @@
  
  OH323_SRCDIR = $(OPENH323DIR)/src
  ifdef PREFIX
@@ -34,18 +34,22 @@ $NetBSD: patch-ac,v 1.4 2004/10/09 06:50:43 mjl Exp $
 +OH323_INCDIR = $(OPENH323DIR)/include/openh323
  else
 -OH323_INCDIR = $(OPENH323DIR)/include
--endif
 +OH323_INCDIR = $(OPENH323DIR)/include/openh323
-+endif
+ endif
+ ifndef OH323_LIBDIR
  OH323_LIBDIR = $(OPENH323DIR)/lib
- 
- 
-@@ -176,7 +176,7 @@
- 
- 
+@@ -209,11 +209,11 @@
+ #STDCCFLAGS += -DNO_H323_VIDEO
+ #endif
  
 -OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
 +OH323_BASE  = h323
  OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
  
- LDFLAGS	    += -L$(OH323_LIBDIR)
+-LDFLAGS	    += -L$(OH323_LIBDIR)
+-LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
++# LDFLAGS	    += -L$(OH323_LIBDIR)
++LDLIBS	    := $(OH323_LIBDIR)/lib$(OH323_BASE).$(LIB_SUFFIX) $(LDLIBS)
+ 
+ STDCCFLAGS  += -I$(OH323_INCDIR)
+ 
diff --git a/net/openh323/patches/patch-ba b/net/openh323/patches/patch-ba
index e07a1279c8e..f6f7eee6281 100644
--- a/net/openh323/patches/patch-ba
+++ b/net/openh323/patches/patch-ba
@@ -1,3 +1,5 @@
+$NetBSD: patch-ba,v 1.2 2004/10/09 16:01:23 mjl Exp $
+
 --- configure.orig	2004-10-09 00:01:54.000000000 +0200
 +++ configure	2004-10-09 00:02:59.000000000 +0200
 @@ -1825,7 +1825,7 @@