From 96c9e4a03d663b4834939d1e2c33ed91893b0302 Mon Sep 17 00:00:00 2001
From: Roger Hardiman <roger@FreeBSD.org>
Date: Fri, 18 Aug 2000 18:27:03 +0000
Subject: [PATCH] Upgrade to OpenH323 1.1 Beta 3 (with PWLib 1.1 pl 17) Note,
 the actual H323 VideoPhone client has been seperated out into a seperate
 port, called OhPhone.

---
 net/opal/Makefile            | 10 ++++------
 net/opal/distinfo            |  4 ++--
 net/opal/pkg-comment         |  2 +-
 net/opal/pkg-descr           | 16 +++++++++-------
 net/opal/pkg-plist           |  2 +-
 net/opal3/Makefile           | 10 ++++------
 net/opal3/distinfo           |  4 ++--
 net/opal3/pkg-comment        |  2 +-
 net/opal3/pkg-descr          | 16 +++++++++-------
 net/opal3/pkg-plist          |  2 +-
 net/openh323-112/Makefile    | 10 ++++------
 net/openh323-112/distinfo    |  4 ++--
 net/openh323-112/pkg-comment |  2 +-
 net/openh323-112/pkg-descr   | 16 +++++++++-------
 net/openh323-112/pkg-plist   |  2 +-
 net/openh323/Makefile        | 10 ++++------
 net/openh323/distinfo        |  4 ++--
 net/openh323/pkg-comment     |  2 +-
 net/openh323/pkg-descr       | 16 +++++++++-------
 net/openh323/pkg-plist       |  2 +-
 20 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/net/opal/Makefile b/net/opal/Makefile
index d7d2e33b93e1..36c941ecf0f4 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.1b1
+PORTVERSION=	1.1b3
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1beta1${EXTRACT_SUFX} \
-		pwlib_min_1.1pl15.tar.gz
+DISTFILES=	openh323_1.1beta3.tar.gz \
+		pwlib_min_1.1pl17.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
@@ -27,11 +27,9 @@ MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-MAN1=		ohphone.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sample/obj_${OPSYS}_${THE_MACHTYPE}_r/ohphone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sample/ohphone.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
 
 
 .include <bsd.port.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
index 89f6526b7c95..e8a35fbc099d 100644
--- a/net/opal/distinfo
+++ b/net/opal/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.1beta1.tar.gz) = f63eb1d2bc0b2e069871e39624197f20
-MD5 (pwlib_min_1.1pl15.tar.gz) = 8c3f75735d9cac7beb530468e2e77bbb
+MD5 (openh323_1.1beta3.tar.gz) = d02e02348fa6697d43bc955605d365c7
+MD5 (pwlib_min_1.1pl17.tar.gz) = 4089db2aafb42cd019b8d96e9b4407a6
diff --git a/net/opal/pkg-comment b/net/opal/pkg-comment
index 03bfcbc1e0d3..cef461a24fb2 100644
--- a/net/opal/pkg-comment
+++ b/net/opal/pkg-comment
@@ -1 +1 @@
-A H323 Video Conferencing package
+A H323 Video Conferencing library, used with OhPhone
diff --git a/net/opal/pkg-descr b/net/opal/pkg-descr
index 02b0018ea277..6a835b6f0f33 100644
--- a/net/opal/pkg-descr
+++ b/net/opal/pkg-descr
@@ -1,14 +1,16 @@
 OpenH323 is a multi-platform H323 Video Conferencing library.
 
-This can be used to make H323 Video Conferencing applications.
-and the port produces a sample application called OhPhone.
+This can be used to make H323 Video Conferencing applications
+and the port produces a sample application called simph323.
 
-OhPhone can exchange full duplex audio and video with other H323
-compliant video conferencing programs including Microsoft NetMeeting
-It requires a sound card for audio support and a Bt848/878 based
-video card (using the bktr driver) for video capture.
+However, a fully featured H323 client, including Video
+as well as Audio can be found in the OhPhone Port.
 
-The OpenH323library and ohpone make use of PWLib. http://www.equival.com
+Simph323 and OhPhone can exchange full duplex audio with other H323
+compliant video conferencing programs including Microsoft NetMeeting.
+OhPhone adds full Video support.
+
+The OpenH323 library makes use of PWLib. http://www.equival.com
 PWLib is a multi-platform code library that can be used to write
 applications that will compile and run on the BSD Unixes, Windows, Linux
 and a few other Unix variants. It was developed by Equivalence Ltd Pty.
diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist
index 3dc0b2a593bd..910567db261b 100644
--- a/net/opal/pkg-plist
+++ b/net/opal/pkg-plist
@@ -1 +1 @@
-bin/ohphone
+bin/simph323
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index d7d2e33b93e1..36c941ecf0f4 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.1b1
+PORTVERSION=	1.1b3
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1beta1${EXTRACT_SUFX} \
-		pwlib_min_1.1pl15.tar.gz
+DISTFILES=	openh323_1.1beta3.tar.gz \
+		pwlib_min_1.1pl17.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
@@ -27,11 +27,9 @@ MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-MAN1=		ohphone.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sample/obj_${OPSYS}_${THE_MACHTYPE}_r/ohphone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sample/ohphone.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
 
 
 .include <bsd.port.mk>
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
index 89f6526b7c95..e8a35fbc099d 100644
--- a/net/opal3/distinfo
+++ b/net/opal3/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.1beta1.tar.gz) = f63eb1d2bc0b2e069871e39624197f20
-MD5 (pwlib_min_1.1pl15.tar.gz) = 8c3f75735d9cac7beb530468e2e77bbb
+MD5 (openh323_1.1beta3.tar.gz) = d02e02348fa6697d43bc955605d365c7
+MD5 (pwlib_min_1.1pl17.tar.gz) = 4089db2aafb42cd019b8d96e9b4407a6
diff --git a/net/opal3/pkg-comment b/net/opal3/pkg-comment
index 03bfcbc1e0d3..cef461a24fb2 100644
--- a/net/opal3/pkg-comment
+++ b/net/opal3/pkg-comment
@@ -1 +1 @@
-A H323 Video Conferencing package
+A H323 Video Conferencing library, used with OhPhone
diff --git a/net/opal3/pkg-descr b/net/opal3/pkg-descr
index 02b0018ea277..6a835b6f0f33 100644
--- a/net/opal3/pkg-descr
+++ b/net/opal3/pkg-descr
@@ -1,14 +1,16 @@
 OpenH323 is a multi-platform H323 Video Conferencing library.
 
-This can be used to make H323 Video Conferencing applications.
-and the port produces a sample application called OhPhone.
+This can be used to make H323 Video Conferencing applications
+and the port produces a sample application called simph323.
 
-OhPhone can exchange full duplex audio and video with other H323
-compliant video conferencing programs including Microsoft NetMeeting
-It requires a sound card for audio support and a Bt848/878 based
-video card (using the bktr driver) for video capture.
+However, a fully featured H323 client, including Video
+as well as Audio can be found in the OhPhone Port.
 
-The OpenH323library and ohpone make use of PWLib. http://www.equival.com
+Simph323 and OhPhone can exchange full duplex audio with other H323
+compliant video conferencing programs including Microsoft NetMeeting.
+OhPhone adds full Video support.
+
+The OpenH323 library makes use of PWLib. http://www.equival.com
 PWLib is a multi-platform code library that can be used to write
 applications that will compile and run on the BSD Unixes, Windows, Linux
 and a few other Unix variants. It was developed by Equivalence Ltd Pty.
diff --git a/net/opal3/pkg-plist b/net/opal3/pkg-plist
index 3dc0b2a593bd..910567db261b 100644
--- a/net/opal3/pkg-plist
+++ b/net/opal3/pkg-plist
@@ -1 +1 @@
-bin/ohphone
+bin/simph323
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index d7d2e33b93e1..36c941ecf0f4 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.1b1
+PORTVERSION=	1.1b3
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1beta1${EXTRACT_SUFX} \
-		pwlib_min_1.1pl15.tar.gz
+DISTFILES=	openh323_1.1beta3.tar.gz \
+		pwlib_min_1.1pl17.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
@@ -27,11 +27,9 @@ MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-MAN1=		ohphone.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sample/obj_${OPSYS}_${THE_MACHTYPE}_r/ohphone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sample/ohphone.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
 
 
 .include <bsd.port.mk>
diff --git a/net/openh323-112/distinfo b/net/openh323-112/distinfo
index 89f6526b7c95..e8a35fbc099d 100644
--- a/net/openh323-112/distinfo
+++ b/net/openh323-112/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.1beta1.tar.gz) = f63eb1d2bc0b2e069871e39624197f20
-MD5 (pwlib_min_1.1pl15.tar.gz) = 8c3f75735d9cac7beb530468e2e77bbb
+MD5 (openh323_1.1beta3.tar.gz) = d02e02348fa6697d43bc955605d365c7
+MD5 (pwlib_min_1.1pl17.tar.gz) = 4089db2aafb42cd019b8d96e9b4407a6
diff --git a/net/openh323-112/pkg-comment b/net/openh323-112/pkg-comment
index 03bfcbc1e0d3..cef461a24fb2 100644
--- a/net/openh323-112/pkg-comment
+++ b/net/openh323-112/pkg-comment
@@ -1 +1 @@
-A H323 Video Conferencing package
+A H323 Video Conferencing library, used with OhPhone
diff --git a/net/openh323-112/pkg-descr b/net/openh323-112/pkg-descr
index 02b0018ea277..6a835b6f0f33 100644
--- a/net/openh323-112/pkg-descr
+++ b/net/openh323-112/pkg-descr
@@ -1,14 +1,16 @@
 OpenH323 is a multi-platform H323 Video Conferencing library.
 
-This can be used to make H323 Video Conferencing applications.
-and the port produces a sample application called OhPhone.
+This can be used to make H323 Video Conferencing applications
+and the port produces a sample application called simph323.
 
-OhPhone can exchange full duplex audio and video with other H323
-compliant video conferencing programs including Microsoft NetMeeting
-It requires a sound card for audio support and a Bt848/878 based
-video card (using the bktr driver) for video capture.
+However, a fully featured H323 client, including Video
+as well as Audio can be found in the OhPhone Port.
 
-The OpenH323library and ohpone make use of PWLib. http://www.equival.com
+Simph323 and OhPhone can exchange full duplex audio with other H323
+compliant video conferencing programs including Microsoft NetMeeting.
+OhPhone adds full Video support.
+
+The OpenH323 library makes use of PWLib. http://www.equival.com
 PWLib is a multi-platform code library that can be used to write
 applications that will compile and run on the BSD Unixes, Windows, Linux
 and a few other Unix variants. It was developed by Equivalence Ltd Pty.
diff --git a/net/openh323-112/pkg-plist b/net/openh323-112/pkg-plist
index 3dc0b2a593bd..910567db261b 100644
--- a/net/openh323-112/pkg-plist
+++ b/net/openh323-112/pkg-plist
@@ -1 +1 @@
-bin/ohphone
+bin/simph323
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index d7d2e33b93e1..36c941ecf0f4 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.1b1
+PORTVERSION=	1.1b3
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.de.openh323.org/bin/ \
 		http://www.ru.openh323.org/bin/
-DISTFILES=	openh323_1.1beta1${EXTRACT_SUFX} \
-		pwlib_min_1.1pl15.tar.gz
+DISTFILES=	openh323_1.1beta3.tar.gz \
+		pwlib_min_1.1pl17.tar.gz
 
 MAINTAINER=	roger@freebsd.org
 
@@ -27,11 +27,9 @@ MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-MAN1=		ohphone.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sample/obj_${OPSYS}_${THE_MACHTYPE}_r/ohphone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sample/ohphone.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
 
 
 .include <bsd.port.mk>
diff --git a/net/openh323/distinfo b/net/openh323/distinfo
index 89f6526b7c95..e8a35fbc099d 100644
--- a/net/openh323/distinfo
+++ b/net/openh323/distinfo
@@ -1,2 +1,2 @@
-MD5 (openh323_1.1beta1.tar.gz) = f63eb1d2bc0b2e069871e39624197f20
-MD5 (pwlib_min_1.1pl15.tar.gz) = 8c3f75735d9cac7beb530468e2e77bbb
+MD5 (openh323_1.1beta3.tar.gz) = d02e02348fa6697d43bc955605d365c7
+MD5 (pwlib_min_1.1pl17.tar.gz) = 4089db2aafb42cd019b8d96e9b4407a6
diff --git a/net/openh323/pkg-comment b/net/openh323/pkg-comment
index 03bfcbc1e0d3..cef461a24fb2 100644
--- a/net/openh323/pkg-comment
+++ b/net/openh323/pkg-comment
@@ -1 +1 @@
-A H323 Video Conferencing package
+A H323 Video Conferencing library, used with OhPhone
diff --git a/net/openh323/pkg-descr b/net/openh323/pkg-descr
index 02b0018ea277..6a835b6f0f33 100644
--- a/net/openh323/pkg-descr
+++ b/net/openh323/pkg-descr
@@ -1,14 +1,16 @@
 OpenH323 is a multi-platform H323 Video Conferencing library.
 
-This can be used to make H323 Video Conferencing applications.
-and the port produces a sample application called OhPhone.
+This can be used to make H323 Video Conferencing applications
+and the port produces a sample application called simph323.
 
-OhPhone can exchange full duplex audio and video with other H323
-compliant video conferencing programs including Microsoft NetMeeting
-It requires a sound card for audio support and a Bt848/878 based
-video card (using the bktr driver) for video capture.
+However, a fully featured H323 client, including Video
+as well as Audio can be found in the OhPhone Port.
 
-The OpenH323library and ohpone make use of PWLib. http://www.equival.com
+Simph323 and OhPhone can exchange full duplex audio with other H323
+compliant video conferencing programs including Microsoft NetMeeting.
+OhPhone adds full Video support.
+
+The OpenH323 library makes use of PWLib. http://www.equival.com
 PWLib is a multi-platform code library that can be used to write
 applications that will compile and run on the BSD Unixes, Windows, Linux
 and a few other Unix variants. It was developed by Equivalence Ltd Pty.
diff --git a/net/openh323/pkg-plist b/net/openh323/pkg-plist
index 3dc0b2a593bd..910567db261b 100644
--- a/net/openh323/pkg-plist
+++ b/net/openh323/pkg-plist
@@ -1 +1 @@
-bin/ohphone
+bin/simph323