- Update to 1.0

PR:		ports/83273
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 91 insertions, 139 deletions

diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 9dfcc26b1094..fb6cee73d736 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -7,28 +7,23 @@
 #
 
 PORTNAME=	rubber
-PORTVERSION=	0.99.8
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://ebeffara.free.fr/pub/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A wrapper for LaTeX and friends
 
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
 
-USE_PYTHON=	yes
+USE_PYTHON=	2.2+
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --moddir=${PYTHON_SITELIBDIR}
+CONFIGURE_ARGS=	--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} \
+		--datadir=${PYTHON_SITELIBDIR}
 
 MANLANG=	"" fr
 MAN1=		rubber.1 rubber-info.1 rubber-pipe.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 --git a/textproc/rubber/distinfo b/textproc/rubber/distinfo
index 68a6ed796145..441f89f4af5f 100644
--- a/textproc/rubber/distinfo
+++ b/textproc/rubber/distinfo
@@ -1,2 +1,2 @@
-MD5 (rubber-0.99.8.tar.gz) = bfa76fd5f2bf29a4805a4c422c249fc2
-SIZE (rubber-0.99.8.tar.gz) = 75781
+MD5 (rubber-1.0.tar.gz) = 8ae010fc367f2709a2dffeecd47e39e3
+SIZE (rubber-1.0.tar.gz) = 76225
diff --git a/textproc/rubber/files/patch-setup.py b/textproc/rubber/files/patch-setup.py
deleted file mode 100644
index ce3793c7754f..000000000000
--- a/textproc/rubber/files/patch-setup.py
+++ /dev/null
@@ -1,38 +0,0 @@
---- setup.py.orig	Sat Jun 26 22:57:07 2004
-+++ setup.py	Thu Jan 27 02:27:30 2005
-@@ -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", "doc/man-en/rubber-pipe.1"]),
- 		 (mandir + "/fr/man1",
--			["doc/man-fr/rubber.1", "doc/man-fr/rubber-info.1", "doc/man-fr/rubber-pipe.1"]),
--		 (infodir, ["doc/rubber.info"])]
-+			["doc/man-fr/rubber.1", "doc/man-fr/rubber-info.1", "doc/man-fr/rubber-pipe.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 --git a/textproc/rubber/pkg-descr b/textproc/rubber/pkg-descr
index 830870caadb4..7eee8dbe02b9 100644
--- a/textproc/rubber/pkg-descr
+++ b/textproc/rubber/pkg-descr
@@ -5,4 +5,4 @@ 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://rubber.sourceforge.net/
+WWW: http://www.pps.jussieu.fr/~beffara/soft/rubber/
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