- Update to 1.2

PR:		177768
Submitted by:	maintainer

3 files changed, 72 insertions, 24 deletions

diff --git a/math/py-ufl/Makefile b/math/py-ufl/Makefile
index f74d892f14a4..1044c18bb7dc 100644
--- a/math/py-ufl/Makefile
+++ b/math/py-ufl/Makefile
@@ -1,15 +1,12 @@
-# New ports collection makefile for:	py-ufl
-# Date created:				13 April 2012
-# Whom:					Jason Bacon <jwbacon@tds.net>
-#
+# Created by: Jason Bacon <jwbacon@tds.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ufl
-PORTVERSION=	1.0.0
+PORTVERSION=	${MMVERSION}0
 CATEGORIES=	math python
-MASTER_SITES=	https://launchpad.net/${PORTNAME}/1.0.x/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/${MMVERSION}.x/${MMVERSION}.0/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-${MMVERSION}.0
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Unified Form Language for finite element discretizations
@@ -29,6 +26,8 @@ MAN1=		form2ufl.1 \
 		ufl2py.1
 MANCOMPRESSED=	yes
 
+MMVERSION=	1.2
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|\[(pjoin("share", "man", "man1"),|\[(pjoin("man", "man1"),|' \
 			${WRKSRC}/setup.py
diff --git a/math/py-ufl/distinfo b/math/py-ufl/distinfo
index 2e3297992cc8..4dfd7cae2d8c 100644
--- a/math/py-ufl/distinfo
+++ b/math/py-ufl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ufl-1.0.0.tar.gz) = 6c6be9959e3dbb7b038356681b67563cff9839e5d0c184fcf051711239d15b02
-SIZE (ufl-1.0.0.tar.gz) = 701017
+SHA256 (ufl-1.2.0.tar.gz) = a6336b7a0bb29852696886bf02ed08ed1558050bd017de884fb7499c73bb9719
+SIZE (ufl-1.2.0.tar.gz) = 748689
diff --git a/math/py-ufl/pkg-plist b/math/py-ufl/pkg-plist
index 1879907d1d44..9e1cb1fca1ef 100644
--- a/math/py-ufl/pkg-plist
+++ b/math/py-ufl/pkg-plist
@@ -18,12 +18,27 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/analysis.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/analysis.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/analysis.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/argument_dependencies.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/argument_dependencies.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/argument_dependencies.pyo
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/checks.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/checks.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/checks.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/deprecated.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/deprecated.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/deprecated.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/domain_analysis.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/domain_analysis.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/domain_analysis.pyo
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/elementtransformations.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/elementtransformations.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/elementtransformations.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/estimate_degrees.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/estimate_degrees.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/estimate_degrees.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/expand_compounds.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/expand_compounds.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/expand_compounds.pyo
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/expand_indices.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/expand_indices.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/expand_indices.pyo
@@ -45,6 +60,9 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/latextools.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/latextools.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/latextools.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/multifunction.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/multifunction.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/multifunction.pyo
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/pdiffs.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/pdiffs.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/pdiffs.pyo
@@ -63,12 +81,18 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/renumbering.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/renumbering.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/renumbering.pyo
-%%PYTHON_SITELIBDIR%%/ufl/algorithms/reverse_ad.py
-%%PYTHON_SITELIBDIR%%/ufl/algorithms/reverse_ad.pyc
-%%PYTHON_SITELIBDIR%%/ufl/algorithms/reverse_ad.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/replace.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/replace.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/replace.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/signature.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/signature.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/signature.pyo
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/transformations.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/transformations.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/transformations.pyo
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/transformer.py
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/transformer.pyc
+%%PYTHON_SITELIBDIR%%/ufl/algorithms/transformer.pyo
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/traversal.py
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/traversal.pyc
 %%PYTHON_SITELIBDIR%%/ufl/algorithms/traversal.pyo
@@ -105,24 +129,48 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/differentiation.py
 %%PYTHON_SITELIBDIR%%/ufl/differentiation.pyc
 %%PYTHON_SITELIBDIR%%/ufl/differentiation.pyo
-%%PYTHON_SITELIBDIR%%/ufl/elementlist.py
-%%PYTHON_SITELIBDIR%%/ufl/elementlist.pyc
-%%PYTHON_SITELIBDIR%%/ufl/elementlist.pyo
+%%PYTHON_SITELIBDIR%%/ufl/domains.py
+%%PYTHON_SITELIBDIR%%/ufl/domains.pyc
+%%PYTHON_SITELIBDIR%%/ufl/domains.pyo
 %%PYTHON_SITELIBDIR%%/ufl/equation.py
 %%PYTHON_SITELIBDIR%%/ufl/equation.pyc
 %%PYTHON_SITELIBDIR%%/ufl/equation.pyo
 %%PYTHON_SITELIBDIR%%/ufl/expr.py
 %%PYTHON_SITELIBDIR%%/ufl/expr.pyc
 %%PYTHON_SITELIBDIR%%/ufl/expr.pyo
+%%PYTHON_SITELIBDIR%%/ufl/exprequals.py
+%%PYTHON_SITELIBDIR%%/ufl/exprequals.pyc
+%%PYTHON_SITELIBDIR%%/ufl/exprequals.pyo
 %%PYTHON_SITELIBDIR%%/ufl/exproperators.py
 %%PYTHON_SITELIBDIR%%/ufl/exproperators.pyc
 %%PYTHON_SITELIBDIR%%/ufl/exproperators.pyo
-%%PYTHON_SITELIBDIR%%/ufl/feec.py
-%%PYTHON_SITELIBDIR%%/ufl/feec.pyc
-%%PYTHON_SITELIBDIR%%/ufl/feec.pyo
-%%PYTHON_SITELIBDIR%%/ufl/finiteelement.py
-%%PYTHON_SITELIBDIR%%/ufl/finiteelement.pyc
-%%PYTHON_SITELIBDIR%%/ufl/finiteelement.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/__init__.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/elementlist.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/elementlist.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/elementlist.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/enrichedelement.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/enrichedelement.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/enrichedelement.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/feec.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/feec.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/feec.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/finiteelement.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/finiteelement.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/finiteelement.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/finiteelementbase.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/finiteelementbase.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/finiteelementbase.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/mixedelement.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/mixedelement.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/mixedelement.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/restrictedelement.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/restrictedelement.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/restrictedelement.pyo
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/tensorproductelement.py
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/tensorproductelement.pyc
+%%PYTHON_SITELIBDIR%%/ufl/finiteelement/tensorproductelement.pyo
 %%PYTHON_SITELIBDIR%%/ufl/form.py
 %%PYTHON_SITELIBDIR%%/ufl/form.pyc
 %%PYTHON_SITELIBDIR%%/ufl/form.pyo
@@ -147,9 +195,6 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/integral.py
 %%PYTHON_SITELIBDIR%%/ufl/integral.pyc
 %%PYTHON_SITELIBDIR%%/ufl/integral.pyo
-%%PYTHON_SITELIBDIR%%/ufl/lifting.py
-%%PYTHON_SITELIBDIR%%/ufl/lifting.pyc
-%%PYTHON_SITELIBDIR%%/ufl/lifting.pyo
 %%PYTHON_SITELIBDIR%%/ufl/log.py
 %%PYTHON_SITELIBDIR%%/ufl/log.pyc
 %%PYTHON_SITELIBDIR%%/ufl/log.pyo
@@ -159,6 +204,9 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/objects.py
 %%PYTHON_SITELIBDIR%%/ufl/objects.pyc
 %%PYTHON_SITELIBDIR%%/ufl/objects.pyo
+%%PYTHON_SITELIBDIR%%/ufl/operatorbase.py
+%%PYTHON_SITELIBDIR%%/ufl/operatorbase.pyc
+%%PYTHON_SITELIBDIR%%/ufl/operatorbase.pyo
 %%PYTHON_SITELIBDIR%%/ufl/operators.py
 %%PYTHON_SITELIBDIR%%/ufl/operators.pyc
 %%PYTHON_SITELIBDIR%%/ufl/operators.pyo
@@ -192,5 +240,6 @@ bin/ufl2py
 %%PYTHON_SITELIBDIR%%/ufl/variable.py
 %%PYTHON_SITELIBDIR%%/ufl/variable.pyc
 %%PYTHON_SITELIBDIR%%/ufl/variable.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/ufl/finiteelement
 @dirrm %%PYTHON_SITELIBDIR%%/ufl/algorithms
 @dirrm %%PYTHON_SITELIBDIR%%/ufl