diff --git a/net/opal/Makefile b/net/opal/Makefile
index d86b8c192a80..79a78ac80507 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.5.6.tar.gz \
-		pwlib_1.1.34.tar.gz
+DISTFILES=	openh323_1.5.7.tar.gz \
+		pwlib_1.1.35.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
diff --git a/net/opal/distinfo b/net/opal/distinfo
index 4a82eb754de8..d3acdd9b447b 100644
--- a/net/opal/distinfo
+++ b/net/opal/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.5.6.tar.gz) = 8c2e865ba11d91a8a525edb9e278bb63
-MD5 (pwlib_1.1.34.tar.gz) = 814e31e14838ec352c8350db58c4363e
+MD5 (openh323_1.5.7.tar.gz) = 7630cf086ace55cc99ecb91eeac90b36
+MD5 (pwlib_1.1.35.tar.gz) = 380af998bbc822723f7d3955cd663b4c
diff --git a/net/opal/files/patch-aa b/net/opal/files/patch-aa
index 4dc96d5c7345..67185d92471a 100644
--- a/net/opal/files/patch-aa
+++ b/net/opal/files/patch-aa
@@ -1,24 +1,45 @@
---- ../pwlib/make/unix.mak.orig	Mon Jun 26 04:17:20 2000
-+++ ../pwlib/make/unix.mak	Sun Apr 29 23:25:49 2001
-@@ -443,9 +443,9 @@
- 
- P_PTHREADS	:= 1
- 
--ifeq ($(MACHTYPE),x86)
--STDCCFLAGS	+= -m486
--endif
-+#ifeq ($(MACHTYPE),x86)
-+#STDCCFLAGS	+= -m486
-+#endif
- 
- ifndef OSRELEASE
- OSRELEASE	:= $(shell sysctl -n kern.osreldate)
-@@ -812,7 +812,7 @@
- 
- else
- 
--OPTCCFLAGS	+= -O2 -DNDEBUG
-+OPTCCFLAGS	+= -DNDEBUG
- #OPTCCFLAGS	+= -DP_USE_INLINES=1
- #OPTCCFLAGS	+= -fconserve-space
- ifneq ($(OSTYPE),macos)
+*** ../pwlib/make/unix.mak.orig	Fri Aug 10 07:35:55 2001
+--- ../pwlib/make/unix.mak	Fri Aug 10 07:45:03 2001
+*************** ifeq ($(OSTYPE),FreeBSD)
+*** 535,545 ****
+  
+  P_PTHREADS	:= 1
+  
+! ifeq ($(MACHTYPE),x86)
+! ifdef CPUTYPE
+! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! endif
+! endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+--- 535,545 ----
+  
+  P_PTHREADS	:= 1
+  
+! #ifeq ($(MACHTYPE),x86)
+! #ifdef CPUTYPE
+! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! #endif
+! #endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+*************** LDFLAGS		+= $(DEBLDFLAGS)
+*** 962,968 ****
+  
+  else
+  
+! OPTCCFLAGS	+= -O3 -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
+--- 962,969 ----
+  
+  else
+  
+! #OPTCCFLAGS	+= -O3 -DNDEBUG
+! OPTCCFLAGS	+= -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index d86b8c192a80..79a78ac80507 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.5.6.tar.gz \
-		pwlib_1.1.34.tar.gz
+DISTFILES=	openh323_1.5.7.tar.gz \
+		pwlib_1.1.35.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
index 4a82eb754de8..d3acdd9b447b 100644
--- a/net/opal3/distinfo
+++ b/net/opal3/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.5.6.tar.gz) = 8c2e865ba11d91a8a525edb9e278bb63
-MD5 (pwlib_1.1.34.tar.gz) = 814e31e14838ec352c8350db58c4363e
+MD5 (openh323_1.5.7.tar.gz) = 7630cf086ace55cc99ecb91eeac90b36
+MD5 (pwlib_1.1.35.tar.gz) = 380af998bbc822723f7d3955cd663b4c
diff --git a/net/opal3/files/patch-aa b/net/opal3/files/patch-aa
index 4dc96d5c7345..67185d92471a 100644
--- a/net/opal3/files/patch-aa
+++ b/net/opal3/files/patch-aa
@@ -1,24 +1,45 @@
---- ../pwlib/make/unix.mak.orig	Mon Jun 26 04:17:20 2000
-+++ ../pwlib/make/unix.mak	Sun Apr 29 23:25:49 2001
-@@ -443,9 +443,9 @@
- 
- P_PTHREADS	:= 1
- 
--ifeq ($(MACHTYPE),x86)
--STDCCFLAGS	+= -m486
--endif
-+#ifeq ($(MACHTYPE),x86)
-+#STDCCFLAGS	+= -m486
-+#endif
- 
- ifndef OSRELEASE
- OSRELEASE	:= $(shell sysctl -n kern.osreldate)
-@@ -812,7 +812,7 @@
- 
- else
- 
--OPTCCFLAGS	+= -O2 -DNDEBUG
-+OPTCCFLAGS	+= -DNDEBUG
- #OPTCCFLAGS	+= -DP_USE_INLINES=1
- #OPTCCFLAGS	+= -fconserve-space
- ifneq ($(OSTYPE),macos)
+*** ../pwlib/make/unix.mak.orig	Fri Aug 10 07:35:55 2001
+--- ../pwlib/make/unix.mak	Fri Aug 10 07:45:03 2001
+*************** ifeq ($(OSTYPE),FreeBSD)
+*** 535,545 ****
+  
+  P_PTHREADS	:= 1
+  
+! ifeq ($(MACHTYPE),x86)
+! ifdef CPUTYPE
+! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! endif
+! endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+--- 535,545 ----
+  
+  P_PTHREADS	:= 1
+  
+! #ifeq ($(MACHTYPE),x86)
+! #ifdef CPUTYPE
+! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! #endif
+! #endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+*************** LDFLAGS		+= $(DEBLDFLAGS)
+*** 962,968 ****
+  
+  else
+  
+! OPTCCFLAGS	+= -O3 -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
+--- 962,969 ----
+  
+  else
+  
+! #OPTCCFLAGS	+= -O3 -DNDEBUG
+! OPTCCFLAGS	+= -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index d86b8c192a80..79a78ac80507 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.5.6.tar.gz \
-		pwlib_1.1.34.tar.gz
+DISTFILES=	openh323_1.5.7.tar.gz \
+		pwlib_1.1.35.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
diff --git a/net/openh323-112/distinfo b/net/openh323-112/distinfo
index 4a82eb754de8..d3acdd9b447b 100644
--- a/net/openh323-112/distinfo
+++ b/net/openh323-112/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.5.6.tar.gz) = 8c2e865ba11d91a8a525edb9e278bb63
-MD5 (pwlib_1.1.34.tar.gz) = 814e31e14838ec352c8350db58c4363e
+MD5 (openh323_1.5.7.tar.gz) = 7630cf086ace55cc99ecb91eeac90b36
+MD5 (pwlib_1.1.35.tar.gz) = 380af998bbc822723f7d3955cd663b4c
diff --git a/net/openh323-112/files/patch-aa b/net/openh323-112/files/patch-aa
index 4dc96d5c7345..67185d92471a 100644
--- a/net/openh323-112/files/patch-aa
+++ b/net/openh323-112/files/patch-aa
@@ -1,24 +1,45 @@
---- ../pwlib/make/unix.mak.orig	Mon Jun 26 04:17:20 2000
-+++ ../pwlib/make/unix.mak	Sun Apr 29 23:25:49 2001
-@@ -443,9 +443,9 @@
- 
- P_PTHREADS	:= 1
- 
--ifeq ($(MACHTYPE),x86)
--STDCCFLAGS	+= -m486
--endif
-+#ifeq ($(MACHTYPE),x86)
-+#STDCCFLAGS	+= -m486
-+#endif
- 
- ifndef OSRELEASE
- OSRELEASE	:= $(shell sysctl -n kern.osreldate)
-@@ -812,7 +812,7 @@
- 
- else
- 
--OPTCCFLAGS	+= -O2 -DNDEBUG
-+OPTCCFLAGS	+= -DNDEBUG
- #OPTCCFLAGS	+= -DP_USE_INLINES=1
- #OPTCCFLAGS	+= -fconserve-space
- ifneq ($(OSTYPE),macos)
+*** ../pwlib/make/unix.mak.orig	Fri Aug 10 07:35:55 2001
+--- ../pwlib/make/unix.mak	Fri Aug 10 07:45:03 2001
+*************** ifeq ($(OSTYPE),FreeBSD)
+*** 535,545 ****
+  
+  P_PTHREADS	:= 1
+  
+! ifeq ($(MACHTYPE),x86)
+! ifdef CPUTYPE
+! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! endif
+! endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+--- 535,545 ----
+  
+  P_PTHREADS	:= 1
+  
+! #ifeq ($(MACHTYPE),x86)
+! #ifdef CPUTYPE
+! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! #endif
+! #endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+*************** LDFLAGS		+= $(DEBLDFLAGS)
+*** 962,968 ****
+  
+  else
+  
+! OPTCCFLAGS	+= -O3 -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
+--- 962,969 ----
+  
+  else
+  
+! #OPTCCFLAGS	+= -O3 -DNDEBUG
+! OPTCCFLAGS	+= -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index d86b8c192a80..79a78ac80507 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.5.6.tar.gz \
-		pwlib_1.1.34.tar.gz
+DISTFILES=	openh323_1.5.7.tar.gz \
+		pwlib_1.1.35.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
diff --git a/net/openh323/distinfo b/net/openh323/distinfo
index 4a82eb754de8..d3acdd9b447b 100644
--- a/net/openh323/distinfo
+++ b/net/openh323/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.5.6.tar.gz) = 8c2e865ba11d91a8a525edb9e278bb63
-MD5 (pwlib_1.1.34.tar.gz) = 814e31e14838ec352c8350db58c4363e
+MD5 (openh323_1.5.7.tar.gz) = 7630cf086ace55cc99ecb91eeac90b36
+MD5 (pwlib_1.1.35.tar.gz) = 380af998bbc822723f7d3955cd663b4c
diff --git a/net/openh323/files/patch-aa b/net/openh323/files/patch-aa
index 4dc96d5c7345..67185d92471a 100644
--- a/net/openh323/files/patch-aa
+++ b/net/openh323/files/patch-aa
@@ -1,24 +1,45 @@
---- ../pwlib/make/unix.mak.orig	Mon Jun 26 04:17:20 2000
-+++ ../pwlib/make/unix.mak	Sun Apr 29 23:25:49 2001
-@@ -443,9 +443,9 @@
- 
- P_PTHREADS	:= 1
- 
--ifeq ($(MACHTYPE),x86)
--STDCCFLAGS	+= -m486
--endif
-+#ifeq ($(MACHTYPE),x86)
-+#STDCCFLAGS	+= -m486
-+#endif
- 
- ifndef OSRELEASE
- OSRELEASE	:= $(shell sysctl -n kern.osreldate)
-@@ -812,7 +812,7 @@
- 
- else
- 
--OPTCCFLAGS	+= -O2 -DNDEBUG
-+OPTCCFLAGS	+= -DNDEBUG
- #OPTCCFLAGS	+= -DP_USE_INLINES=1
- #OPTCCFLAGS	+= -fconserve-space
- ifneq ($(OSTYPE),macos)
+*** ../pwlib/make/unix.mak.orig	Fri Aug 10 07:35:55 2001
+--- ../pwlib/make/unix.mak	Fri Aug 10 07:45:03 2001
+*************** ifeq ($(OSTYPE),FreeBSD)
+*** 535,545 ****
+  
+  P_PTHREADS	:= 1
+  
+! ifeq ($(MACHTYPE),x86)
+! ifdef CPUTYPE
+! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! endif
+! endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+--- 535,545 ----
+  
+  P_PTHREADS	:= 1
+  
+! #ifeq ($(MACHTYPE),x86)
+! #ifdef CPUTYPE
+! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+! #endif
+! #endif
+  
+  ifndef OSRELEASE
+  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
+*************** LDFLAGS		+= $(DEBLDFLAGS)
+*** 962,968 ****
+  
+  else
+  
+! OPTCCFLAGS	+= -O3 -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)
+--- 962,969 ----
+  
+  else
+  
+! #OPTCCFLAGS	+= -O3 -DNDEBUG
+! OPTCCFLAGS	+= -DNDEBUG
+  #OPTCCFLAGS	+= -DP_USE_INLINES=1
+  #OPTCCFLAGS	+= -fconserve-space
+  ifneq ($(OSTYPE),Darwin)