4 files changed, 65 insertions, 43 deletions

diff --git a/net-mgmt/py-pyang/Makefile b/net-mgmt/py-pyang/Makefile
index cb13af120d22..2543bc7950cd 100644
--- a/net-mgmt/py-pyang/Makefile
+++ b/net-mgmt/py-pyang/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyang
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,14 +15,12 @@ LICENSE=	BSD
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 
-MAKE_ENV+=	YANG_INSTALL=${PREFIX}
-MAN1=		pyang.1 yang2dsdl.1
+DATADIR=	${PREFIX}/share/yang
 
-# TODO: Sed YANG_INSTALL into pyang itself.
+MAN1=		pyang.1 yang2dsdl.1
 
-post-install:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Don't forget to set YANG_INSTALL to ${PREFIX} in your environment."
-	@${ECHO_MSG}
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|share/man|man|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-pyang/distinfo b/net-mgmt/py-pyang/distinfo
index 60eb013b82f9..7844f21d1bd1 100644
--- a/net-mgmt/py-pyang/distinfo
+++ b/net-mgmt/py-pyang/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyang-1.2.tar.gz) = b8774f4eaa0561d82ca30887a4e6d623c1e5c44012cfedb7a62596da45310d4c
-SIZE (pyang-1.2.tar.gz) = 146708
+SHA256 (pyang-1.3.tar.gz) = 361c6a943feb47776d28fc6e5809c52e1ebaf9067c4fa7a853c120875c76ac39
+SIZE (pyang-1.3.tar.gz) = 188048
diff --git a/net-mgmt/py-pyang/files/patch-setup.py b/net-mgmt/py-pyang/files/patch-setup.py
deleted file mode 100644
index b7742255509f..000000000000
--- a/net-mgmt/py-pyang/files/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./setup.py.orig	2010-11-17 11:11:03.000000000 +0300
-+++ ./setup.py	2012-10-01 13:36:11.000000000 +0400
-@@ -14,8 +14,7 @@
-       url='http://code.google.com/p/pyang',
-       scripts=['bin/pyang', 'bin/yang2html', 'bin/yang2dsdl'],
-       packages=['pyang', 'pyang.plugins', 'pyang.translators'],
--      data_files=[('.', ['LICENSE']),
--                  ('share/man/man1', ['man/man1/pyang.1',
-+      data_files=[('man/man1', ['man/man1/pyang.1',
-                                       'man/man1/yang2dsdl.1']),
-                   ('share/yang/modules', modules),
-                   ('share/yang/xslt', xslt),
diff --git a/net-mgmt/py-pyang/pkg-plist b/net-mgmt/py-pyang/pkg-plist
index 70247ea10451..890fc1ea305a 100644
--- a/net-mgmt/py-pyang/pkg-plist
+++ b/net-mgmt/py-pyang/pkg-plist
@@ -10,6 +10,9 @@ bin/yang2html
 %%PYTHON_SITELIBDIR%%/pyang/grammar.py
 %%PYTHON_SITELIBDIR%%/pyang/grammar.pyc
 %%PYTHON_SITELIBDIR%%/pyang/grammar.pyo
+%%PYTHON_SITELIBDIR%%/pyang/hello.py
+%%PYTHON_SITELIBDIR%%/pyang/hello.pyc
+%%PYTHON_SITELIBDIR%%/pyang/hello.pyo
 %%PYTHON_SITELIBDIR%%/pyang/plugin.py
 %%PYTHON_SITELIBDIR%%/pyang/plugin.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugin.pyo
@@ -19,9 +22,21 @@ bin/yang2html
 %%PYTHON_SITELIBDIR%%/pyang/plugins/depend.py
 %%PYTHON_SITELIBDIR%%/pyang/plugins/depend.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugins/depend.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/hypertree.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/hypertree.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/hypertree.pyo
 %%PYTHON_SITELIBDIR%%/pyang/plugins/ietf.py
 %%PYTHON_SITELIBDIR%%/pyang/plugins/ietf.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugins/ietf.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jsonxsl.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jsonxsl.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jsonxsl.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jstree.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jstree.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jstree.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jtox.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jtox.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/jtox.pyo
 %%PYTHON_SITELIBDIR%%/pyang/plugins/smi.py
 %%PYTHON_SITELIBDIR%%/pyang/plugins/smi.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugins/smi.pyo
@@ -31,6 +46,9 @@ bin/yang2html
 %%PYTHON_SITELIBDIR%%/pyang/plugins/uml.py
 %%PYTHON_SITELIBDIR%%/pyang/plugins/uml.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugins/uml.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/xmi.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/xmi.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/xmi.pyo
 %%PYTHON_SITELIBDIR%%/pyang/statements.py
 %%PYTHON_SITELIBDIR%%/pyang/statements.pyc
 %%PYTHON_SITELIBDIR%%/pyang/statements.pyo
@@ -70,27 +88,45 @@ bin/yang2html
 %%PYTHON_SITELIBDIR%%/pyang/yin_parser.py
 %%PYTHON_SITELIBDIR%%/pyang/yin_parser.pyc
 %%PYTHON_SITELIBDIR%%/pyang/yin_parser.pyo
-share/yang/modules/ietf-inet-types.yang
-share/yang/modules/ietf-netconf-monitoring.yang
-share/yang/modules/ietf-yang-types.yang
-share/yang/modules/yang-smi.yang
-share/yang/schema/relaxng-lib.rng
-share/yang/schema/yin.rng
-share/yang/xslt/basename.xsl
-share/yang/xslt/dsrl2xslt.xsl
-share/yang/xslt/gen-common.xsl
-share/yang/xslt/gen-dsrl.xsl
-share/yang/xslt/gen-relaxng.xsl
-share/yang/xslt/gen-schematron.xsl
-share/yang/xslt/iso_abstract_expand.xsl
-share/yang/xslt/iso_schematron_skeleton_for_xslt1.xsl
-share/yang/xslt/iso_svrl_for_xslt1.xsl
-share/yang/xslt/svrl2text.xsl
-share/yang/xslt/yin2yang.xsl
-@dirrm share/yang/xslt
-@dirrm share/yang/schema
-@dirrm share/yang/modules
-@dirrm share/yang
+%%DATADIR%%/images/case.png
+%%DATADIR%%/images/choice.png
+%%DATADIR%%/images/container.png
+%%DATADIR%%/images/file.gif
+%%DATADIR%%/images/focus.png
+%%DATADIR%%/images/folder-closed.gif
+%%DATADIR%%/images/folder-open.gif
+%%DATADIR%%/images/hammer.png
+%%DATADIR%%/images/leaf-list.png
+%%DATADIR%%/images/leaf-plus.png
+%%DATADIR%%/images/leaf.png
+%%DATADIR%%/images/leafref.png
+%%DATADIR%%/images/list.png
+%%DATADIR%%/images/module.png
+%%DATADIR%%/images/notification.png
+%%DATADIR%%/modules/ietf-inet-types.yang
+%%DATADIR%%/modules/ietf-netconf-monitoring.yang
+%%DATADIR%%/modules/ietf-yang-smiv2.yang
+%%DATADIR%%/modules/ietf-yang-types.yang
+%%DATADIR%%/schema/relaxng-lib.rng
+%%DATADIR%%/schema/yin.rng
+%%DATADIR%%/xslt/basename.xsl
+%%DATADIR%%/xslt/canonicalize.xsl
+%%DATADIR%%/xslt/dsrl2xslt.xsl
+%%DATADIR%%/xslt/gen-common.xsl
+%%DATADIR%%/xslt/gen-dsrl.xsl
+%%DATADIR%%/xslt/gen-relaxng.xsl
+%%DATADIR%%/xslt/gen-schematron.xsl
+%%DATADIR%%/xslt/iso_abstract_expand.xsl
+%%DATADIR%%/xslt/iso_schematron_skeleton_for_xslt1.xsl
+%%DATADIR%%/xslt/iso_svrl_for_xslt1.xsl
+%%DATADIR%%/xslt/jsonxsl-templates.xsl
+%%DATADIR%%/xslt/svrl2text.xsl
+%%DATADIR%%/xslt/yin2yang.xsl
+@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/schema
+@dirrm %%DATADIR%%/modules
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/pyang/translators
 @dirrm %%PYTHON_SITELIBDIR%%/pyang/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/pyang