3 files changed, 72 insertions, 22 deletions

diff --git a/devel/tpg/Makefile b/devel/tpg/Makefile
index 5107522406be..c908c9ea6c52 100644
--- a/devel/tpg/Makefile
+++ b/devel/tpg/Makefile
@@ -7,24 +7,29 @@
 #
 
 PORTNAME=	tpg
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.3
 CATEGORIES=	devel python
 MASTER_SITES=	http://christophe.delord.free.fr/soft/tpg/
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergei@kolobov.com
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 NO_BUILD=	yes
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tpg.py ${PYTHONPREFIX_SITELIBDIR}
-	${LN} -fs ${PYTHONPREFIX_SITELIBDIR}/tpg.py ${PREFIX}/bin/tpg
-.if !defined(NOPORTDOCS)
+EXAMPLES=	calc.g calc.py calc2.py notation.py
+
+post-install:
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/TPG/tpg_grammar.g ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/TPG/examples/* ${EXAMPLESDIR}
+.for file in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/examples/calc/${file} ${EXAMPLESDIR}
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/tpg.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/tpg/distinfo b/devel/tpg/distinfo
index adabe9011c3a..7971bed53b76 100644
--- a/devel/tpg/distinfo
+++ b/devel/tpg/distinfo
@@ -1 +1 @@
-MD5 (TPG-2.0.3.tgz) = d0db96b6de1b0ad9016b1244beddaca4
+MD5 (TPG-2.1.3.tar.gz) = 304d98cb50172c86c4e073294955d28e
diff --git a/devel/tpg/pkg-plist b/devel/tpg/pkg-plist
index ad665f56f604..bbc3d8c0059b 100644
--- a/devel/tpg/pkg-plist
+++ b/devel/tpg/pkg-plist
@@ -1,13 +1,58 @@
 bin/tpg
-lib/%%PYTHON_VERSION%%/site-packages/tpg.py
-%%PORTDOCS%%share/examples/tpg/calc/calc.g
-%%PORTDOCS%%share/examples/tpg/calc/calc.py
-%%PORTDOCS%%share/examples/tpg/calc/calc2.py
-%%PORTDOCS%%share/examples/tpg/calc/calc3.g
-%%PORTDOCS%%share/examples/tpg/calc/calc3.py
-%%PORTDOCS%%share/examples/tpg/notation/notation.py
-%%PORTDOCS%%share/examples/tpg/readme.txt
-%%PORTDOCS%%share/examples/tpg/tpg_grammar.g
-%%PORTDOCS%%@dirrm share/examples/tpg/calc
-%%PORTDOCS%%@dirrm share/examples/tpg/notation
-%%PORTDOCS%%@dirrm share/examples/tpg
+%%PYTHON_SITELIBDIR%%/tpg/Release.py
+%%PYTHON_SITELIBDIR%%/tpg/Release.pyc
+%%PYTHON_SITELIBDIR%%/tpg/Release.pyo
+%%PYTHON_SITELIBDIR%%/tpg/__init__.py
+%%PYTHON_SITELIBDIR%%/tpg/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tpg/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tpg/base.py
+%%PYTHON_SITELIBDIR%%/tpg/base.pyc
+%%PYTHON_SITELIBDIR%%/tpg/base.pyo
+%%PYTHON_SITELIBDIR%%/tpg/codegen.py
+%%PYTHON_SITELIBDIR%%/tpg/codegen.pyc
+%%PYTHON_SITELIBDIR%%/tpg/codegen.pyo
+%%PYTHON_SITELIBDIR%%/tpg/parser.py
+%%PYTHON_SITELIBDIR%%/tpg/parser.pyc
+%%PYTHON_SITELIBDIR%%/tpg/parser.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/tpg
+%%PORTDOCS%%share/doc/tpg/cmmi10-19.gif
+%%PORTDOCS%%share/doc/tpg/cmsy10-21.gif
+%%PORTDOCS%%share/doc/tpg/cmtt10-20.gif
+%%PORTDOCS%%share/doc/tpg/tpg.html
+%%PORTDOCS%%share/doc/tpg/tpg.pdf
+%%PORTDOCS%%share/doc/tpg/tpg11.html
+%%PORTDOCS%%share/doc/tpg/tpg13.html
+%%PORTDOCS%%share/doc/tpg/tpg14.html
+%%PORTDOCS%%share/doc/tpg/tpg17.html
+%%PORTDOCS%%share/doc/tpg/tpg20.html
+%%PORTDOCS%%share/doc/tpg/tpg23.html
+%%PORTDOCS%%share/doc/tpg/tpg6.html
+%%PORTDOCS%%share/doc/tpg/tpg7.html
+%%PORTDOCS%%share/doc/tpg/tpg8.html
+%%PORTDOCS%%share/doc/tpg/tpg9.html
+%%PORTDOCS%%share/doc/tpg/tpgch1.html
+%%PORTDOCS%%share/doc/tpg/tpgch10.html
+%%PORTDOCS%%share/doc/tpg/tpgch11.html
+%%PORTDOCS%%share/doc/tpg/tpgch12.html
+%%PORTDOCS%%share/doc/tpg/tpgch13.html
+%%PORTDOCS%%share/doc/tpg/tpgch14.html
+%%PORTDOCS%%share/doc/tpg/tpgch2.html
+%%PORTDOCS%%share/doc/tpg/tpgch3.html
+%%PORTDOCS%%share/doc/tpg/tpgch4.html
+%%PORTDOCS%%share/doc/tpg/tpgch5.html
+%%PORTDOCS%%share/doc/tpg/tpgch6.html
+%%PORTDOCS%%share/doc/tpg/tpgch7.html
+%%PORTDOCS%%share/doc/tpg/tpgch8.html
+%%PORTDOCS%%share/doc/tpg/tpgch9.html
+%%PORTDOCS%%share/doc/tpg/tpgli1.html
+%%PORTDOCS%%share/doc/tpg/tpgli2.html
+%%PORTDOCS%%share/doc/tpg/tpgpa1.html
+%%PORTDOCS%%share/doc/tpg/tpgpa2.html
+%%PORTDOCS%%share/doc/tpg/tpgpa3.html
+%%PORTDOCS%%share/doc/tpg/tpgpa4.html
+%%PORTDOCS%%@dirrm share/doc/tpg
+share/examples/tpg/calc.g
+share/examples/tpg/calc.py
+share/examples/tpg/calc2.py
+share/examples/tpg/notation.py
+@dirrm share/examples/tpg