4 files changed, 78 insertions, 43 deletions

diff --git a/net-mgmt/py-pyang/Makefile b/net-mgmt/py-pyang/Makefile
index 8d643ac3f637..aafc15bbd67d 100644
--- a/net-mgmt/py-pyang/Makefile
+++ b/net-mgmt/py-pyang/Makefile
@@ -1,32 +1,24 @@
-# New ports collection makefile for:	py-pyang
-# Date created:			2009-07-05
-# Whom:				Bruce Simpson
-#
+# Created by: Bruce Simpson
 # $FreeBSD$
-#
 
 PORTNAME=	pyang
-PORTVERSION=	0.9.3
+PORTVERSION=	1.1
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Validator and code generator for YANG (RFC 4741)
 
-USE_PYTHON=	2.5+
+LICENSE=	BSD
+
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 
 MAKE_ENV+=	YANG_INSTALL=${PREFIX}
-
-MAN1=		pyang.1
-MANCOMPRESSED=	no
-
-do-patch:
-	@${REINPLACE_CMD} 's,share/man/man1,man/man1,' ${WRKSRC}/setup.py
+MAN1=		pyang.1 yang2dsdl.1
 
 # TODO: Sed YANG_INSTALL into pyang itself.
-# TODO: Add yang2html to package.
 
 post-install:
 	@${ECHO_MSG}
diff --git a/net-mgmt/py-pyang/distinfo b/net-mgmt/py-pyang/distinfo
index c07bff40f790..bde445a67668 100644
--- a/net-mgmt/py-pyang/distinfo
+++ b/net-mgmt/py-pyang/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyang-0.9.3.tar.gz) = c603596a008d5490dc89be3daa7a569df014434a39727c32ab7fa3fa32e00e02
-SIZE (pyang-0.9.3.tar.gz) = 195729
+SHA256 (pyang-1.1.tar.gz) = d45567d67594f744cb9d1cbfef46c2049b194c2ae76af5bf0a421b12896ed31c
+SIZE (pyang-1.1.tar.gz) = 140918
diff --git a/net-mgmt/py-pyang/files/patch-setup.py b/net-mgmt/py-pyang/files/patch-setup.py
new file mode 100644
index 000000000000..b7742255509f
--- /dev/null
+++ b/net-mgmt/py-pyang/files/patch-setup.py
@@ -0,0 +1,12 @@
+--- ./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 c575c4fb9275..23bd2424b879 100644
--- a/net-mgmt/py-pyang/pkg-plist
+++ b/net-mgmt/py-pyang/pkg-plist
@@ -1,10 +1,9 @@
 bin/pyang
+bin/yang2dsdl
+bin/yang2html
 %%PYTHON_SITELIBDIR%%/pyang/__init__.py
 %%PYTHON_SITELIBDIR%%/pyang/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pyang/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyang/debug.py
-%%PYTHON_SITELIBDIR%%/pyang/debug.pyc
-%%PYTHON_SITELIBDIR%%/pyang/debug.pyo
 %%PYTHON_SITELIBDIR%%/pyang/error.py
 %%PYTHON_SITELIBDIR%%/pyang/error.pyc
 %%PYTHON_SITELIBDIR%%/pyang/error.pyo
@@ -14,36 +13,39 @@ bin/pyang
 %%PYTHON_SITELIBDIR%%/pyang/plugin.py
 %%PYTHON_SITELIBDIR%%/pyang/plugin.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugin.pyo
-%%PYTHON_SITELIBDIR%%/pyang/statements.py
-%%PYTHON_SITELIBDIR%%/pyang/statements.pyc
-%%PYTHON_SITELIBDIR%%/pyang/statements.pyo
-%%PYTHON_SITELIBDIR%%/pyang/syntax.py
-%%PYTHON_SITELIBDIR%%/pyang/syntax.pyc
-%%PYTHON_SITELIBDIR%%/pyang/syntax.pyo
-%%PYTHON_SITELIBDIR%%/pyang/types.py
-%%PYTHON_SITELIBDIR%%/pyang/types.pyc
-%%PYTHON_SITELIBDIR%%/pyang/types.pyo
-%%PYTHON_SITELIBDIR%%/pyang/util.py
-%%PYTHON_SITELIBDIR%%/pyang/util.pyc
-%%PYTHON_SITELIBDIR%%/pyang/util.pyo
-%%PYTHON_SITELIBDIR%%/pyang/yang_parser.py
-%%PYTHON_SITELIBDIR%%/pyang/yang_parser.pyc
-%%PYTHON_SITELIBDIR%%/pyang/yang_parser.pyo
-%%PYTHON_SITELIBDIR%%/pyang/yin_parser.py
-%%PYTHON_SITELIBDIR%%/pyang/yin_parser.pyc
-%%PYTHON_SITELIBDIR%%/pyang/yin_parser.pyo
 %%PYTHON_SITELIBDIR%%/pyang/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/pyang/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/depend.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/depend.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/depend.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/ietf.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/ietf.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/ietf.pyo
 %%PYTHON_SITELIBDIR%%/pyang/plugins/smi.py
 %%PYTHON_SITELIBDIR%%/pyang/plugins/smi.pyc
 %%PYTHON_SITELIBDIR%%/pyang/plugins/smi.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/tree.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/tree.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/tree.pyo
+%%PYTHON_SITELIBDIR%%/pyang/plugins/uml.py
+%%PYTHON_SITELIBDIR%%/pyang/plugins/uml.pyc
+%%PYTHON_SITELIBDIR%%/pyang/plugins/uml.pyo
+%%PYTHON_SITELIBDIR%%/pyang/statements.py
+%%PYTHON_SITELIBDIR%%/pyang/statements.pyc
+%%PYTHON_SITELIBDIR%%/pyang/statements.pyo
+%%PYTHON_SITELIBDIR%%/pyang/syntax.py
+%%PYTHON_SITELIBDIR%%/pyang/syntax.pyc
+%%PYTHON_SITELIBDIR%%/pyang/syntax.pyo
 %%PYTHON_SITELIBDIR%%/pyang/translators/__init__.py
 %%PYTHON_SITELIBDIR%%/pyang/translators/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pyang/translators/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pyang/translators/dsdl.py
 %%PYTHON_SITELIBDIR%%/pyang/translators/dsdl.pyc
 %%PYTHON_SITELIBDIR%%/pyang/translators/dsdl.pyo
+%%PYTHON_SITELIBDIR%%/pyang/translators/schemanode.py
+%%PYTHON_SITELIBDIR%%/pyang/translators/schemanode.pyc
+%%PYTHON_SITELIBDIR%%/pyang/translators/schemanode.pyo
 %%PYTHON_SITELIBDIR%%/pyang/translators/xsd.py
 %%PYTHON_SITELIBDIR%%/pyang/translators/xsd.pyc
 %%PYTHON_SITELIBDIR%%/pyang/translators/xsd.pyo
@@ -53,12 +55,41 @@ bin/pyang
 %%PYTHON_SITELIBDIR%%/pyang/translators/yin.py
 %%PYTHON_SITELIBDIR%%/pyang/translators/yin.pyc
 %%PYTHON_SITELIBDIR%%/pyang/translators/yin.pyo
-share/yang/modules/ieee-types.yang
-share/yang/modules/inet-types.yang
+%%PYTHON_SITELIBDIR%%/pyang/types.py
+%%PYTHON_SITELIBDIR%%/pyang/types.pyc
+%%PYTHON_SITELIBDIR%%/pyang/types.pyo
+%%PYTHON_SITELIBDIR%%/pyang/util.py
+%%PYTHON_SITELIBDIR%%/pyang/util.pyc
+%%PYTHON_SITELIBDIR%%/pyang/util.pyo
+%%PYTHON_SITELIBDIR%%/pyang/xpath.py
+%%PYTHON_SITELIBDIR%%/pyang/xpath.pyc
+%%PYTHON_SITELIBDIR%%/pyang/xpath.pyo
+%%PYTHON_SITELIBDIR%%/pyang/yang_parser.py
+%%PYTHON_SITELIBDIR%%/pyang/yang_parser.pyc
+%%PYTHON_SITELIBDIR%%/pyang/yang_parser.pyo
+%%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/modules/yang-types.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
+@dirrm share/yang/xslt
+@dirrm share/yang/schema
+@dirrm share/yang/modules
+@dirrm share/yang
 @dirrm %%PYTHON_SITELIBDIR%%/pyang/translators
 @dirrm %%PYTHON_SITELIBDIR%%/pyang/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/pyang
-@dirrm share/yang/modules
-@dirrm share/yang