3 files changed, 108 insertions, 16 deletions

diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 7441b2b368d8..6c4e7eaf61a4 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -12,22 +12,21 @@ COMMENT=	Wrapper for LaTeX and friends
 
 LICENSE=	GPLv2
 
-USE_PYTHON=	2
+NO_ARCH=	yes
+
+USES=		gmake makeinfo python:2
 USE_TEX=	latex
-USES=		gmake makeinfo
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} \
-		--datadir=${PYTHON_SITELIBDIR} --python=${PYTHON_CMD}
+		--datadir=${PYTHONPREFIX_SITELIBDIR} --python=${PYTHON_CMD}
+
+PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
 
-MANLANG=	"" fr
-MAN1=		rubber.1 rubber-info.1 rubber-pipe.1
 INFO=		rubber
 
-NO_STAGE=	yes
-post-install:
-	@${FIND} ${PYTHON_SITELIBDIR}/rubber ! -type d | ${SED} \
-		's,${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PYTHON_SITELIBDIR}/rubber -type d | ${SORT} -r | ${SED} \
-		's,${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|\($${prefix}\)$$|\1 --root="$${DESTDIR}"|' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/rubber/pkg-descr b/textproc/rubber/pkg-descr
index a0bebd7cb6c5..ffaef8618a75 100644
--- a/textproc/rubber/pkg-descr
+++ b/textproc/rubber/pkg-descr
@@ -1,8 +1,8 @@
 Rubber is a program whose purpose is to handle all tasks related to the
-compilation of LaTeX documents. This includes compiling the document itself,
-of course, enough times so that all references are defined, and running
-BibTeX to manage bibliographic references. Automatic execution of dvips to
-produce PostScript documents is also included, as well as usage of pdfLaTeX
-to produce PDF documents.
+compilation of LaTeX documents. This includes compiling the document
+itself, of course, enough times so that all references are defined, and
+running BibTeX to manage bibliographic references. Automatic execution
+of dvips to produce PostScript documents is also included, as well as
+usage of pdfLaTeX to produce PDF documents.
 
 WWW: http://launchpad.net/rubber/
diff --git a/textproc/rubber/pkg-plist b/textproc/rubber/pkg-plist
index 46544e6ebcc4..b42f2465e878 100644
--- a/textproc/rubber/pkg-plist
+++ b/textproc/rubber/pkg-plist
@@ -1,5 +1,98 @@
 bin/rubber
 bin/rubber-info
 bin/rubber-pipe
+%%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/ntheroem.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/omega.rub
+%%PYTHON_SITELIBDIR%%/rubber/modules/revtex4.rub
+%%PYTHON_SITELIBDIR%%/rubber/%%PYDISTUTILS_EGGINFO%%
+%%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
+man/fr/man1/rubber.1.gz
+man/fr/man1/rubber-info.1.gz
+man/fr/man1/rubber-pipe.1.gz
+man/man1/rubber.1.gz
+man/man1/rubber-info.1.gz
+man/man1/rubber-pipe.1.gz
 @dirrmtry man/fr/man1
 @dirrmtry man/fr
+@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