3 files changed, 55 insertions, 53 deletions

diff --git a/devel/tpg/Makefile b/devel/tpg/Makefile
index c299381a9c71..f79ac66870da 100644
--- a/devel/tpg/Makefile
+++ b/devel/tpg/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:	tpg
 # Date created:			Mar 15, 2002
 # Whom:				ijliao
@@ -7,30 +6,29 @@
 #
 
 PORTNAME=	tpg
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	devel python
 MASTER_SITES=	http://christophe.delord.free.fr/soft/tpg/
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
 MAINTAINER=	sergei@kolobov.com
-COMMENT=	Toy Parser Generator -- A parser generator in Python
+COMMENT=	Parser generator in Python
 
-USE_PYTHON=	yes
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+
 NO_BUILD=	yes
 
-EXAMPLES=	calc.g calc.py calc2.py notation.py
+DOCS=		ChangeLog README THANKS doc/*.html doc/tpg.css \
+		doc/*.png doc/tpg.pdf
+EXAMPLES=	examples/calc/*
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/calc/${file} ${EXAMPLESDIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/tpg.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/tpg/distinfo b/devel/tpg/distinfo
index 19e4bda1c5d6..4ee4cbf4058b 100644
--- a/devel/tpg/distinfo
+++ b/devel/tpg/distinfo
@@ -1 +1 @@
-MD5 (TPG-2.1.4.tar.gz) = 85370ec778bca34c0e35bff45e0f47b3
+MD5 (TPG-2.1.5.tar.gz) = 3f6535425b1f2e1db48a9e37ffcd42ef
diff --git a/devel/tpg/pkg-plist b/devel/tpg/pkg-plist
index a5112e44d15a..6d11bd6d6627 100644
--- a/devel/tpg/pkg-plist
+++ b/devel/tpg/pkg-plist
@@ -15,44 +15,48 @@ bin/tpg
 %%PYTHON_SITELIBDIR%%/tpg/parser.pyc
 %%PYTHON_SITELIBDIR%%/tpg/parser.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/tpg
-%%PORTDOCS%%share/doc/tpg/cmmi10-19.png
-%%PORTDOCS%%share/doc/tpg/cmsy10-21.png
-%%PORTDOCS%%share/doc/tpg/cmtt10-20.png
-%%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
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/cmmi10-19.png
+%%PORTDOCS%%%%DOCSDIR%%/cmsy10-21.png
+%%PORTDOCS%%%%DOCSDIR%%/cmtt10-20.png
+%%PORTDOCS%%%%DOCSDIR%%/tpg.css
+%%PORTDOCS%%%%DOCSDIR%%/tpg.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg.pdf
+%%PORTDOCS%%%%DOCSDIR%%/tpg11.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg13.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg14.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg17.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg20.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg23.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg6.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg7.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg8.html
+%%PORTDOCS%%%%DOCSDIR%%/tpg9.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch1.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch10.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch11.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch12.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch13.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch14.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch2.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch3.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch4.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch5.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch6.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch7.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch8.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgch9.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgli1.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgli2.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgpa1.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgpa2.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgpa3.html
+%%PORTDOCS%%%%DOCSDIR%%/tpgpa4.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/calc.g
+%%EXAMPLESDIR%%/calc.py
+%%EXAMPLESDIR%%/calc2.py
+%%EXAMPLESDIR%%/notation.py
+@dirrm %%EXAMPLESDIR%%