4 files changed, 43 insertions, 21 deletions

diff --git a/devel/py-ply/Makefile b/devel/py-ply/Makefile
index 883a2bae0eca..1e7188516cf4 100644
--- a/devel/py-ply/Makefile
+++ b/devel/py-ply/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ply
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.dabeaz.com/ply/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-ply/distinfo b/devel/py-ply/distinfo
index d56afc6ef9a7..d6a1aea70a52 100644
--- a/devel/py-ply/distinfo
+++ b/devel/py-ply/distinfo
@@ -1,3 +1,3 @@
-MD5 (ply-2.0.tar.gz) = de6869a7d72a210ceed5894fe0302260
-SHA256 (ply-2.0.tar.gz) = e350cfdcbc62583daee095978540fb356527199eb264e225dfb8b824d322a0f8
-SIZE (ply-2.0.tar.gz) = 75765
+MD5 (ply-2.1.tar.gz) = 4fbd12ed0d62d2cb7c9a93f475d69650
+SHA256 (ply-2.1.tar.gz) = eef158ed2ebcc974ab38d90f7bd344719a3a0dd8cfa2e7d513dce35f93192803
+SIZE (ply-2.1.tar.gz) = 107720
diff --git a/devel/py-ply/files/patch-setup.py b/devel/py-ply/files/patch-setup.py
deleted file mode 100644
index 49a999535692..000000000000
--- a/devel/py-ply/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	Mon Sep  4 23:19:42 2006
-+++ setup.py	Mon Sep  4 23:19:49 2006
-@@ -16,7 +16,7 @@
- 
- PLY is extremely easy to use and provides very extensive error checking. 
- """,
--            licence="""Lesser GPL (LGPL)""",
-+            license="""Lesser GPL (LGPL)""",
-             version = "2.0",
-             author = "David Beazley",
-             author_email = "dave@dabeaz.com",
diff --git a/devel/py-ply/pkg-plist b/devel/py-ply/pkg-plist
index 99f2fa4372c2..06616908532c 100644
--- a/devel/py-ply/pkg-plist
+++ b/devel/py-ply/pkg-plist
@@ -1,9 +1,12 @@
-%%PYTHON_SITELIBDIR%%/lex.py
-%%PYTHON_SITELIBDIR%%/lex.pyc
-%%PYTHON_SITELIBDIR%%/lex.pyo
-%%PYTHON_SITELIBDIR%%/yacc.py
-%%PYTHON_SITELIBDIR%%/yacc.pyc
-%%PYTHON_SITELIBDIR%%/yacc.pyo
+%%PYTHON_SITELIBDIR%%/ply/__init__.py
+%%PYTHON_SITELIBDIR%%/ply/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ply/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ply/lex.py
+%%PYTHON_SITELIBDIR%%/ply/lex.pyc
+%%PYTHON_SITELIBDIR%%/ply/lex.pyo
+%%PYTHON_SITELIBDIR%%/ply/yacc.py
+%%PYTHON_SITELIBDIR%%/ply/yacc.pyc
+%%PYTHON_SITELIBDIR%%/ply/yacc.pyo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ply.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/README
@@ -16,6 +19,35 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/optcalc/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/optcalc/calc.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/unicalc/calc.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/yply/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/yply/ylex.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/yply/yparse.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/yply/yply.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/sqrt2.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/basiclex.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/basinterp.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/basparse.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/dim.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/func.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/gcd.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/gosub.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/hello.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/linear.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/maxsin.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/powers.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/rand.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/sales.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/sears.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/sqrt1.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/BASIC/basic.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/GardenSnake/GardenSnake.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/GardenSnake/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cleanup.sh
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/GardenSnake
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BASIC
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/yply
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/unicalc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/optcalc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/newclasscalc
@@ -25,3 +57,4 @@
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ansic
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/ply