3 files changed, 57 insertions, 52 deletions

diff --git a/devel/py-parsing/Makefile b/devel/py-parsing/Makefile
index 19178c61a312..c805e1489b08 100644
--- a/devel/py-parsing/Makefile
+++ b/devel/py-parsing/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	parsing
-PORTVERSION=	1.4.5
+PORTVERSION=	1.4.10
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pyparsing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyparsing-${PORTVERSION}
 
-MAINTAINER=	perky@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General parsing module for Python
 
 USE_PYTHON=	2.3+
diff --git a/devel/py-parsing/distinfo b/devel/py-parsing/distinfo
index d4daebb63b6e..cb3a4222aa72 100644
--- a/devel/py-parsing/distinfo
+++ b/devel/py-parsing/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyparsing-1.4.5.tar.gz) = d4a9108e7a4e4aacda28f055d8cb4f89
-SHA256 (pyparsing-1.4.5.tar.gz) = 633ee2374d0b088f1e2619c6843824415e55f89ba8bfc60e40d1a334caf18393
-SIZE (pyparsing-1.4.5.tar.gz) = 714706
+MD5 (pyparsing-1.4.10.tar.gz) = b9899eca96015dee459684f089fb427c
+SHA256 (pyparsing-1.4.10.tar.gz) = da9a80bd116086b3c19dcc53f00ba36ab716defad2dfba3d99b3e48beae304e6
+SIZE (pyparsing-1.4.10.tar.gz) = 557582
diff --git a/devel/py-parsing/pkg-plist b/devel/py-parsing/pkg-plist
index ea0793178b00..df7998d99142 100644
--- a/devel/py-parsing/pkg-plist
+++ b/devel/py-parsing/pkg-plist
@@ -4,59 +4,58 @@
 %%PORTDOCS%%%%DOCSDIR%%/__builtin__.object-class.html
 %%PORTDOCS%%%%DOCSDIR%%/__builtin__.type-class.html
 %%PORTDOCS%%%%DOCSDIR%%/epydoc.css
+%%PORTDOCS%%%%DOCSDIR%%/exceptions.BaseException-class.html
 %%PORTDOCS%%%%DOCSDIR%%/exceptions.Exception-class.html
 %%PORTDOCS%%%%DOCSDIR%%/frames.html
 %%PORTDOCS%%%%DOCSDIR%%/help.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/indices.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing-module.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.And-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.CaselessKeyword-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.CaselessLiteral-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.CharsNotIn-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Combine-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Dict-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Each-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Empty-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.FollowedBy-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Forward-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.GoToColumn-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Group-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Keyword-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.LineEnd-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.LineStart-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Literal-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.MatchFirst-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.NoMatch-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.NotAny-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.OneOrMore-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.OnlyOnce-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Optional-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Or-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParseBaseException-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParseElementEnhance-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParseException-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParseExpression-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParseFatalException-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParseResults-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ParserElement-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.PositionToken-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.QuotedString-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.RecursiveGrammarException-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Regex-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ReparseException-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.SkipTo-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.StringEnd-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.StringStart-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Suppress-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Token-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.TokenConverter-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Upcase-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.White-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.Word-class.html
-%%PORTDOCS%%%%DOCSDIR%%/parserFwk.pyparsing.ZeroOrMore-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing-module.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.And-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.CaselessKeyword-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.CaselessLiteral-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.CharsNotIn-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Combine-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Dict-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Each-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Empty-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.FollowedBy-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Forward-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.GoToColumn-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Group-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Keyword-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.LineEnd-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.LineStart-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Literal-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.MatchFirst-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.NoMatch-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.NotAny-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.OneOrMore-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.OnlyOnce-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Optional-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Or-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParseBaseException-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParseElementEnhance-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParseException-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParseExpression-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParseFatalException-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParseResults-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ParserElement-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.QuotedString-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.RecursiveGrammarException-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Regex-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.SkipTo-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.StringEnd-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.StringStart-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Suppress-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Token-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.TokenConverter-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Upcase-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.White-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.Word-class.html
+%%PORTDOCS%%%%DOCSDIR%%/pyparsing.pyparsing.ZeroOrMore-class.html
 %%PORTDOCS%%%%DOCSDIR%%/toc-everything.html
-%%PORTDOCS%%%%DOCSDIR%%/toc-parserFwk.pyparsing-module.html
+%%PORTDOCS%%%%DOCSDIR%%/toc-pyparsing.pyparsing-module.html
 %%PORTDOCS%%%%DOCSDIR%%/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/trees.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/0README.html
@@ -80,6 +79,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/greeting.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/greetingInGreek.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/greetingInKorean.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/holaMundo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/htmlStripper.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/httpServerLogParser.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/idlParse.py
@@ -88,9 +88,11 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/linenoExample.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/list1.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/listAllMatches.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/macroExpander.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/makeHTMLTagExample.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/mozilla.ics
 %%PORTDOCS%%%%EXAMPLESDIR%%/mozillaCalendarParser.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/nested.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/parseListString.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/parsePythonValue.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pgn.py
@@ -99,7 +101,9 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/romanNumerals.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/scanExamples.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/scanYahoo.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/searchParserAppDemo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/searchparser.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/sexpParser.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/simpleArith.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/simpleBool.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/simpleSQL.py
@@ -108,6 +112,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/sql2dot.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/urlExtractor.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/urlExtractorNew.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/withAttribute.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/wordsToNum.py
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%