1 files changed, 82 insertions, 87 deletions

diff --git a/textproc/rubber/pkg-plist b/textproc/rubber/pkg-plist
index e95657999b07..a81711055847 100644
--- a/textproc/rubber/pkg-plist
+++ b/textproc/rubber/pkg-plist
@@ -1,92 +1,87 @@
 bin/rubber
 bin/rubber-info
 bin/rubber-pipe
-%%PYTHON_SITELIBDIR%%/rubber/__init__.py
-%%PYTHON_SITELIBDIR%%/rubber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/rubber/cmd_info.py
-%%PYTHON_SITELIBDIR%%/rubber/cmd_info.pyc
-%%PYTHON_SITELIBDIR%%/rubber/cmd_pipe.py
-%%PYTHON_SITELIBDIR%%/rubber/cmd_pipe.pyc
-%%PYTHON_SITELIBDIR%%/rubber/cmdline.py
-%%PYTHON_SITELIBDIR%%/rubber/cmdline.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/__init__.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/__init__.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/convert.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/convert.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/eps_gz.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/eps_gz.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/epstopdf.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/epstopdf.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/fig2dev.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/fig2dev.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/jpeg2ps.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/jpeg2ps.pyc
-%%PYTHON_SITELIBDIR%%/rubber/graphics/mpost.py
-%%PYTHON_SITELIBDIR%%/rubber/graphics/mpost.pyc
-%%PYTHON_SITELIBDIR%%/rubber/info.py
-%%PYTHON_SITELIBDIR%%/rubber/info.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/__init__.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/__init__.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/beamer.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/beamer.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/bibtex.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/bibtex.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/combine.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/combine.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/cweb.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/cweb.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/dvipdfm.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/dvipdfm.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/dvips.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/dvips.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/epsfig.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/epsfig.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/etex.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/etex.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/expand.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/expand.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/graphics.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/graphics.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/graphicx.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/graphicx.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/gz.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/gz.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/hyperref.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/hyperref.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/index.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/index.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/lhs2TeX.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/lhs2TeX.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/makeidx.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/makeidx.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/minitoc-hyper.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/minitoc-hyper.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/minitoc.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/minitoc.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/moreverb.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/moreverb.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/multibib.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/multibib.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/natbib.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/natbib.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/omega.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/omega.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/pdftex.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/pdftex.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/ps2pdf.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/ps2pdf.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/verbatim.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/verbatim.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/vt100.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/vt100.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/vtex.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/vtex.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/xr.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/xr.pyc
-%%PYTHON_SITELIBDIR%%/rubber/util.py
-%%PYTHON_SITELIBDIR%%/rubber/util.pyc
-%%PYTHON_SITELIBDIR%%/rubber/version.py
-%%PYTHON_SITELIBDIR%%/rubber/version.pyc
+%%PYTHON_SITELIBDIR%%/rubber/modules/aleph.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/beamer.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/etex.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/hyperref.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/minitoc-hyper.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/omega.rub
+%%PYTHON_SITELIBDIR%%/rubber/rubber/__init__.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/cmd_info.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/cmd_info.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/cmd_pipe.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/cmd_pipe.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/cmdline.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/cmdline.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/__init__.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/cweb.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/cweb.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/eps_gz.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/eps_gz.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/fig2dev.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/fig2dev.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/__init__.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/__init__.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/bibtex.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/bibtex.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/combine.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/combine.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/dvipdfm.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/dvipdfm.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/dvips.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/dvips.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/epsfig.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/epsfig.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/expand.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/expand.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/graphics.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/graphics.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/graphicx.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/graphicx.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/gz.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/gz.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/index.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/index.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/listings.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/listings.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/makeidx.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/makeidx.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/minitoc.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/minitoc.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/moreverb.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/moreverb.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/multibib.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/multibib.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/natbib.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/natbib.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/pdftex.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/pdftex.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/ps2pdf.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/ps2pdf.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/verbatim.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/verbatim.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/vt100.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/vt100.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/vtex.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/vtex.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/xr.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex/xr.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/lhs2TeX.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/lhs2TeX.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/mpost.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/mpost.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/shell.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/rules/shell.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/util.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/util.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rubber/version.py
+%%PYTHON_SITELIBDIR%%/rubber/rubber/version.pyc
+%%PYTHON_SITELIBDIR%%/rubber/rules.ini
+@dirrm %%PYTHON_SITELIBDIR%%/rubber/rubber/rules/latex
+@dirrm %%PYTHON_SITELIBDIR%%/rubber/rubber/rules
+@dirrm %%PYTHON_SITELIBDIR%%/rubber/rubber
 @dirrm %%PYTHON_SITELIBDIR%%/rubber/modules
-@dirrm %%PYTHON_SITELIBDIR%%/rubber/graphics
 @dirrm %%PYTHON_SITELIBDIR%%/rubber