3 files changed, 202 insertions, 67 deletions

diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 3bf060576bff..624c2cf251ed 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fnorb
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.fnorb.org/download/ \
 		ftp://ftp.dstc.edu.au/DSTC/fnorb/
@@ -22,7 +23,7 @@ do-configure:
 	@ (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 	  Makefile.pre.in boot)
 
-FNORB_DIR=	${PYTHON_LIBDIR}/site-packages/Fnorb
+FNORB_DIR=	${PYTHON_SITELIBDIR}/Fnorb
 FNORB_SHAREDIR=	${PREFIX}/share/fnorb
 FNORB_DOCDIR=	${PREFIX}/share/doc/fnorb
 
@@ -30,6 +31,8 @@ post-install:
 	@ ${MKDIR} ${FNORB_DIR}
 	@ (cd ${WRKSRC}/../ && find *.py compiler cos orb parser \
 	  | cpio --quiet -pdum -R ${BINOWN}:${BINGRP} ${FNORB_DIR})
+	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${FNORB_DIR}
+	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${FNORB_DIR}
 	@ ${MKDIR} ${FNORB_SHAREDIR}
 	@ (cd ${WRKSRC}/../ && find script examples \! -name \*.bat \
 	  | cpio --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${FNORB_SHAREDIR})
diff --git a/devel/fnorb/pkg-descr b/devel/fnorb/pkg-descr
index ea021f8ad223..9ebf10191583 100644
--- a/devel/fnorb/pkg-descr
+++ b/devel/fnorb/pkg-descr
@@ -10,7 +10,7 @@ at the University of Queensland in Brisbane, Australia.
 
 IMPORTANT NOTE: 
 
-Fnorb's license allows it to be used freely for academic, research and
+Fnorb's licence allows it to be used freely for academic, research and
 non-commercial purposes.  Commercial use requires the purchase of a licence,
 though you may evaluage the product free for 90 days.  Consult the Fnorb web
 site for licensing updates or further information.
diff --git a/devel/fnorb/pkg-plist b/devel/fnorb/pkg-plist
index c08ec56bdf01..5b77f4f621d6 100644
--- a/devel/fnorb/pkg-plist
+++ b/devel/fnorb/pkg-plist
@@ -1,80 +1,218 @@
+etc/fnorb.cfg.sample
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/CodeGenerator.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/CodeGenerator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/CodeGenerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/IDLCompiler.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/IDLCompiler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/IDLCompiler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/SkelGenerator.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/SkelGenerator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/SkelGenerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/StubGenerator.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/StubGenerator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/StubGenerator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingService.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingContext.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/BindingIterator.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming.idl
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming_skel/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep_skel/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IFR.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IFR.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IFR.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep.idl
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRepImpl.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRepImpl.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRepImpl.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep_skel/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep_skel/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep_skel/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/CORBA.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeCode.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPAcceptor.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Nudger.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Limits.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/BindingIterator.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/BindingIterator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/BindingIterator.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming.idl
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming_skel/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming_skel/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming_skel/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingContext.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingContext.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingContext.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingService.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingService.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/NamingService.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Acceptor.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Acceptor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Acceptor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Any.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Any.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Any.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/BOA.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/BOA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/BOA.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/CORBA.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/CORBA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/CORBA.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Connection.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Connection.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Connection.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/DII.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/DII.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/DII.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/DSI.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/DSI.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/DSI.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/EventHandler.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/EventHandler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/EventHandler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Fixed.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Fixed.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Fixed.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOP.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOP.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOP.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClient.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClient.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClient.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientManager.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientManager.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientManager.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorker.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorker.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorker.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorkerReactive.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorkerReactive.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorkerReactive.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorkerThreaded.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorkerThreaded.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPClientWorkerThreaded.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPConnectionHandler.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPConnectionHandler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPConnectionHandler.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServer.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorker.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorker.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorker.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorkerReactive.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorkerReactive.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorkerReactive.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorkerThreaded.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorkerThreaded.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/GIOPServerWorkerThreaded.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOP.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOP.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOP.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPAcceptor.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPAcceptor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPAcceptor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPConnection.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPConnection.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPConnection.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPProtocol.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPProtocol.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IIOPProtocol.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IOP.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IOP.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/IOP.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/InterfaceRepository.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/InterfaceRepository.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/InterfaceRepository.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Limits.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Limits.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Limits.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Nudger.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Nudger.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Nudger.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/OctetStream.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/OctetStream.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/OctetStream.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Protocol.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Protocol.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Protocol.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Reactor.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Reactor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Reactor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/SelectReactor.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/SelectReactor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/SelectReactor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/ThreadPoolQueue.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/ThreadPoolQueue.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/ThreadPoolQueue.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/ThreadSpecificData.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/ThreadSpecificData.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/ThreadSpecificData.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TkReactor.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TkReactor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TkReactor.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeCode.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeCode.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeCode.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeManager.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeManager.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/TypeManager.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Util.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/Util.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/condvar.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/condvar.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/condvar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/fnorb_thread.py
-lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/uuid.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/fnorb_thread.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/fnorb_thread.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/null_thread.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/null_thread.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/null_thread.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/uuid.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/uuid.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb/uuid.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Declarator.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Declarator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Declarator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/IDLParser.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/IDLParser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/IDLParser.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Prefix.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Prefix.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Prefix.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Stack.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Stack.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/Stack.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/bisonmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/cdrmodule.so
-etc/fnorb.cfg.sample
 share/doc/fnorb/ANNOUNCE
 share/doc/fnorb/CHANGES
-share/doc/fnorb/README
-share/doc/fnorb/LICENSE.HTML
+share/doc/fnorb/Fnorb-Guide.pdf
+share/doc/fnorb/Fnorb-Guide.ps
+share/doc/fnorb/Fnorb-Guide/Fnorb-Guide.css
 share/doc/fnorb/Fnorb-Guide/Fnorb-Guide.html
+share/doc/fnorb/Fnorb-Guide/contents_motif.gif
+share/doc/fnorb/Fnorb-Guide/cross_ref_motif.gif
+share/doc/fnorb/Fnorb-Guide/img1.gif
 share/doc/fnorb/Fnorb-Guide/index.html
+share/doc/fnorb/Fnorb-Guide/next_motif.gif
+share/doc/fnorb/Fnorb-Guide/next_motif_gr.gif
 share/doc/fnorb/Fnorb-Guide/node1.html
 share/doc/fnorb/Fnorb-Guide/node10.html
 share/doc/fnorb/Fnorb-Guide/node11.html
@@ -139,18 +277,36 @@ share/doc/fnorb/Fnorb-Guide/node64.html
 share/doc/fnorb/Fnorb-Guide/node7.html
 share/doc/fnorb/Fnorb-Guide/node8.html
 share/doc/fnorb/Fnorb-Guide/node9.html
-share/doc/fnorb/Fnorb-Guide/Fnorb-Guide.css
-share/doc/fnorb/Fnorb-Guide/contents_motif.gif
-share/doc/fnorb/Fnorb-Guide/cross_ref_motif.gif
-share/doc/fnorb/Fnorb-Guide/img1.gif
-share/doc/fnorb/Fnorb-Guide/next_motif.gif
-share/doc/fnorb/Fnorb-Guide/next_motif_gr.gif
 share/doc/fnorb/Fnorb-Guide/previous_motif.gif
 share/doc/fnorb/Fnorb-Guide/previous_motif_gr.gif
 share/doc/fnorb/Fnorb-Guide/up_motif.gif
 share/doc/fnorb/Fnorb-Guide/up_motif_gr.gif
-share/doc/fnorb/Fnorb-Guide.pdf
-share/doc/fnorb/Fnorb-Guide.ps
+share/doc/fnorb/LICENSE.HTML
+share/doc/fnorb/README
+share/fnorb/examples/hello-world/HelloWorld.idl
+share/fnorb/examples/hello-world/README
+share/fnorb/examples/hello-world/client.py
+share/fnorb/examples/hello-world/server.py
+share/fnorb/examples/misc/Example.idl
+share/fnorb/examples/misc/README
+share/fnorb/examples/misc/client.py
+share/fnorb/examples/misc/server.py
+share/fnorb/examples/naming/README
+share/fnorb/examples/naming/Thermometer.idl
+share/fnorb/examples/naming/client.py
+share/fnorb/examples/naming/server.py
+share/fnorb/examples/threaded/HelloWorld.idl
+share/fnorb/examples/threaded/README
+share/fnorb/examples/threaded/client.py
+share/fnorb/examples/threaded/server.py
+share/fnorb/examples/tkinter/README
+share/fnorb/examples/tkinter/TicToc.idl
+share/fnorb/examples/tkinter/client.py
+share/fnorb/examples/tkinter/server.py
+share/fnorb/examples/unions/README
+share/fnorb/examples/unions/Unions.idl
+share/fnorb/examples/unions/client.py
+share/fnorb/examples/unions/server.py
 share/fnorb/script/__init__.py
 share/fnorb/script/cpp.py
 share/fnorb/script/fnaming
@@ -166,49 +322,25 @@ share/fnorb/script/fnmetrics
 share/fnorb/script/fnmkior
 share/fnorb/script/fnoptions
 share/fnorb/script/fnping
-share/fnorb/examples/naming/Thermometer.idl
-share/fnorb/examples/naming/client.py
-share/fnorb/examples/naming/README
-share/fnorb/examples/naming/server.py
-share/fnorb/examples/misc/Example.idl
-share/fnorb/examples/misc/client.py
-share/fnorb/examples/misc/server.py
-share/fnorb/examples/misc/README
-share/fnorb/examples/unions/Unions.idl
-share/fnorb/examples/unions/client.py
-share/fnorb/examples/unions/README
-share/fnorb/examples/unions/server.py
-share/fnorb/examples/hello-world/HelloWorld.idl
-share/fnorb/examples/hello-world/README
-share/fnorb/examples/hello-world/client.py
-share/fnorb/examples/hello-world/server.py
-share/fnorb/examples/threaded/HelloWorld.idl
-share/fnorb/examples/threaded/README
-share/fnorb/examples/threaded/client.py
-share/fnorb/examples/threaded/server.py
-share/fnorb/examples/tkinter/TicToc.idl
-share/fnorb/examples/tkinter/client.py
-share/fnorb/examples/tkinter/server.py
-share/fnorb/examples/tkinter/README
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming
+@dirrm share/fnorb/script
+@dirrm share/fnorb/examples/unions
+@dirrm share/fnorb/examples/tkinter
+@dirrm share/fnorb/examples/threaded
+@dirrm share/fnorb/examples/naming
+@dirrm share/fnorb/examples/misc
+@dirrm share/fnorb/examples/hello-world
+@dirrm share/fnorb/examples
+@dirrm share/fnorb
+@dirrm share/doc/fnorb/Fnorb-Guide
+@dirrm share/doc/fnorb
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming_skel
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming/CosNaming
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/naming
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep_skel
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository/IntRep
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos/interface_repository
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/cos
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/orb
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/parser
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/compiler
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb
-@dirrm share/doc/fnorb/Fnorb-Guide
-@dirrm share/doc/fnorb
-@dirrm share/fnorb/script
-@dirrm share/fnorb/examples/naming
-@dirrm share/fnorb/examples/misc
-@dirrm share/fnorb/examples/unions
-@dirrm share/fnorb/examples/hello-world
-@dirrm share/fnorb/examples/threaded
-@dirrm share/fnorb/examples/tkinter
-@dirrm share/fnorb/examples
-@dirrm share/fnorb