diff -urN /usr/ports/textproc/rubber/Makefile textproc/rubber/Makefile
--- /usr/ports/textproc/rubber/Makefile	Mon Mar 22 13:33:03 2004
+++ textproc/rubber/Makefile	Sat May  1 23:05:57 2004
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	rubber
-PORTVERSION=	0.99.6
-PORTREVISION=	1
+PORTVERSION=	0.99.7
 CATEGORIES=	textproc
-MASTER_SITES=	http://ebeffara.free.fr/pub/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A wrapper for LaTeX and friends
@@ -18,11 +18,16 @@
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 USE_PYTHON=	yes
+USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --moddir=${PYTHON_SITELIBDIR}
-USE_GMAKE=	yes
 
 MANLANG=	"" fr
-MAN1=	rubber.1 rubber-info.1
+MAN1=		rubber.1 rubber-info.1
+INFO=		rubber
+
+pre-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/rubber.info ${PREFIX}/info
+	@install-info ${PREFIX}/info/rubber.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/rubber/distinfo textproc/rubber/distinfo
--- /usr/ports/textproc/rubber/distinfo	Fri Jan 30 14:54:42 2004
+++ textproc/rubber/distinfo	Sat May  1 22:53:33 2004
@@ -1,2 +1,2 @@
-MD5 (rubber-0.99.6.tar.gz) = b09757c46a49cdc810b3ec8fb2161f9c
-SIZE (rubber-0.99.6.tar.gz) = 49850
+MD5 (rubber-0.99.7.tar.gz) = f82508ed7b061aa7207f29a41687f464
+SIZE (rubber-0.99.7.tar.gz) = 70485
diff -urN /usr/ports/textproc/rubber/files/patch-setup.py textproc/rubber/files/patch-setup.py
--- /usr/ports/textproc/rubber/files/patch-setup.py	Thu Jan  1 09:00:00 1970
+++ textproc/rubber/files/patch-setup.py	Sat May  1 23:05:30 2004
@@ -0,0 +1,38 @@
+--- setup.py.orig	Fri Feb 20 22:34:09 2004
++++ setup.py	Sat May  1 23:05:23 2004
+@@ -103,10 +103,8 @@
+ 	from distutils.core import setup
+ 	try:
+ 		mandir = expand_vars(settings.sub, settings.sub["mandir"])
+-		infodir = expand_vars(settings.sub, settings.sub["infodir"])
+ 	except NameError:
+ 		mandir = "man"
+-		infodir = "info"
+ 	setup(
+ 		name = "rubber",
+ 		version = settings.sub["version"],
+@@ -132,8 +130,7 @@
+ 		[(mandir + "/man1",
+ 			["doc/man-en/rubber.1", "doc/man-en/rubber-info.1"]),
+ 		 (mandir + "/fr/man1",
+-			["doc/man-fr/rubber.1", "doc/man-fr/rubber-info.1"]),
+-		 (infodir, ["doc/rubber.info"])]
++			["doc/man-fr/rubber.1", "doc/man-fr/rubber-info.1"])]
+ 		)
+ 
+ 
+@@ -164,13 +161,11 @@
+     the main script: %s
+     the modules:     %s
+     the man pages:   %s
+-    the info pages:  %s
+ (unless you specify otherwise when running `make install')""" %
+ 		(expand_vars(sub, sub["python"]),
+ 		 expand_vars(sub, sub["bindir"]),
+ 		 expand_vars(sub, sub["moddir"]),
+-		 expand_vars(sub, sub["mandir"]),
+-		 expand_vars(sub, sub["infodir"])))
++		 expand_vars(sub, sub["mandir"])))
+ 	elif cmd == "inst":
+ 		sub = settings.sub
+ 		sub["prefix"] = sys.argv[2]
diff -urN /usr/ports/textproc/rubber/pkg-descr textproc/rubber/pkg-descr
--- /usr/ports/textproc/rubber/pkg-descr	Mon Oct 27 19:11:14 2003
+++ textproc/rubber/pkg-descr	Sat May  1 22:51:53 2004
@@ -5,4 +5,4 @@
 produce PostScript documents is also included, as well as usage of pdfLaTeX
 to produce PDF documents.
 
-WWW: http://ebeffara.free.fr/stuff/rubber/
+WWW: http://rubber.sourceforge.net/
diff -urN /usr/ports/textproc/rubber/pkg-plist textproc/rubber/pkg-plist
--- /usr/ports/textproc/rubber/pkg-plist	Wed Jun 18 08:45:55 2003
+++ textproc/rubber/pkg-plist	Sat May  1 22:58:30 2004
@@ -1,11 +1,18 @@
+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
@@ -20,40 +27,60 @@
 %%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/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/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/pdftex.py
 %%PYTHON_SITELIBDIR%%/rubber/modules/pdftex.pyc
-%%PYTHON_SITELIBDIR%%/rubber/modules/psfig.py
-%%PYTHON_SITELIBDIR%%/rubber/modules/psfig.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
-bin/rubber
-bin/rubber-info
-@dirrm %%PYTHON_SITELIBDIR%%/rubber/graphics
 @dirrm %%PYTHON_SITELIBDIR%%/rubber/modules
+@dirrm %%PYTHON_SITELIBDIR%%/rubber/graphics
 @dirrm %%PYTHON_SITELIBDIR%%/rubber