- Certain files were installed to incorrect locations, leading to serious

  breakage.
- Fixing the problem lead to a more general overhaul of the port.
- Bumped PORTREVISION.

PR: 25304
Submitted by: MAINTAINER

2 files changed, 95 insertions, 57 deletions

diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 9dad96a411e1..c4270aaacc61 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fnorb
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.fnorb.org/download/ \
 		ftp://ftp.dstc.edu.au/DSTC/fnorb/
@@ -23,24 +23,33 @@ ALL_TARGET=
 
 CPIO=		cpio --quiet -pdum -R
 FNORB_DIR=	${PYTHON_SITELIBDIR}/Fnorb
-FNORB_SHAREDIR=	${PREFIX}/share/fnorb
+FNORB_EGDIR=	${PREFIX}/share/examples/fnorb
 FNORB_DOCDIR=	${PREFIX}/share/doc/fnorb
+FNORB_BINS=	fnaming fnendian fnfeed fngen fnidl fnifr fnior fnlogger \
+		fnmetrics fnmkior fnoptions fnping
 
 do-configure:
 	@ (cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 	  Makefile.pre.in boot)
 
+post-build:
+	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -f ${WRKSRC}
+	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -f ${WRKSRC}
+
 post-install:
-	@ ${MKDIR} ${FNORB_DIR}
-	@ (cd ${WRKSRC} && find *.py compiler cos orb parser \! -name \*.orig \
+	@ ${MKDIR} ${FNORB_DIR}/script
+	@ (cd ${WRKSRC} && find *.py *.pyc *.pyo compiler cos orb parser \
+	  script/*.py script/*.pyc script/*.pyo \! -name \*.orig \
 	  | ${CPIO} ${BINOWN}:${BINGRP} ${FNORB_DIR})
-	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -f ${FNORB_DIR}
-	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -f ${FNORB_DIR}
-	@ ${MKDIR} ${FNORB_SHAREDIR}
-	@ (cd ${WRKSRC} && find script examples \! -name \*.bat \
-	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${FNORB_SHAREDIR})
+	@ ${MKDIR} ${PREFIX}/bin
+.for fnscript in ${FNORB_BINS}
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/script/${fnscript} ${PREFIX}/bin
+.endfor
 	@ ${INSTALL_DATA} ${WRKSRC}/etc/fnorb.cfg \
 	  ${PREFIX}/etc/fnorb.cfg.sample
+	@ ${MKDIR} ${FNORB_EGDIR}
+	@ (cd ${WRKSRC}/examples && find * \
+	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${FNORB_EGDIR})
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${FNORB_DOCDIR}
 	@ (cd ${WRKSRC}/doc && find . \
diff --git a/devel/fnorb/pkg-plist b/devel/fnorb/pkg-plist
index 26bd6e75e297..3932fbc5c425 100644
--- a/devel/fnorb/pkg-plist
+++ b/devel/fnorb/pkg-plist
@@ -80,6 +80,18 @@
 %%PORTDOCS%%share/doc/fnorb/Fnorb-Guide/up_motif_gr.gif
 %%PORTDOCS%%share/doc/fnorb/LICENSE.HTML
 %%PORTDOCS%%share/doc/fnorb/README
+bin/fnaming
+bin/fnendian
+bin/fnfeed
+bin/fngen
+bin/fnidl
+bin/fnifr
+bin/fnior
+bin/fnlogger
+bin/fnmetrics
+bin/fnmkior
+bin/fnoptions
+bin/fnping
 etc/fnorb.cfg.sample
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Fnorb/__init__.pyc
@@ -281,56 +293,73 @@ 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/Fnorb/script/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/cpp.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/cpp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/cpp.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/fnidl.py
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/fnidl.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script/fnidl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/bisonmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/cdrmodule.so
-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
-share/fnorb/script/fnendian
-share/fnorb/script/fnfeed
-share/fnorb/script/fngen
-share/fnorb/script/fnidl
-share/fnorb/script/fnidl.py
-share/fnorb/script/fnifr
-share/fnorb/script/fnior
-share/fnorb/script/fnlogger
-share/fnorb/script/fnmetrics
-share/fnorb/script/fnmkior
-share/fnorb/script/fnoptions
-share/fnorb/script/fnping
-@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
+share/examples/fnorb/hello-world/HelloWorld.idl
+share/examples/fnorb/hello-world/README
+share/examples/fnorb/hello-world/client.py
+share/examples/fnorb/hello-world/client.pyc
+share/examples/fnorb/hello-world/client.pyo
+share/examples/fnorb/hello-world/server.py
+share/examples/fnorb/hello-world/server.pyc
+share/examples/fnorb/hello-world/server.pyo
+share/examples/fnorb/misc/Example.idl
+share/examples/fnorb/misc/README
+share/examples/fnorb/misc/client.py
+share/examples/fnorb/misc/client.pyc
+share/examples/fnorb/misc/client.pyo
+share/examples/fnorb/misc/server.py
+share/examples/fnorb/misc/server.pyc
+share/examples/fnorb/misc/server.pyo
+share/examples/fnorb/naming/README
+share/examples/fnorb/naming/Thermometer.idl
+share/examples/fnorb/naming/client.py
+share/examples/fnorb/naming/client.pyc
+share/examples/fnorb/naming/client.pyo
+share/examples/fnorb/naming/server.py
+share/examples/fnorb/naming/server.pyc
+share/examples/fnorb/naming/server.pyo
+share/examples/fnorb/threaded/HelloWorld.idl
+share/examples/fnorb/threaded/README
+share/examples/fnorb/threaded/client.py
+share/examples/fnorb/threaded/client.pyc
+share/examples/fnorb/threaded/client.pyo
+share/examples/fnorb/threaded/server.py
+share/examples/fnorb/threaded/server.pyc
+share/examples/fnorb/threaded/server.pyo
+share/examples/fnorb/tkinter/README
+share/examples/fnorb/tkinter/TicToc.idl
+share/examples/fnorb/tkinter/client.py
+share/examples/fnorb/tkinter/client.pyc
+share/examples/fnorb/tkinter/client.pyo
+share/examples/fnorb/tkinter/server.py
+share/examples/fnorb/tkinter/server.pyc
+share/examples/fnorb/tkinter/server.pyo
+share/examples/fnorb/unions/README
+share/examples/fnorb/unions/Unions.idl
+share/examples/fnorb/unions/client.py
+share/examples/fnorb/unions/client.pyc
+share/examples/fnorb/unions/client.pyo
+share/examples/fnorb/unions/server.py
+share/examples/fnorb/unions/server.pyc
+share/examples/fnorb/unions/server.pyo
+@dirrm share/examples/fnorb/unions
+@dirrm share/examples/fnorb/tkinter
+@dirrm share/examples/fnorb/threaded
+@dirrm share/examples/fnorb/naming
+@dirrm share/examples/fnorb/misc
+@dirrm share/examples/fnorb/hello-world
+@dirrm share/examples/fnorb
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/Fnorb/script
 @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