Update pwlib to 1.5.2

Make this compile with newer gcc versions, and bring in a more
recent version of the library. No changelog is available unfortunately.

14 files changed, 250 insertions, 201 deletions

diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 97ed9104a5d..2ce0b042e5d 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: Makefile,v 1.30 2004/10/08 21:02:53 mjl Exp $
 #
 
-DISTNAME=		pwlib_1.4.4
-PKGNAME=		pwlib-1.4.4
-PKGREVISION=		4
+DISTNAME=		pwlib_1.5.2
+PKGNAME=		${DISTNAME:S/_/-/}
+# PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		http://www.openh323.org/bin/
 COUNTRY_MIRRORS=	at us1 us2 ru de cz
@@ -22,6 +22,7 @@ USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 PTHREAD_OPTS+=		require
 
@@ -47,7 +48,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ptlib/unix/ptlib
 	cd ${WRKSRC}/include;						\
-	for f in `${FIND} . -type f -print | ${GREP} -v '/CVS/'`; do	\
+	for f in `${FIND} . -name CVS -prune -o -type f -print | ${GREP} -v 'ptbuildopts'`; do	\
 		${INSTALL_DATA} $$f ${PREFIX}/include/`${DIRNAME} $$f`;	\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make
diff --git a/devel/pwlib/PLIST b/devel/pwlib/PLIST
index 678af59d829..4a9ba95ec89 100644
--- a/devel/pwlib/PLIST
+++ b/devel/pwlib/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/10/08 21:02:53 mjl Exp $
 bin/asnparser
-include/ptclib/cypher.h
+include/ptclib/asnber.h
 include/ptclib/asner.h
+include/ptclib/asnper.h
+include/ptclib/asnxer.h
+include/ptclib/cypher.h
 include/ptclib/delaychan.h
 include/ptclib/dtmf.h
 include/ptclib/ftp.h
@@ -16,8 +19,13 @@ include/ptclib/memfile.h
 include/ptclib/mime.h
 include/ptclib/modem.h
 include/ptclib/pasn.h
+include/ptclib/pdns.h
+include/ptclib/pils.h
+include/ptclib/pldap.h
 include/ptclib/psnmp.h
+include/ptclib/psoap.h
 include/ptclib/pssl.h
+include/ptclib/pstun.h
 include/ptclib/ptts.h
 include/ptclib/pwavfile.h
 include/ptclib/pxml.h
@@ -29,41 +37,9 @@ include/ptclib/shttpsvc.h
 include/ptclib/socks.h
 include/ptclib/telnet.h
 include/ptclib/url.h
+include/ptclib/vsdl.h
 include/ptclib/vxml.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/dynalink.h
-include/ptlib/unix/ptlib/ethsock.h
-include/ptlib/unix/ptlib/file.h
-include/ptlib/unix/ptlib/filepath.h
-include/ptlib/unix/ptlib/icmpsock.h
-include/ptlib/unix/ptlib/ipdsock.h
-include/ptlib/unix/ptlib/ipsock.h
-include/ptlib/unix/ptlib/mutex.h
-include/ptlib/unix/ptlib/pdirect.h
-include/ptlib/unix/ptlib/pipechan.h
-include/ptlib/unix/ptlib/pmachdep.h
-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/semaphor.h
-include/ptlib/unix/ptlib/serchan.h
-include/ptlib/unix/ptlib/sfile.h
-include/ptlib/unix/ptlib/socket.h
-include/ptlib/unix/ptlib/sound.h
-include/ptlib/unix/ptlib/timer.h
-include/ptlib/unix/ptlib/svcproc.h
-include/ptlib/unix/ptlib/syncpoint.h
-include/ptlib/unix/ptlib/tcpsock.h
-include/ptlib/unix/ptlib/textfile.h
-include/ptlib/unix/ptlib/thread.h
-include/ptlib/unix/ptlib/timeint.h
-include/ptlib/unix/ptlib/udpsock.h
-include/ptlib/unix/ptlib/video.h
-include/ptlib/unix/ptlib/videoio.h
+include/ptlib.h
 include/ptlib/MacMainIf.h
 include/ptlib/args.h
 include/ptlib/array.h
@@ -110,26 +86,61 @@ include/ptlib/thread.h
 include/ptlib/timeint.h
 include/ptlib/timer.h
 include/ptlib/udpsock.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/dynalink.h
+include/ptlib/unix/ptlib/ethsock.h
+include/ptlib/unix/ptlib/file.h
+include/ptlib/unix/ptlib/filepath.h
+include/ptlib/unix/ptlib/icmpsock.h
+include/ptlib/unix/ptlib/ipdsock.h
+include/ptlib/unix/ptlib/ipsock.h
+include/ptlib/unix/ptlib/mutex.h
+include/ptlib/unix/ptlib/pdirect.h
+include/ptlib/unix/ptlib/pipechan.h
+include/ptlib/unix/ptlib/pmachdep.h
+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/semaphor.h
+include/ptlib/unix/ptlib/serchan.h
+include/ptlib/unix/ptlib/sfile.h
+include/ptlib/unix/ptlib/socket.h
+include/ptlib/unix/ptlib/sound.h
+include/ptlib/unix/ptlib/svcproc.h
+include/ptlib/unix/ptlib/syncpoint.h
+include/ptlib/unix/ptlib/tcpsock.h
+include/ptlib/unix/ptlib/textfile.h
+include/ptlib/unix/ptlib/thread.h
+include/ptlib/unix/ptlib/timeint.h
+include/ptlib/unix/ptlib/timer.h
+include/ptlib/unix/ptlib/udpsock.h
+include/ptlib/unix/ptlib/video.h
+include/ptlib/unix/ptlib/videoio.h
+include/ptlib/unix/ptlib/videoio1394avc.h
 include/ptlib/vconvert.h
 include/ptlib/vfakeio.h
 include/ptlib/video.h
 include/ptlib/videoio.h
 include/ptlib/videoio1394dc.h
-include/ptlib.h
 lib/libpt.la
 share/pwlib/make/common.mak
 share/pwlib/make/defaultgui.mak
 share/pwlib/make/gui.mak
 share/pwlib/make/lib.mak
 share/pwlib/make/motif.mak
+share/pwlib/make/ptbuildopts.mak
 share/pwlib/make/ptlib.mak
 share/pwlib/make/pwlib.mak
 share/pwlib/make/qt.mak
 share/pwlib/make/unix.mak
 share/pwlib/make/xlib.mak
-@dirrm share/pwlib/make
-@dirrm share/pwlib
+@dirrm include/ptclib
 @dirrm include/ptlib/unix/ptlib
 @dirrm include/ptlib/unix
 @dirrm include/ptlib
-@dirrm include/ptclib
+@dirrm share/pwlib/make
+@dirrm share/pwlib
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index bab9a85d360..c81c3b01c0d 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/08 21:02:53 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.4.4nb3
-BUILDLINK_RECOMMENDED.pwlib+=	pwlib>=1.4.4nb4
+BUILDLINK_DEPENDS.pwlib+=	pwlib>=1.5.2
+BUILDLINK_RECOMMENDED.pwlib+=	pwlib>=1.5.2
 BUILDLINK_PKGSRCDIR.pwlib?=	../../devel/pwlib
 .endif	# PWLIB_BUILDLINK3_MK
 
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 53054105498..f7b362775cb 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,15 +1,22 @@
-$NetBSD: distinfo,v 1.8 2003/01/06 22:00:40 grant Exp $
+$NetBSD: distinfo,v 1.9 2004/10/08 21:02:53 mjl Exp $
 
-SHA1 (pwlib_1.4.4.tar.gz) = 5432ba3e4771fb281283161bb956b5a19e5200c7
-Size (pwlib_1.4.4.tar.gz) = 907721 bytes
-SHA1 (patch-aa) = 13d2e40664a725bf59569d837df54c06d707eda2
-SHA1 (patch-ab) = 0be1aec99542d677f8ec983a358712b2f5f5cc58
+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) = d45d246db4f674837aa273305b10b82b7db78eae
+SHA1 (patch-ab) = ad4aa81c76d6d3c232c3de1b3c8b8f5673c79952
 SHA1 (patch-ac) = 07fa4e45663840e273e21b8f240ec749fff4a13a
-SHA1 (patch-ae) = 02d323e53908049146c4b389e2b2d32ebf2c4a61
-SHA1 (patch-af) = e410a5e918e4e957ad8902b29f0a2f385c116bde
-SHA1 (patch-ag) = 1356cbddc7bbf4d63108128e8cc6d3e544d39e9b
-SHA1 (patch-ai) = 62a5ba1fa41b05d1b90738870c00a4d1785c6ecc
+SHA1 (patch-af) = 6e1042c5c34df4ebb9336a36466a2483fcd2528a
+SHA1 (patch-ai) = ee2e8401ecaeb3b1e4bffe1a08d09a66290e95f1
 SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0
-SHA1 (patch-al) = 29256c9f08e9e76779676651f4dd9569a747ced0
+SHA1 (patch-al) = 3eca475154580f2cdd461f2e6da131f532173b95
 SHA1 (patch-am) = 5b80fce03de136913dadfdbbdc161edef2f72919
 SHA1 (patch-an) = f79776e86d32bd15fd9f8fe1c0c02196ce4bcd3e
+SHA1 (patch-ba) = d3d14dd17214e099077da02283cbefa0cc24022e
+SHA1 (patch-bb) = 0cdd7c0d9ecca5c40754cd2f880afa6e30acca36
+SHA1 (patch-bc) = 1c1f2a5e7482c8366e6ac3dd58621e077c6e5176
diff --git a/devel/pwlib/patches/patch-aa b/devel/pwlib/patches/patch-aa
index 423555bd3b7..2b949133c90 100644
--- a/devel/pwlib/patches/patch-aa
+++ b/devel/pwlib/patches/patch-aa
@@ -1,51 +1,52 @@
-$NetBSD: patch-aa,v 1.3 2002/12/01 18:31:42 jdolecek Exp $
+$NetBSD: patch-aa,v 1.4 2004/10/08 21:02:53 mjl Exp $
 
---- make/unix.mak.orig	Tue Nov 12 12:56:46 2002
-+++ make/unix.mak	Sun Dec  1 15:11:09 2002
-@@ -433,7 +433,7 @@
- 
+--- make/unix.mak.orig	2003-07-25 00:01:42.000000000 +0200
++++ make/unix.mak	2004-10-08 21:27:52.000000000 +0200
+@@ -66,7 +66,7 @@
+ #
  
  ifndef PWLIBDIR
 -PWLIBDIR = $(HOME)/pwlib
-+PWLIBDIR = @PREFIX@
++PWLIBDIR = /usr/pkg
  endif
  
- ###############################################################################
-@@ -819,19 +819,15 @@
+ ####################################################
+@@ -381,9 +381,9 @@
  
- P_PTHREADS	:= 1
+ ifeq ($(OSTYPE),OpenBSD)
  
 -ifeq ($(MACHTYPE),x86)
 -STDCCFLAGS	+= -m486
 -endif
--
- STDCCFLAGS	+= -DP_NETBSD
++# ifeq ($(MACHTYPE),x86)
++# STDCCFLAGS	+= -m486
++# endif
+ 
  LDLIBS		+= -lossaudio
  
- ifdef P_PTHREADS
--STDCCFLAGS += -I/usr/pkg/pthreads/include
--LDFLAGS	+= -L/usr/pkg/pthreads/lib
--LDLIBS	+= -lpthread
--CC              := /usr/pkg/pthreads/bin/pgcc
--CPLUS           := /usr/pkg/pthreads/bin/pg++
-+# need to put $(PREFIX)/include after library includes, so that
-+# the build wouldn't pick up potential intalled pwlib headers
-+# from $(PREFIX)
-+STDCCFLAGS += -I$(UNIX_INC_DIR) -I$(PWLIBDIR)/include -I@PTHREADS_PREFIX@/include
-+LDFLAGS	+= -L@PTHREADS_PREFIX@/lib -lpthread
- endif
+@@ -404,9 +404,9 @@
+ 
+ ifeq ($(OSTYPE),NetBSD)
+ 
+-ifeq ($(MACHTYPE),x86)
+-STDCCFLAGS	+= -m486
+-endif
++# ifeq ($(MACHTYPE),x86)
++# STDCCFLAGS	+= -m486
++# endif
  
- P_USE_RANLIB		:= 1
-@@ -1222,7 +1218,7 @@
+ ifndef OSRELASE
+ OSRELEASE   := $(shell /sbin/sysctl -n kern.osrevision)
+@@ -853,7 +853,7 @@
  endif
  
  ifeq ($(P_SHAREDLIB),1)
--LIB_SUFFIX	= so
+-LIB_SUFFIX	= $(SHAREDLIBEXT)
 +LIB_SUFFIX	= la
- else
- LIB_SUFFIX	= a
+ else   
+ LIB_SUFFIX	= a 
  ifndef DEBUG
-@@ -1234,8 +1230,9 @@
+@@ -865,8 +865,9 @@
  LIB_TYPE	=
  endif
  
@@ -56,7 +57,23 @@ $NetBSD: patch-aa,v 1.3 2002/12/01 18:31:42 jdolecek Exp $
  endif
  
  ifndef INSTALLBIN_DIR
-@@ -1303,7 +1300,7 @@
+@@ -891,11 +892,11 @@
+ 
+ # Directories
+ 
+-ifdef PREFIX
+-UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
+-else
++#ifdef PREFIX
++#UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
++#else
+ UNIX_INC_DIR	= $(PWLIBDIR)/include/ptlib/unix
+-endif
++#endif
+ 
+ ifndef UNIX_SRC_DIR
+ UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
+@@ -904,7 +905,7 @@
  PW_LIBDIR	= $(PWLIBDIR)/lib
  
  # set name of the PT library
@@ -65,7 +82,7 @@ $NetBSD: patch-aa,v 1.3 2002/12/01 18:31:42 jdolecek Exp $
  PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
  PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
  PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
-@@ -1432,6 +1429,6 @@
+@@ -972,6 +973,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 c6fcc3d2ab3..320eea08e00 100644
--- a/devel/pwlib/patches/patch-ab
+++ b/devel/pwlib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2002/12/03 13:00:18 jdolecek Exp $
+$NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
 
---- make/lib.mak.orig	Thu Oct 17 15:44:27 2002
-+++ make/lib.mak	Sat Nov 30 20:35:47 2002
-@@ -146,20 +146,16 @@
+--- 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 @@
      LD = $(CPLUS)
    endif
  
@@ -14,19 +14,21 @@ $NetBSD: patch-ab,v 1.5 2002/12/03 13:00:18 jdolecek Exp $
  
 -  $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
 +  $(LIBDIR)/$(LIB_FILENAME): $(OBJS)
+ 	@echo EXTLIBS = $(EXTLIBS)
+ 	@echo SYSLIBS = $(SYSLIBS)
  	@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
 -	$(LD) $(LDSOOPTS) -o $(LIBDIR)/$(LIBNAME_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(ENDLDLIBS)
-+	@LIBTOOL@ --tag=CXX $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
++	/usr/pkg/bin/libtool --tag=CXX --mode=link $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
 +		$(OBJS:.o=.lo) $(EXTLIBS) $(ENDLDLIBS) -rpath $(INSTALLLIB_DIR) \
 +		-version-info $(MAJOR_VERSION):$(MINOR_VERSION)
  
 -  install: $(LIBDIR)/$(LIBNAME_PAT)
 -	$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
--	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME)
+-	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
 -	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
 -	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
 +  install: $(LIBDIR)/$(LIB_FILENAME)
-+	@LIBTOOL@ $(BSD_INSTALL_DATA) $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)
++	/usr/pkg/bin/libtool --mode=install install $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
  
  endif # P_SHAREDLIB
  
diff --git a/devel/pwlib/patches/patch-ae b/devel/pwlib/patches/patch-ae
deleted file mode 100644
index f1d83c26a95..00000000000
--- a/devel/pwlib/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/12/01 18:31:42 jdolecek Exp $
-
---- ./src/ptlib/unix/switch.cxx.orig	Sat Aug 11 17:38:43 2001
-+++ ./src/ptlib/unix/switch.cxx	Sun Aug 18 23:09:15 2002
-@@ -82,8 +82,10 @@
- #endif
- #endif
- 
--#if defined(P_FREEBSD) || defined(P_OPENBSD)
-+#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)
- #define	SET_STACK	context[0]._jb[2] = (int)stackTop-16;
-+#include <sys/mman.h>
-+#define	USE_MMAP	MAP_ANON | MAP_PRIVATE
- #endif
- 
- #ifdef __BEOS__
diff --git a/devel/pwlib/patches/patch-af b/devel/pwlib/patches/patch-af
index 0f122c4619a..73c4691f971 100644
--- a/devel/pwlib/patches/patch-af
+++ b/devel/pwlib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/12/01 18:31:42 jdolecek Exp $
+$NetBSD: patch-af,v 1.3 2004/10/08 21:02:54 mjl Exp $
 
 --- ./src/ptlib/unix/Makefile.orig	Wed Aug 14 17:18:54 2002
 +++ ./src/ptlib/unix/Makefile	Sun Aug 18 23:09:15 2002
@@ -7,31 +7,31 @@ $NetBSD: patch-af,v 1.2 2002/12/01 18:31:42 jdolecek Exp $
  
  $(OBJDIR)/regcomp.o: $(COMMON_SRC_DIR)/regex/regcomp.c
 -	$(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
-+	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
  
  $(OBJDIR)/regexec.o: $(COMMON_SRC_DIR)/regex/regexec.c
 -	$(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
-+	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
  
  $(OBJDIR)/regerror.o: $(COMMON_SRC_DIR)/regex/regerror.c
 -	$(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
-+	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
  
  $(OBJDIR)/regfree.o: $(COMMON_SRC_DIR)/regex/regfree.c
 -	$(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
-+	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $<
  
  
  ifdef REQUIRES_SEPARATE_SWITCH 
  $(OBJDIR)/switch.o: ./switch.cxx
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
 -	$(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CXX $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CXX --mode=compile $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
  endif
  
  $(OBJDIR)/getdate.tab.o: $(GETDATE_SOURCE)
 -	$(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
  
  $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOURCE)
  	$(CC) $(STDCCFLAGS) -M $< >> $@
diff --git a/devel/pwlib/patches/patch-ag b/devel/pwlib/patches/patch-ag
deleted file mode 100644
index 25a5ce2c931..00000000000
--- a/devel/pwlib/patches/patch-ag
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/01/06 20:41:53 jdolecek Exp $
-
---- src/ptlib/unix/oss.cxx.orig	Sun Dec  1 17:31:20 2002
-+++ src/ptlib/unix/oss.cxx	Sun Dec  1 17:35:35 2002
-@@ -485,6 +485,7 @@
- 	// there are also entries for /dev/dsp0.0 dsp0.1 dsp0.2 and dsp0.3
- 	// We will ignore these N.M devices.
- 
-+#ifndef P_NETBSD
-         // Look for dsp
-         if (filename == "dsp") {
-           dsp.SetAt(0, devname);
-@@ -497,6 +498,20 @@
-             dsp.SetAt(cardnum+1, devname);
- 	  }
-         }
-+#else
-+        // Look for dsp
-+        if (filename == "audio") {
-+          dsp.SetAt(0, devname);
-+        }
-+        // Look for audioN. Insert at position cardnum + 1
-+        if ((filename.GetLength() > 5) && (filename.Left(5) == "audio")) {
-+	  PString numbers = filename.Mid(5); // get everything after 'audio'
-+	  if (IsNumericString(numbers)) {
-+            PINDEX cardnum = numbers.AsInteger();
-+            dsp.SetAt(cardnum+1, devname);
-+	  }
-+        }
-+#endif
-         // Look for mixer
-         if (filename == "mixer") {
-           mixer.SetAt(0, devname);
-@@ -586,6 +601,8 @@
-   // present, probe /dev for sound devices and return the first detected device.
-   if (PFile::Exists("/dev/dsp")) {
-     return "/dev/dsp";
-+  } else if (PFile::Exists("/dev/audio")) {
-+    return "/dev/audio";
-   } else {
-     // return the first dsp device detected
-     PStringArray devicenames;
diff --git a/devel/pwlib/patches/patch-ai b/devel/pwlib/patches/patch-ai
index aba9fcecc92..b4737888629 100644
--- a/devel/pwlib/patches/patch-ai
+++ b/devel/pwlib/patches/patch-ai
@@ -1,51 +1,51 @@
-$NetBSD: patch-ai,v 1.3 2002/12/03 20:20:37 jdolecek Exp $
+$NetBSD: patch-ai,v 1.4 2004/10/08 21:02:54 mjl Exp $
 
---- make/common.mak.orig	Thu Oct 10 06:43:44 2002
-+++ make/common.mak	Tue Dec  3 20:29:43 2002
-@@ -261,11 +261,11 @@
+--- make/common.mak.orig	2003-07-29 13:25:23.000000000 +0200
++++ make/common.mak	2004-10-08 22:12:34.000000000 +0200
+@@ -273,11 +273,11 @@
  #
  $(OBJDIR)/%.o : %.cxx 
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
--	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	@LIBTOOL@ --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c++ -c $< -o $@
++	/usr/pkg/bin/libtool --tag=CXX --mode=compile $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
  
  $(OBJDIR)/%.o : %.c 
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
--	$(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
-+	@LIBTOOL@ --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
++	/usr/pkg/bin/libtool --tag=CC --mode=compile $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
  
  #
  # create list of object files 
-@@ -288,12 +288,12 @@
+@@ -300,12 +300,12 @@
  $(DEPDIR)/%.dep : %.cxx 
  	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OBJDIR)/ > $@
+ 	@printf %s $(OBJDIR) > $@
 -	$(CPLUS) $(STDCCFLAGS) -M $< >> $@
-+	@LIBTOOL@ --tag=CXX $(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)/ > $@
+ 	@printf %s $(OBJDIR) > $@
 -	$(CC) $(STDCCFLAGS) -M $< >> $@
-+	@LIBTOOL@ --tag=CC $(CC) $(STDCCFLAGS) -M $< >> $@
++	/usr/pkg/bin/libtool --tag=CC --mode=compile $(CC) $(STDCCFLAGS) -M $< >> $@
  
  #
  # add in good files to delete
-@@ -328,7 +328,7 @@
+@@ -344,7 +344,7 @@
  # directory
  	@if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi
  endif
 -	$(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
-+	@LIBTOOL@ --tag=CXX $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
++	/usr/pkg/bin/libtool --tag=CXX --mode=link $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
  ifeq ($(OSTYPE),VxWorks)
  	$(LD)   --split-by-reloc 65535 -r   $(OBJS) -o $@ 
  endif
-@@ -356,7 +356,7 @@
+@@ -380,7 +380,7 @@
  ifndef INSTALL_OVERRIDE
  
  install:	$(TARGET)
 -	$(INSTALL) $(TARGET) $(INSTALLBIN_DIR)
-+	@LIBTOOL@ $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
++	/usr/pkg/bin/libtool --mode=install $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
  endif
  
  # ifdef PROG
diff --git a/devel/pwlib/patches/patch-al b/devel/pwlib/patches/patch-al
index 30e78e9efab..a4c13f73646 100644
--- a/devel/pwlib/patches/patch-al
+++ b/devel/pwlib/patches/patch-al
@@ -1,30 +1,14 @@
-$NetBSD: patch-al,v 1.1 2002/12/01 18:32:37 jdolecek Exp $
+$NetBSD: patch-al,v 1.2 2004/10/08 21:02:54 mjl Exp $
 
---- src/ptlib/unix/tlibthrd.cxx.orig	Sun Dec  1 14:18:03 2002
-+++ src/ptlib/unix/tlibthrd.cxx	Sun Dec  1 14:18:10 2002
-@@ -818,18 +818,20 @@
- void PThread::Sleep(const PTimeInterval & timeout)
- {
-   PTime lastTime;
--  PTime targetTime = lastTime + timeout;
--  do {
-+  PTime targetTime = PTime() + timeout;
-+
-+  sched_yield();
-+  lastTime = PTime();
-+
-+  while (lastTime < targetTime) {
-     P_timeval tval = targetTime - lastTime;
+--- src/ptlib/unix/tlibthrd.cxx.orig	2003-05-16 19:40:55.000000000 +0200
++++ src/ptlib/unix/tlibthrd.cxx	2004-10-08 17:07:19.000000000 +0200
+@@ -1032,7 +1032,9 @@
      if (select(0, NULL, NULL, NULL, tval) < 0 && errno != EINTR)
        break;
  
--#ifndef P_NETBSD
++#ifndef P_NETBSD
      pthread_testcancel();
--#endif /* P_NETBSD */
++#endif
  
      lastTime = PTime();
--  } while (lastTime < targetTime);
-+  }
- }
- 
- 
+   }
diff --git a/devel/pwlib/patches/patch-ba b/devel/pwlib/patches/patch-ba
new file mode 100644
index 00000000000..00177913344
--- /dev/null
+++ b/devel/pwlib/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2004/10/08 21:02:54 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 @@
+ }
+ 
+ 
++#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)
+ {
diff --git a/devel/pwlib/patches/patch-bb b/devel/pwlib/patches/patch-bb
new file mode 100644
index 00000000000..15e5db19f22
--- /dev/null
+++ b/devel/pwlib/patches/patch-bb
@@ -0,0 +1,12 @@
+$NetBSD: patch-bb,v 1.1 2004/10/08 21:02:54 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 @@
+ #endif
+ 
+ #if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_QNX)
++#include <sys/param.h>
+ #include <sys/sysctl.h>
+ #endif
+ 
diff --git a/devel/pwlib/patches/patch-bc b/devel/pwlib/patches/patch-bc
new file mode 100644
index 00000000000..63ead020661
--- /dev/null
+++ b/devel/pwlib/patches/patch-bc
@@ -0,0 +1,57 @@
+$NetBSD: patch-bc,v 1.1 2004/10/08 21:02:54 mjl 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;
+ }
+ 
+