Update pwlib to 1.8.2

The development site silently moved away from openh323.org without
even a notice on that page. That page still advertises 1.5.2 as the
latest version, even though development is alive and kicking and
is at 1.8.2 now. Oh well...

11 files changed, 143 insertions, 175 deletions

diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 972cd7b8788..8df279e49fd 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.32 2004/10/08 22:49:56 mjl Exp $
+# $NetBSD: Makefile,v 1.33 2004/10/09 14:01:03 mjl Exp $
 #
 
-DISTNAME=		pwlib_1.5.2
-PKGNAME=		${DISTNAME:S/_/-/}
+DISTNAME=		pwlib-v1_8_2-src
+PKGNAME=		${DISTNAME:S/_/./g:S/-src//:S/-v/-/}
 # PKGREVISION=		3
+EXTRACT_SUFX=	-tar.gz
 CATEGORIES=		devel
-MASTER_SITES=		http://www.openh323.org/bin/
-COUNTRY_MIRRORS=	at us1 us2 ru de cz
-.for COUNTRY in ${COUNTRY_MIRRORS}
-MASTER_SITES+=		ftp://www.${COUNTRY}.openh323.org/bin/
-.endfor
+# MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openh323/}
+MASTER_SITES+=	http://www.voxgratia.org/releases/
 
 MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.openh323.org/
+HOMEPAGE=		http://sourceforge.net/projects/openh323/
 COMMENT=		Portable Windows Libary
 
 BUILD_DEPENDS=		bison-[0-9]*:../../devel/bison
@@ -24,16 +22,18 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ARHS+=	--disable-sasl --disable-openldap --disable-openssl --disable-expat --disable-video --disable-qos
 PTHREAD_OPTS+=		require
 
-MAKE_ENV+=		PWLIBDIR="${WRKSRC}"
-MAKE_ENV+=		CC="${CC}"
-MAKE_ENV+=		CPLUS="${CXX}"
+MAKE_ENV+=		PWLIBDIR="${WRKSRC}" CC="${CC}" CPLUS="${CXX}"
 ALL_TARGET=		opt
 
 FILES_SUBST+=		LIBTOOL="${LIBTOOL}"
 FILES_SUBST+=		PTHREADS_PREFIX="${BUILDLINK_PREFIX.pthread}"
 
+post-extract:
+	cd ${WRKDIR}; ${TAR} -xf ${DISTNAME:S/$/-tar/}
+
 post-patch:
 	${_PKG_SILENT}cd ${WRKSRC}/make;				\
 	for f in unix.mak lib.mak common.mak; do			\
@@ -44,19 +44,18 @@ post-patch:
 
 do-install:
 	${_PKG_SILENT}cd ${WRKSRC}/src/ptlib/unix && ${MAKE_ENV} ${GMAKE} install
-	${_PKG_SILENT}cd ${WRKSRC}/tools/asnparser && ${MAKE_ENV} ${GMAKE} install
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ptlib/unix/ptlib
-	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/include/ptlib
-	cd ${WRKSRC};						\
-	for f in `${FIND} include -name CVS -prune -o -type f -print`; do	\
-		${INSTALL_DATA} $$f ${PREFIX}/$$f;	\
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make
 	cd ${WRKSRC}/make;						\
 	for f in *.mak; do		\
 		${INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make;		\
 	done
+	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/include/ptlib
+	cd ${WRKSRC};						\
+	for f in `${FIND} include -name CVS -prune -o -name wince -prune -o -name msos -prune -o -type f -print`; do	\
+		${INSTALL_DATA} $$f ${PREFIX}/$$f;	\
+	done
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pwlib/PLIST b/devel/pwlib/PLIST
index 1be989bb6ac..2bf8877b9a0 100644
--- a/devel/pwlib/PLIST
+++ b/devel/pwlib/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/08 22:49:56 mjl Exp $
-bin/asnparser
+@comment $NetBSD: PLIST,v 1.9 2004/10/09 14:01:03 mjl Exp $
 include/ptbuildopts.h
 include/ptbuildopts.h.in
 include/ptclib/asnber.h
@@ -9,6 +8,7 @@ include/ptclib/asnxer.h
 include/ptclib/cypher.h
 include/ptclib/delaychan.h
 include/ptclib/dtmf.h
+include/ptclib/enum.h
 include/ptclib/ftp.h
 include/ptclib/html.h
 include/ptclib/http.h
@@ -24,6 +24,7 @@ include/ptclib/pasn.h
 include/ptclib/pdns.h
 include/ptclib/pils.h
 include/ptclib/pldap.h
+include/ptclib/psasl.h
 include/ptclib/psnmp.h
 include/ptclib/psoap.h
 include/ptclib/pssl.h
@@ -41,6 +42,10 @@ include/ptclib/telnet.h
 include/ptclib/url.h
 include/ptclib/vsdl.h
 include/ptclib/vxml.h
+include/ptclib/xmpp.h
+include/ptclib/xmpp_c2s.h
+include/ptclib/xmpp_muc.h
+include/ptclib/xmpp_roster.h
 include/ptlib.h
 include/ptlib/MacMainIf.h
 include/ptlib/args.h
@@ -50,6 +55,7 @@ include/ptlib/conchan.h
 include/ptlib/config.h
 include/ptlib/contain.h
 include/ptlib/contain.inl
+include/ptlib/critsec.h
 include/ptlib/dict.h
 include/ptlib/dynalink.h
 include/ptlib/ethsock.h
@@ -57,24 +63,34 @@ include/ptlib/file.h
 include/ptlib/filepath.h
 include/ptlib/icmpsock.h
 include/ptlib/indchan.h
+include/ptlib/int64.h
 include/ptlib/ipdsock.h
 include/ptlib/ipsock.h
+include/ptlib/ipsock.h.orig
 include/ptlib/ipxsock.h
 include/ptlib/lists.h
 include/ptlib/mail.h
 include/ptlib/mutex.h
+include/ptlib/notifier.h
+include/ptlib/notifier_ext.h
 include/ptlib/object.h
 include/ptlib/osutil.inl
 include/ptlib/pdirect.h
+include/ptlib/pfactory.h
 include/ptlib/pipechan.h
+include/ptlib/plugin.h
+include/ptlib/pluginmgr.h
 include/ptlib/pprocess.h
+include/ptlib/psharedptr.h
 include/ptlib/pstring.h
 include/ptlib/ptime.h
+include/ptlib/qos.h
 include/ptlib/remconn.h
 include/ptlib/safecoll.h
 include/ptlib/semaphor.h
 include/ptlib/serchan.h
 include/ptlib/sfile.h
+include/ptlib/smartptr.h
 include/ptlib/socket.h
 include/ptlib/sockets.h
 include/ptlib/sound.h
@@ -88,10 +104,13 @@ include/ptlib/thread.h
 include/ptlib/timeint.h
 include/ptlib/timer.h
 include/ptlib/udpsock.h
+include/ptlib/unix/ptlib/beaudio.h
+include/ptlib/unix/ptlib/bevideo.h
 include/ptlib/unix/ptlib/channel.h
 include/ptlib/unix/ptlib/conchan.h
 include/ptlib/unix/ptlib/config.h
 include/ptlib/unix/ptlib/contain.h
+include/ptlib/unix/ptlib/critsec.h
 include/ptlib/unix/ptlib/dynalink.h
 include/ptlib/unix/ptlib/ethsock.h
 include/ptlib/unix/ptlib/file.h
@@ -107,6 +126,7 @@ include/ptlib/unix/ptlib/pprocess.h
 include/ptlib/unix/ptlib/ptime.h
 include/ptlib/unix/ptlib/ptlib.inl
 include/ptlib/unix/ptlib/remconn.h
+include/ptlib/unix/ptlib/resampler.h
 include/ptlib/unix/ptlib/semaphor.h
 include/ptlib/unix/ptlib/serchan.h
 include/ptlib/unix/ptlib/sfile.h
@@ -125,7 +145,6 @@ include/ptlib/unix/ptlib/videoio.h
 include/ptlib/unix/ptlib/videoio1394avc.h
 include/ptlib/vconvert.h
 include/ptlib/version.h
-include/ptlib/vfakeio.h
 include/ptlib/video.h
 include/ptlib/videoio.h
 include/ptlib/videoio1394dc.h
@@ -135,6 +154,7 @@ share/pwlib/make/defaultgui.mak
 share/pwlib/make/gui.mak
 share/pwlib/make/lib.mak
 share/pwlib/make/motif.mak
+share/pwlib/make/plugins.mak
 share/pwlib/make/ptbuildopts.mak
 share/pwlib/make/ptlib.mak
 share/pwlib/make/pwlib.mak
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index c81c3b01c0d..17a2444b183 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/08 21:02:53 mjl Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/10/09 14:01:03 mjl Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PWLIB_BUILDLINK3_MK:=	${PWLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npwlib}
 BUILDLINK_PACKAGES+=	pwlib
 
 .if !empty(PWLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pwlib+=	pwlib>=1.5.2
-BUILDLINK_RECOMMENDED.pwlib+=	pwlib>=1.5.2
+BUILDLINK_DEPENDS.pwlib+=	pwlib>=1.8.2
+BUILDLINK_RECOMMENDED.pwlib+=	pwlib>=1.8.2
 BUILDLINK_PKGSRCDIR.pwlib?=	../../devel/pwlib
 .endif	# PWLIB_BUILDLINK3_MK
 
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 6f96aaa8c50..b16abb0c4b6 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,22 +1,16 @@
-$NetBSD: distinfo,v 1.10 2004/10/09 06:48:39 mjl Exp $
+$NetBSD: distinfo,v 1.11 2004/10/09 14:01:03 mjl Exp $
 
-SHA1 (pwlib_1.5.2.tar.gz) = cbf9170dfe727d2423e312ca701cdf263c42ac86
-Size (pwlib_1.5.2.tar.gz) = 1085203 bytes
-SHA1 (patch-src::ptclib::asner.cxx) = 453ac80169ddf7fb1fdd0e9dc287b4c4b4610fd8
-SHA1 (patch-src::ptclib::asner.cxx) = 453ac80169ddf7fb1fdd0e9dc287b4c4b4610fd8
-SHA1 (patch-src::ptclib::asner.cxx) = 0a33ba537af0d447d9e4b0b07396df707e9a0585
-SHA1 (patch-src::ptclib::asner.cxx) = 0a33ba537af0d447d9e4b0b07396df707e9a0585
-SHA1 (patch-src::ptclib::asner.cxx) = 0a33ba537af0d447d9e4b0b07396df707e9a0585
-SHA1 (patch-ptclib-asnerr.cxx) = 0a33ba537af0d447d9e4b0b07396df707e9a0585
-SHA1 (patch-aa) = fcadfde329db3a68f5ba620b3a4832a8114d2b42
-SHA1 (patch-ab) = ad4aa81c76d6d3c232c3de1b3c8b8f5673c79952
+SHA1 (pwlib-v1_8_2-src-tar.gz) = 2da1504a43763a3127397c9be89ae83fa33c4662
+Size (pwlib-v1_8_2-src-tar.gz) = 1847698 bytes
+SHA1 (patch-aa) = 8974c5a843e6a426d63835aff1dae1a8857edfd1
+SHA1 (patch-ab) = 7d7e09d5403a8b98c832e286eb8403d457164d0e
 SHA1 (patch-ac) = 07fa4e45663840e273e21b8f240ec749fff4a13a
 SHA1 (patch-af) = 6e1042c5c34df4ebb9336a36466a2483fcd2528a
-SHA1 (patch-ai) = 1213423d6215a61d3085fc9e65d15a992c47a238
+SHA1 (patch-ai) = 68e6b9ef55695a01193c1e77eb7960232311e695
 SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0
 SHA1 (patch-al) = 3eca475154580f2cdd461f2e6da131f532173b95
 SHA1 (patch-am) = 5b80fce03de136913dadfdbbdc161edef2f72919
 SHA1 (patch-an) = f79776e86d32bd15fd9f8fe1c0c02196ce4bcd3e
-SHA1 (patch-ba) = d3d14dd17214e099077da02283cbefa0cc24022e
-SHA1 (patch-bb) = 0cdd7c0d9ecca5c40754cd2f880afa6e30acca36
-SHA1 (patch-bc) = 363e11246e2bfb41ff0fc11833ada6210926d6f3
+SHA1 (patch-ba) = 4fb25dba8dc9143d7e655194894db1ee4221a1cf
+SHA1 (patch-bb) = b8ec2bb8616de4a7374604006aee4b79c7a0c716
+SHA1 (patch-bd) = 2d2fb1c6772a1e015cc1bceeb27fda39f57f5acc
diff --git a/devel/pwlib/patches/patch-aa b/devel/pwlib/patches/patch-aa
index 3b1c57723aa..f2d8f95433a 100644
--- a/devel/pwlib/patches/patch-aa
+++ b/devel/pwlib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
+$NetBSD: patch-aa,v 1.6 2004/10/09 14:01:03 mjl Exp $
 
---- make/unix.mak.orig	2003-07-25 00:01:42.000000000 +0200
-+++ make/unix.mak	2004-10-09 00:28:36.000000000 +0200
-@@ -66,13 +66,13 @@
+--- make/unix.mak.orig	2004-09-01 01:52:31.000000000 +0200
++++ make/unix.mak	2004-10-09 12:52:29.000000000 +0200
+@@ -122,13 +122,13 @@
  #
  
  ifndef PWLIBDIR
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  
  ###############################################################################
  #
-@@ -381,9 +381,9 @@
+@@ -427,9 +427,9 @@
  
  ifeq ($(OSTYPE),OpenBSD)
  
@@ -31,40 +31,39 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  
  LDLIBS		+= -lossaudio
  
-@@ -404,9 +404,9 @@
+@@ -444,13 +444,9 @@
  
  ifeq ($(OSTYPE),NetBSD)
  
 -ifeq ($(MACHTYPE),x86)
 -STDCCFLAGS	+= -m486
 -endif
-+# ifeq ($(MACHTYPE),x86)
-+# STDCCFLAGS	+= -m486
-+# endif
+-
+ LDLIBS		+= -lossaudio
+ 
+-STDCCFLAGS += -I$(UNIX_INC_DIR) -I$(PWLIBDIR)/include
++STDCCFLAGS += -I$(PWLIBDIR)/include
  
- ifndef OSRELASE
- OSRELEASE   := $(shell /sbin/sysctl -n kern.osrevision)
-@@ -853,7 +853,7 @@
+ # enable the USE_PTH line to compile using pth
+ # enable the USE_NATIVE_THREADS line to compile using native threads
+@@ -832,13 +828,14 @@
  endif
  
  ifeq ($(P_SHAREDLIB),1)
 -LIB_SUFFIX	= $(SHAREDLIBEXT)
 +LIB_SUFFIX	= la
+ LIB_TYPE	=
  else   
  LIB_SUFFIX	= a 
- ifndef DEBUG
-@@ -865,8 +865,9 @@
- LIB_TYPE	=
- endif
+-LIB_TYPE	= _s
++LIB_TYPE	= 
+ endif # P_SHAREDLIB
  
 +INSTALL_DIR = ${PREFIX}
  ifndef INSTALL_DIR
--INSTALL_DIR	= /usr/local
-+INSTALL_DIR	= /usr/pkg
+ INSTALL_DIR	= /usr/local
  endif
- 
- ifndef INSTALLBIN_DIR
-@@ -891,11 +892,11 @@
+@@ -865,11 +862,11 @@
  
  # Directories
  
@@ -80,7 +79,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  
  ifndef UNIX_SRC_DIR
  UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
-@@ -904,7 +905,7 @@
+@@ -878,7 +875,7 @@
  PW_LIBDIR	= $(PWLIBDIR)/lib
  
  # set name of the PT library
@@ -89,7 +88,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
  PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
  PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
-@@ -972,6 +973,6 @@
+@@ -946,6 +943,6 @@
  # add library directory to library path and include the library
  LDFLAGS		+= -L$(PW_LIBDIR)
  
diff --git a/devel/pwlib/patches/patch-ab b/devel/pwlib/patches/patch-ab
index 320eea08e00..cf9707bb9c0 100644
--- a/devel/pwlib/patches/patch-ab
+++ b/devel/pwlib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
+$NetBSD: patch-ab,v 1.7 2004/10/09 14:01:03 mjl Exp $
 
---- make/lib.mak.orig	2003-07-29 14:33:34.000000000 +0200
-+++ make/lib.mak	2004-10-08 22:11:51.000000000 +0200
-@@ -187,22 +187,18 @@
+--- make/lib.mak.orig	2004-06-17 08:33:07.000000000 +0200
++++ make/lib.mak	2004-10-09 14:49:04.000000000 +0200
+@@ -200,22 +200,18 @@
      LD = $(CPLUS)
    endif
  
@@ -18,9 +18,9 @@ $NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
  	@echo SYSLIBS = $(SYSLIBS)
  	@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
 -	$(LD) $(LDSOOPTS) -o $(LIBDIR)/$(LIBNAME_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(ENDLDLIBS)
-+	/usr/pkg/bin/libtool --tag=CXX --mode=link $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
++	$(LIBTOOL) --tag=CXX --mode=link $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
 +		$(OBJS:.o=.lo) $(EXTLIBS) $(ENDLDLIBS) -rpath $(INSTALLLIB_DIR) \
-+		-version-info $(MAJOR_VERSION):$(MINOR_VERSION)
++		-release $(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER)
  
 -  install: $(LIBDIR)/$(LIBNAME_PAT)
 -	$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
 -	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
 -	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
 +  install: $(LIBDIR)/$(LIB_FILENAME)
-+	/usr/pkg/bin/libtool --mode=install install $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
++	$(LIBTOOL) --mode=install install $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
  
  endif # P_SHAREDLIB
  
diff --git a/devel/pwlib/patches/patch-ai b/devel/pwlib/patches/patch-ai
index 069f4492c33..d82b1ef9d58 100644
--- a/devel/pwlib/patches/patch-ai
+++ b/devel/pwlib/patches/patch-ai
@@ -1,55 +1,49 @@
-$NetBSD: patch-ai,v 1.5 2004/10/09 06:49:23 mjl Exp $
+$NetBSD: patch-ai,v 1.6 2004/10/09 14:01:03 mjl Exp $
 
---- make/common.mak.orig	2003-07-29 13:25:23.000000000 +0200
-+++ make/common.mak	2004-10-09 04:17:05.000000000 +0200
-@@ -273,11 +273,11 @@
+--- make/common.mak.orig	2004-06-10 03:36:44.000000000 +0200
++++ make/common.mak	2004-10-09 12:52:56.000000000 +0200
+@@ -310,11 +310,11 @@
  #
  $(OBJDIR)/%.o : %.cxx 
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
--	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c++ -c $< -o $@
-+	/usr/pkg/bin/libtool --tag=CXX --mode=compile $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
  
  $(OBJDIR)/%.o : %.c 
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
 -	$(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
-+	/usr/pkg/bin/libtool --tag=CC --mode=compile $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
  
  #
  # create list of object files 
-@@ -300,12 +300,12 @@
- $(DEPDIR)/%.dep : %.cxx 
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OBJDIR) > $@
--	$(CPLUS) $(STDCCFLAGS) -M $< >> $@
-+	/usr/pkg/bin/libtool --tag=CXX --mode=compile $(CPLUS) $(STDCCFLAGS) -M $< >> $@
- 
- $(DEPDIR)/%.dep : %.c 
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OBJDIR) > $@
--	$(CC) $(STDCCFLAGS) -M $< >> $@
-+	/usr/pkg/bin/libtool --tag=CC --mode=compile $(CC) $(STDCCFLAGS) -M $< >> $@
- 
- #
- # add in good files to delete
-@@ -344,7 +344,7 @@
+@@ -379,7 +379,7 @@
  # directory
  	@if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi
  endif
 -	$(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
-+	/usr/pkg/bin/libtool --tag=CXX --mode=link $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
++	$(LIBTOOL) --mode=link --tag=CXX $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
  ifeq ($(OSTYPE),VxWorks)
  	$(LD)   --split-by-reloc 65535 -r   $(OBJS) -o $@ 
  endif
-@@ -380,7 +380,7 @@
+@@ -405,7 +405,7 @@
  ifndef INSTALL_OVERRIDE
  
  install:	$(TARGET)
 -	$(INSTALL) $(TARGET) $(INSTALLBIN_DIR)
-+	/usr/pkg/bin/libtool --mode=install $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
  endif
  
  # ifdef PROG
-@@ -451,7 +451,7 @@
+@@ -413,7 +413,7 @@
+ 
+ $(PWLIBDIR)/include/ptlib.h.gch: $(PWLIBDIR)/include/ptlib.h
+ 	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
+-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
+ 
+ PCH	:= $(PWLIBDIR)/include/ptlib.h.gch
+ 
+@@ -481,7 +481,7 @@
  	@$(MAKE) DEBUG= libs
  
  libs ::
@@ -58,7 +52,7 @@ $NetBSD: patch-ai,v 1.5 2004/10/09 06:49:23 mjl Exp $
  
  else
  
-@@ -480,7 +480,7 @@
+@@ -510,7 +510,7 @@
  optlibs :: libs
  
  libs ::
diff --git a/devel/pwlib/patches/patch-ba b/devel/pwlib/patches/patch-ba
index 00177913344..df4c61cfb04 100644
--- a/devel/pwlib/patches/patch-ba
+++ b/devel/pwlib/patches/patch-ba
@@ -1,16 +1,13 @@
-$NetBSD: patch-ba,v 1.1 2004/10/08 21:02:54 mjl Exp $
+$NetBSD: patch-ba,v 1.2 2004/10/09 14:01:03 mjl Exp $
 
-Work around a C/C++ difference in openssl/dh.h
-
---- src/ptclib/pssl.cxx.orig	2004-10-08 19:13:06.000000000 +0200
-+++ src/ptclib/pssl.cxx	2004-10-08 19:43:28.000000000 +0200
-@@ -732,6 +732,9 @@
+--- src/ptclib/pssl.cxx.orig	2004-10-09 13:31:30.000000000 +0200
++++ src/ptclib/pssl.cxx	2004-10-09 13:33:39.000000000 +0200
+@@ -743,7 +743,7 @@
+     DH_free(dh);
  }
  
- 
-+#define d2i_DHparams_bio(bp,x) (DH *)ASN1_d2i_bio((char *(*)(...))DH_new, \
-+      (char *(*)(...))d2i_DHparams,(bp),(unsigned char **)(x))
-+
- BOOL PSSLDiffieHellman::Load(const PFilePath & dhFile,
-                              PSSLFileTypes fileType)
- {
+-#ifdef __BEOS__
++#if defined(__BEOS__) || defined(__NetBSD__)
+ // 2/21/04 Yuri Kiryanov - fix for compiler choke on BeOS for usage of
+ // SSL function d2i_DHparams_bio below in PSSLDiffieHellman::Load
+ #undef  d2i_DHparams_bio
diff --git a/devel/pwlib/patches/patch-bb b/devel/pwlib/patches/patch-bb
index 15e5db19f22..93c70a18a70 100644
--- a/devel/pwlib/patches/patch-bb
+++ b/devel/pwlib/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2004/10/08 21:02:54 mjl Exp $
+$NetBSD: patch-bb,v 1.2 2004/10/09 14:01:03 mjl Exp $
 
---- src/ptlib/unix/socket.cxx.orig	2004-10-08 19:49:23.000000000 +0200
-+++ src/ptlib/unix/socket.cxx	2004-10-08 19:50:36.000000000 +0200
-@@ -312,6 +312,7 @@
+--- src/ptlib/unix/socket.cxx.orig	2004-08-24 09:08:11.000000000 +0200
++++ src/ptlib/unix/socket.cxx	2004-10-09 13:40:31.000000000 +0200
+@@ -349,6 +349,7 @@
  #endif
  
  #if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_QNX)
@@ -10,3 +10,12 @@ $NetBSD: patch-bb,v 1.1 2004/10/08 21:02:54 mjl Exp $
  #include <sys/sysctl.h>
  #endif
  
+@@ -762,7 +763,7 @@
+ }
+ 
+ 
+-#if P_HAS_RECVMSG
++#if P_HAS_RECVMSG && P_HAS_PKTINFO
+ 
+ int PSocket::os_recvfrom(
+       void * buf,     // Data to be written as URGENT TCP data.
diff --git a/devel/pwlib/patches/patch-bc b/devel/pwlib/patches/patch-bc
deleted file mode 100644
index 4b71c46f129..00000000000
--- a/devel/pwlib/patches/patch-bc
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2004/10/09 06:48:39 mjl Exp $
-
-Fix CAN-2004-0097 vulnerability.
-From: %FreeBSD: /repoman/r/pcvs/ports/devel/pwlib/files/patch-src::ptclib::asner.cxx,v 1.1 2004/06/08 06:27:43 sobomax Exp %
-
---- src/ptclib/asnper.cxx	2004/06/03 14:44:43	1.1
-+++ src/ptclib/asnper.cxx	2004/06/03 14:50:35
-@@ -4926,6 +4926,11 @@
-     return -1;
- 
-   value += lower;
-+
-+  // clamp value to upper limit
-+  if (value > upper)
-+    value = upper;
-+
-   return 0;
- }
- 
-@@ -4970,7 +4975,13 @@
-     unsigned base;
-     if (!MultiBitDecode(CountBits(upper - lower + 1), base))
-       return -1;
--    return lower + base;   // 10.9.4.1
-+    len = lower + base;   // 10.9.4.1
-+
-+    // clamp value to upper limit
-+    if (len > upper)
-+      len = upper;
-+
-+    return len;
-   }
- 
-   if (upper < 65536)  // 10.9.3.3
-@@ -4981,13 +4992,20 @@
-   if (IsAtEnd())
-     return -1;
- 
--  if (SingleBitDecode() == 0)
--    return MultiBitDecode(7, len) ? 0 : -1;   // 10.9.3.6
-+  if (SingleBitDecode() == 0) {
-+    if (!MultiBitDecode(7, len))   // 10.9.3.6
-+      return -1;                // 10.9.3.8 unsupported
-+  }
-+  else if (SingleBitDecode() == 0) {
-+    if (!MultiBitDecode(14, len))    // 10.9.3.7
-+      return -1;  // 10.9.3.8 unsupported
-+  }
- 
--  if (SingleBitDecode() == 0)
--    return MultiBitDecode(14, len) ? 0 : -1;    // 10.9.3.7
-+  // clamp value to upper limit
-+  if (len > upper)
-+    len = upper;
- 
--  return -1;  // 10.9.3.8 unsupported
-+  return 0;
- }
- 
-
diff --git a/devel/pwlib/patches/patch-bd b/devel/pwlib/patches/patch-bd
new file mode 100644
index 00000000000..617d4b97358
--- /dev/null
+++ b/devel/pwlib/patches/patch-bd
@@ -0,0 +1,16 @@
+$NetBSD: patch-bd,v 1.1 2004/10/09 14:01:03 mjl Exp $
+
+--- include/ptlib/ipsock.h.orig	2004-10-09 13:10:10.000000000 +0200
++++ include/ptlib/ipsock.h	2004-10-09 13:47:49.000000000 +0200
+@@ -796,7 +796,11 @@
+       * @return TRUE if host is able to capture incoming address, else FALSE
+       */
+     BOOL SetCaptureReceiveToAddress()
++#if P_HAS_PKTINFO
+     { if (!SetOption(IP_PKTINFO, 1, SOL_IP)) return FALSE; catchReceiveToAddr = TRUE; return TRUE; }
++#else
++    { return FALSE; }
++#endif
+ 
+     /**
+       * return the interface address of the last incoming packet