4 files changed, 36 insertions, 8 deletions

diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile
index 354c90c27d8b..b5448ce942b6 100644
--- a/sysutils/py-bcfg2/Makefile
+++ b/sysutils/py-bcfg2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bcfg2
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.5.2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/bcfg/ \
 		http://mirror.opensysadmin.com/bcfg/
@@ -24,7 +24,8 @@ USE_PYDISTUTILS=	yes
 
 MAN1=	bcfg2.1
 MAN5=	bcfg2.conf.5
-MAN8=	bcfg2-admin.8 bcfg2-build-reports.8 bcfg2-repo-validate.8 bcfg2-server.8 bcfg2-info.8
+MAN8=	bcfg2-admin.8 bcfg2-build-reports.8 bcfg2-repo-validate.8 \
+	bcfg2-server.8 bcfg2-info.8 bcfg2-remote.8 bcfg2-query.8
 
 PORTDOCS=	AUTHORS COPYRIGHT ChangeLog README
 
diff --git a/sysutils/py-bcfg2/distinfo b/sysutils/py-bcfg2/distinfo
index 2fd17f073d3c..82bf75e1ce76 100644
--- a/sysutils/py-bcfg2/distinfo
+++ b/sysutils/py-bcfg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (bcfg2-0.9.4.tar.gz) = 31f8ff2ce2ce8446898ae85ced2778ca
-SHA256 (bcfg2-0.9.4.tar.gz) = 0d22792e76215947b818565d12b1e410bb9359b78423097f6c8bb238e784e046
-SIZE (bcfg2-0.9.4.tar.gz) = 754498
+MD5 (bcfg2-0.9.5.2.tar.gz) = 996c5371913c05dee3a2f09b36a20495
+SHA256 (bcfg2-0.9.5.2.tar.gz) = c31baece320e15875ce325ac9e4758db843f3c08bfdbf38ad5534fad91a1ca51
+SIZE (bcfg2-0.9.5.2.tar.gz) = 784533
diff --git a/sysutils/py-bcfg2/files/patch-setup.py b/sysutils/py-bcfg2/files/patch-setup.py
new file mode 100644
index 000000000000..8afdd30ceadc
--- /dev/null
+++ b/sysutils/py-bcfg2/files/patch-setup.py
@@ -0,0 +1,13 @@
+--- setup.py.orig	2007-07-20 04:25:34.000000000 +0400
++++ setup.py	2008-01-05 01:08:35.361671089 +0300
+@@ -3,8 +3,8 @@
+ from distutils.core import setup
+ from glob import glob
+ 
+-setup(name="Bcfg2.Server",
+-      version="0.9.5pre1",
++setup(name="bcfg2",
++      version="0.9.5.2",
+       description="Bcfg2 Server",
+       author="Narayan Desai",
+       author_email="desai@mcs.anl.gov",
diff --git a/sysutils/py-bcfg2/pkg-plist b/sysutils/py-bcfg2/pkg-plist
index 4a7ad77f94ec..db38312a0495 100644
--- a/sysutils/py-bcfg2/pkg-plist
+++ b/sysutils/py-bcfg2/pkg-plist
@@ -3,12 +3,16 @@ bin/bcfg2-info
 bin/bcfg2-build-reports
 bin/bcfg2-server
 bin/bcfg2-repo-validate
+bin/bcfg2-remote
 bin/bcfg2-admin
 bin/bcfg2
 bin/bcfg2-query
 %%PYTHON_SITELIBDIR%%/Bcfg2/__init__.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Bcfg2/Component.py
+%%PYTHON_SITELIBDIR%%/Bcfg2/Component.pyc
+%%PYTHON_SITELIBDIR%%/Bcfg2/Component.pyo
 %%PYTHON_SITELIBDIR%%/Bcfg2/Logging.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Logging.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Logging.pyo
@@ -21,9 +25,6 @@ bin/bcfg2-query
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Core.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Core.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Core.pyo
-%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Component.py
-%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Component.pyc
-%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Component.pyo
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugin.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugin.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugin.pyo
@@ -39,6 +40,9 @@ bin/bcfg2-query
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/TCheetah.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/TCheetah.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/TCheetah.pyo
+%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/TGenshi.py
+%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/TGenshi.pyc
+%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/TGenshi.pyo
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/Metadata.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/Metadata.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/Metadata.pyo
@@ -54,6 +58,9 @@ bin/bcfg2-query
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/Deps.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/Deps.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/Deps.pyo
+%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/SGenshi.py
+%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/SGenshi.pyc
+%%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/SGenshi.pyo
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/SSHbase.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/SSHbase.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/Server/Plugins/SSHbase.pyo
@@ -297,6 +304,9 @@ bin/bcfg2-query
 %%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/keyfactory.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/keyfactory.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/keyfactory.pyo
+%%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/prngd.py
+%%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/prngd.pyc
+%%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/prngd.pyo
 %%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/rijndael.py
 %%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/rijndael.pyc
 %%PYTHON_SITELIBDIR%%/Bcfg2/tlslite/utils/rijndael.pyo
@@ -447,14 +457,17 @@ bin/bcfg2-query
 %%DATADIR%%/Reports/templates/clients/detail.html
 %%DATADIR%%/Reports/templates/clients/index.html
 %%DATADIR%%/Reports/templates/clients/client-nodebox.html
+%%DATADIR%%/Reports/templates/clients/manage.html
 %%DATADIR%%/Reports/templates/config_items/listing.html
 %%DATADIR%%/Reports/templates/config_items/index.html
 %%DATADIR%%/Hostbase/templates/remove.html
 %%DATADIR%%/Hostbase/templates/dnsedit.html
 %%DATADIR%%/Hostbase/templates/new.html
 %%DATADIR%%/Hostbase/templates/confirm.html
+%%DATADIR%%/Hostbase/templates/copy.html
 %%DATADIR%%/Hostbase/templates/search.html
 %%DATADIR%%/Hostbase/templates/logout
+%%DATADIR%%/Hostbase/templates/logviewer.html
 %%DATADIR%%/Hostbase/templates/navbar
 %%DATADIR%%/Hostbase/templates/dns.html
 %%DATADIR%%/Hostbase/templates/zones.html
@@ -476,6 +489,7 @@ bin/bcfg2-query
 %%DATADIR%%/Hostbase/repo/reverseappend.tmpl
 %%DATADIR%%/Hostbase/repo/hostsappend.tmpl
 %%DATADIR%%/Hostbase/repo/named.tmpl
+%%DATADIR%%/Hostbase/repo/namedviews.tmpl
 %%DATADIR%%/Hostbase/repo/zone.tmpl
 %%DATADIR%%/Hostbase/repo/dhcpd.tmpl
 @dirrm %%DATADIR%%/Hostbase/repo