- Update to 1.6

PR:		ports/83751
Submitted by:	Vsevolod Stakhov <vsevolod@highsecure.ru>

10 files changed, 52 insertions, 24 deletions

diff --git a/devel/ply/Makefile b/devel/ply/Makefile
index dedbbbb6515..afaa206a294 100644
--- a/devel/ply/Makefile
+++ b/devel/ply/Makefile
@@ -7,19 +7,16 @@
 #
 
 PORTNAME=	ply
-PORTVERSION=	1.3.1
+PORTVERSION=	1.6
 CATEGORIES=	devel python
-MASTER_SITES=	http://systems.cs.uchicago.edu/ply/
+MASTER_SITES=	http://www.dabeaz.com/ply/
+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Lex-Yacc
 
 USE_PYTHON=	yes
-NO_BUILD=	yes
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/lex.py ${PYTHON_SITELIBDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/yacc.py ${PYTHON_SITELIBDIR}
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/ply/distinfo b/devel/ply/distinfo
index 7e8bad212de..30b95d367c5 100644
--- a/devel/ply/distinfo
+++ b/devel/ply/distinfo
@@ -1,2 +1,2 @@
-MD5 (ply-1.3.1.tar.gz) = eeb11347ef861d3ec9469f072beeaeb1
-SIZE (ply-1.3.1.tar.gz) = 64742
+MD5 (ply-1.6.tar.gz) = cc43cab69b072fdd5c2557f3865c383d
+SIZE (ply-1.6.tar.gz) = 72605
diff --git a/devel/ply/files/patch-setup.py b/devel/ply/files/patch-setup.py
new file mode 100644
index 00000000000..ceee4510b9e
--- /dev/null
+++ b/devel/ply/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	Wed Jul 20 01:27:21 2005
++++ setup.py	Wed Jul 20 01:27:31 2005
+@@ -17,7 +17,7 @@
+ 
+ PLY is extremely easy to use and provides very extensive error checking. 
+ """,
+-            licence="""Lesser GPL (LGPL)""",
++            license="""Lesser GPL (LGPL)""",
+             version = "1.3.1",
+             author = "David Beazley",
+             author_email = "beazley@cs.uchicago.edu",
diff --git a/devel/ply/pkg-descr b/devel/ply/pkg-descr
index afcdc677505..1fba6292bd9 100644
--- a/devel/ply/pkg-descr
+++ b/devel/ply/pkg-descr
@@ -6,4 +6,4 @@ version of lex and yacc. The other significant feature of PLY is that it
 provides extensive input validation and error reporting--much more so than
 other Python parsing tools.
 
-WWW: http://systems.cs.uchicago.edu/ply/
+WWW: http://www.dabeaz.com/ply/
diff --git a/devel/ply/pkg-plist b/devel/ply/pkg-plist
index ef465c1dfa7..04a1d00fd5c 100644
--- a/devel/ply/pkg-plist
+++ b/devel/ply/pkg-plist
@@ -1,14 +1,20 @@
-lib/%%PYTHON_VERSION%%/site-packages/lex.py
-lib/%%PYTHON_VERSION%%/site-packages/yacc.py
+%%PYTHON_SITELIBDIR%%/lex.py
+%%PYTHON_SITELIBDIR%%/lex.pyc
+%%PYTHON_SITELIBDIR%%/lex.pyo
+%%PYTHON_SITELIBDIR%%/yacc.py
+%%PYTHON_SITELIBDIR%%/yacc.pyc
+%%PYTHON_SITELIBDIR%%/yacc.pyo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ply.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/clex.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/cparse.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/calc/calc.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/classcalc/calc.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/hedit/hedit.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/optcalc/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/optcalc/calc.py
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/classcalc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/optcalc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/hedit
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/calc
diff --git a/devel/py-ply/Makefile b/devel/py-ply/Makefile
index dedbbbb6515..afaa206a294 100644
--- a/devel/py-ply/Makefile
+++ b/devel/py-ply/Makefile
@@ -7,19 +7,16 @@
 #
 
 PORTNAME=	ply
-PORTVERSION=	1.3.1
+PORTVERSION=	1.6
 CATEGORIES=	devel python
-MASTER_SITES=	http://systems.cs.uchicago.edu/ply/
+MASTER_SITES=	http://www.dabeaz.com/ply/
+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Lex-Yacc
 
 USE_PYTHON=	yes
-NO_BUILD=	yes
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/lex.py ${PYTHON_SITELIBDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/yacc.py ${PYTHON_SITELIBDIR}
+USE_PYDISTUTILS=	yes
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/py-ply/distinfo b/devel/py-ply/distinfo
index 7e8bad212de..30b95d367c5 100644
--- a/devel/py-ply/distinfo
+++ b/devel/py-ply/distinfo
@@ -1,2 +1,2 @@
-MD5 (ply-1.3.1.tar.gz) = eeb11347ef861d3ec9469f072beeaeb1
-SIZE (ply-1.3.1.tar.gz) = 64742
+MD5 (ply-1.6.tar.gz) = cc43cab69b072fdd5c2557f3865c383d
+SIZE (ply-1.6.tar.gz) = 72605
diff --git a/devel/py-ply/files/patch-setup.py b/devel/py-ply/files/patch-setup.py
new file mode 100644
index 00000000000..ceee4510b9e
--- /dev/null
+++ b/devel/py-ply/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	Wed Jul 20 01:27:21 2005
++++ setup.py	Wed Jul 20 01:27:31 2005
+@@ -17,7 +17,7 @@
+ 
+ PLY is extremely easy to use and provides very extensive error checking. 
+ """,
+-            licence="""Lesser GPL (LGPL)""",
++            license="""Lesser GPL (LGPL)""",
+             version = "1.3.1",
+             author = "David Beazley",
+             author_email = "beazley@cs.uchicago.edu",
diff --git a/devel/py-ply/pkg-descr b/devel/py-ply/pkg-descr
index afcdc677505..1fba6292bd9 100644
--- a/devel/py-ply/pkg-descr
+++ b/devel/py-ply/pkg-descr
@@ -6,4 +6,4 @@ version of lex and yacc. The other significant feature of PLY is that it
 provides extensive input validation and error reporting--much more so than
 other Python parsing tools.
 
-WWW: http://systems.cs.uchicago.edu/ply/
+WWW: http://www.dabeaz.com/ply/
diff --git a/devel/py-ply/pkg-plist b/devel/py-ply/pkg-plist
index ef465c1dfa7..04a1d00fd5c 100644
--- a/devel/py-ply/pkg-plist
+++ b/devel/py-ply/pkg-plist
@@ -1,14 +1,20 @@
-lib/%%PYTHON_VERSION%%/site-packages/lex.py
-lib/%%PYTHON_VERSION%%/site-packages/yacc.py
+%%PYTHON_SITELIBDIR%%/lex.py
+%%PYTHON_SITELIBDIR%%/lex.pyc
+%%PYTHON_SITELIBDIR%%/lex.pyo
+%%PYTHON_SITELIBDIR%%/yacc.py
+%%PYTHON_SITELIBDIR%%/yacc.pyc
+%%PYTHON_SITELIBDIR%%/yacc.pyo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ply.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/clex.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/ansic/cparse.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/calc/calc.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/classcalc/calc.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/hedit/hedit.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/optcalc/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/optcalc/calc.py
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/classcalc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/optcalc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/hedit
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/calc