- Further patches to make Fnorb 1.1 compatible with the tighter socket

  binding code in Python 2.0.  Again, compatibility with Python 1.5.2 should
  be maintained.
- Thanks to Brad Chapman <chapmanb@arches.uga.edu> for his help.

PR:		22690
Submitted by:	maintainer

2 files changed, 34 insertions, 4 deletions

diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index e9fd0d2434de..67a1f187e25b 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fnorb
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.fnorb.org/download/ \
 		ftp://ftp.dstc.edu.au/DSTC/fnorb/
diff --git a/devel/fnorb/files/patch-aa b/devel/fnorb/files/patch-aa
index a3f429d9609b..e88e22c99830 100644
--- a/devel/fnorb/files/patch-aa
+++ b/devel/fnorb/files/patch-aa
@@ -1,8 +1,7 @@
 Allow the port to work with Python 2.0.  This should be fixed in the next
-release of Fnorb.  (Caveat:  There may be more broken calls to
-socket.connect.)
+release of Fnorb.  (Caveat:  There may be more broken calls.)
 
-Thanks to Mike Meyer <mwm@mired.org> for submitting this.
+Thanks to Mike Meyer <mwm@mired.org>, Brad Chapman <chapmanb@arches.uga.edu>.
 
 -- Johann <johann@egenetics.com>
 
@@ -18,3 +17,34 @@ Thanks to Mike Meyer <mwm@mired.org> for submitting this.
  
  	    # Set the socket by default to NON-blocking mode.
  	    self.__socket.setblocking(0)
+--- ../orb/IIOPAcceptor.py.orig	Mon Apr  3 16:08:34 2000
++++ ../orb/IIOPAcceptor.py	Wed Nov  8 15:06:29 2000
+@@ -65,7 +65,7 @@
+ 	try:
+ 	    # Create a socket on which to listen for connection requests.
+ 	    self.__socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+-	    self.__socket.bind(host, port)
++	    self.__socket.bind((host, port))
+ 	    self.__socket.listen(5)
+ 
+ 	    # Get the host name, the IP address and the port number of the
+--- ../orb/Nudger.py.orig	Mon Apr  3 16:08:34 2000
++++ ../orb/Nudger.py	Wed Nov  8 15:06:50 2000
+@@ -54,7 +54,7 @@
+ 	try:
+ 	    # Create a socket on which to listen for connection requests.
+ 	    listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+-	    listen_socket.bind(host, port)
++	    listen_socket.bind((host, port))
+ 	    listen_socket.listen(1)
+ 
+ 	    # Get the host name, the IP address and the port number of the
+@@ -85,7 +85,7 @@
+ 	    # has been performed on the listening socket!  If you don't believe
+ 	    # me read Stevens' Network Programming ;^)
+ 	    self.__client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+-	    self.__client.connect(listen_host, listen_port)
++	    self.__client.connect((listen_host, listen_port))
+ 
+ 	    # And finally, we do an 'accept' to complete the connection.
+ 	    (self.__server, address) = listen_socket.accept()