4 files changed, 21 insertions, 15 deletions

diff --git a/devel/py-ro/Makefile b/devel/py-ro/Makefile
index df1c1f78c2bf..9f258b6b3110 100644
--- a/devel/py-ro/Makefile
+++ b/devel/py-ro/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ro
-PORTVERSION=	2.7
+PORTVERSION=	2.8
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pyro
@@ -22,8 +22,8 @@ USE_PYDISTUTILS=	yes
 DOCSDIR=	${PREFIX}/share/doc/py-ro
 EXAMPLESDIR=	${PREFIX}/share/examples/py-ro
 
-post-patch:
-	${PERL} -pi -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/setup.cfg
+post-extract:
+	@${FIND} ${WRKSRC}/examples -name '*.pyc' -exec ${RM} -f {} \;
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/py-ro/distinfo b/devel/py-ro/distinfo
index baa4e0ae1fde..bb919d619b0c 100644
--- a/devel/py-ro/distinfo
+++ b/devel/py-ro/distinfo
@@ -1 +1 @@
-MD5 (Pyro-2.7.tar.gz) = fdcfcaa570d139db2359a6d3afe48135
+MD5 (Pyro-2.8.tar.gz) = fa9c24a57fd94c3e919b086358907c5b
diff --git a/devel/py-ro/files/patch-setup.py b/devel/py-ro/files/patch-setup.py
index 4df14536d6ef..08dd6b857bff 100644
--- a/devel/py-ro/files/patch-setup.py
+++ b/devel/py-ro/files/patch-setup.py
@@ -1,20 +1,24 @@
---- setup.py.orig	Fri Mar 22 18:04:34 2002
-+++ setup.py	Fri Mar 22 18:11:18 2002
-@@ -36,16 +36,11 @@
- 	else:	
+--- setup.py.orig	Sat May 18 04:48:44 2002
++++ setup.py	Tue May 21 04:24:22 2002
+@@ -35,19 +35,13 @@
+ 		print 'This script will install Pyro on your system.'
  		# first, confirm the installation path of the scripts.
  		scripts=[]
 -		scr=raw_input('Do you want the Pyro scripts (in bin/) installed (y/n)? ')
 +		scr='y'
+ 		config='setup.cfg'
  		if scr.lower()=='y':
  			cp=ConfigParser()
- 			cp.read('setup.cfg')
- 			loc=cp.get('install','install-scripts')
+ 			cp.read(config)
+ 			#loc=cp.get('install','install-scripts')
 -			print 'Some Pyro scripts may conflict with system tools already on your system.'
 -			print 'Choose your script install directory carefully.'
--			scr=raw_input('Where do you want them to be installed ('+loc+')? ')
+-			print 'The default location is usually something like C:\\Python\\Scripts'
+-			print 'on Windows and /usr/local/bin on Unixes.'
+-			#scr=raw_input('Where do you want them to be installed ('+loc+')? ')
+-			scr=raw_input('Where do you want them to be installed (empty=default loc.)? ')
 -			if scr:
--				loc=scr
- 			cp.set('install','install-scripts',loc)
- 			cp.write(open('setup.cfg','w'))
- 		
++			if 0:
+ 				loc=scr
+ 				if not cp.has_section('install'):
+ 					cp.add_section('install')
diff --git a/devel/py-ro/pkg-plist b/devel/py-ro/pkg-plist
index 905c1804779f..ddb79b571c79 100644
--- a/devel/py-ro/pkg-plist
+++ b/devel/py-ro/pkg-plist
@@ -87,8 +87,10 @@ lib/%%PYTHON_VERSION%%/site-packages/Pyro/xnsc.pyo
 %%PORTDOCS%%share/examples/py-ro/agent2/serv/server.py
 %%PORTDOCS%%share/examples/py-ro/agent2/serv/shop.py
 %%PORTDOCS%%share/examples/py-ro/attributes/Readme.txt
+%%PORTDOCS%%share/examples/py-ro/attributes/attrs_proxy.py
 %%PORTDOCS%%share/examples/py-ro/attributes/client.py
 %%PORTDOCS%%share/examples/py-ro/attributes/server.py
+%%PORTDOCS%%share/examples/py-ro/attributes/t.py
 %%PORTDOCS%%share/examples/py-ro/autoreconnect/Readme.txt
 %%PORTDOCS%%share/examples/py-ro/autoreconnect/client.py
 %%PORTDOCS%%share/examples/py-ro/autoreconnect/server.py