3 files changed, 58 insertions, 44 deletions

diff --git a/www/zope-FileSystemSite/Makefile b/www/zope-FileSystemSite/Makefile
index 7bcef96bbdae..b4fb9c044982 100644
--- a/www/zope-FileSystemSite/Makefile
+++ b/www/zope-FileSystemSite/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	FileSystemSite
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	www zope
-MASTER_SITES=	http://www.zope.org/Members/infrae/FileSystemSite/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES=	http://www.infrae.com/download/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	x@Vex.Net
+MAINTAINER=	x@vex.net
 COMMENT=	Enable file system based sites within Zope
 
 USE_PYTHON=	yes
diff --git a/www/zope-FileSystemSite/distinfo b/www/zope-FileSystemSite/distinfo
index 70341b023c05..57b5aa41d87e 100644
--- a/www/zope-FileSystemSite/distinfo
+++ b/www/zope-FileSystemSite/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/FileSystemSite-1.4.1.tgz) = 5c3bf90234187f0d37ab3dcf2c4c4129
-SIZE (zope/FileSystemSite-1.4.1.tgz) = 41683
+MD5 (zope/FileSystemSite-1.4.2.tgz) = 26b560b5707b17c3eb9d1bff337e3168
+SIZE (zope/FileSystemSite-1.4.2.tgz) = 45189
diff --git a/www/zope-FileSystemSite/pkg-plist b/www/zope-FileSystemSite/pkg-plist
index 6d95267fed28..50619d713a6e 100644
--- a/www/zope-FileSystemSite/pkg-plist
+++ b/www/zope-FileSystemSite/pkg-plist
@@ -1,30 +1,53 @@
-%%ZOPEPRODUCTDIR%%/FileSystemSite/EditorUtils/emacs-highlighting.el
 %%ZOPEPRODUCTDIR%%/FileSystemSite/DirectoryView.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/DirectoryView.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/EditorUtils/emacs-highlighting.el
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/__init__.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/__init__.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/refresh.txt
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/site/index_html.dtml
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ExtensionClassUtils.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ExtensionClassUtils.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/Extensions/SiteExport.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/Extensions/SiteExport.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSDTMLMethod.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSDTMLMethod.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSExternalMethod.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSExternalMethod.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSFile.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSFile.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSImage.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSImage.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSMetadata.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSMetadata.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSObject.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSObject.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSPageTemplate.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSPageTemplate.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSPropertiesObject.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSPropertiesObject.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSPythonScript.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSPythonScript.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSSTXMethod.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSSTXMethod.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/FSZSQLMethod.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/FSZSQLMethod.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/HISTORY.txt
+%%ZOPEPRODUCTDIR%%/FileSystemSite/LICENSE.txt
 %%ZOPEPRODUCTDIR%%/FileSystemSite/Permissions.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/Permissions.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/README.txt
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ReuseUtils.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/ReuseUtils.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/TrustedFSPythonScript.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/TrustedFSPythonScript.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/TrustedPythonScript.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/TrustedPythonScript.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/TrustedPythonScriptMixin.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/TrustedPythonScriptMixin.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/__init__.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/homepage.stx
-%%ZOPEPRODUCTDIR%%/FileSystemSite/refresh.txt
-%%ZOPEPRODUCTDIR%%/FileSystemSite/utils.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/version.txt
-%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/site/index_html.dtml
-%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/__init__.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/refresh.txt
-%%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/__init__.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/Extensions/SiteExport.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/Extensions/SiteExport.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/__init__.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/doc/TRUSTED_LICENSE.txt
+%%ZOPEPRODUCTDIR%%/FileSystemSite/doc/ZPL.txt
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/addFSDirView.dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/custdtml.dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/custfile.dtml
@@ -35,6 +58,7 @@
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/custstx.dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/custzsql.dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/dirview_properties.dtml
+%%ZOPEPRODUCTDIR%%/FileSystemSite/homepage.stx
 %%ZOPEPRODUCTDIR%%/FileSystemSite/images/cookie.gif
 %%ZOPEPRODUCTDIR%%/FileSystemSite/images/dirview.gif
 %%ZOPEPRODUCTDIR%%/FileSystemSite/images/fsdtml.gif
@@ -44,58 +68,48 @@
 %%ZOPEPRODUCTDIR%%/FileSystemSite/images/fspt.gif
 %%ZOPEPRODUCTDIR%%/FileSystemSite/images/fspy.gif
 %%ZOPEPRODUCTDIR%%/FileSystemSite/images/fssqlmethod.gif
+%%ZOPEPRODUCTDIR%%/FileSystemSite/refresh.txt
 %%ZOPEPRODUCTDIR%%/FileSystemSite/templates/dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/templates/script
 %%ZOPEPRODUCTDIR%%/FileSystemSite/templates/zsql
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/__init__.py
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/__init__.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/__init__.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/content.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/dummy.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/security.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/testcase.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/tidata.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/utils.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/__init__.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/content.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/content.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/dummy.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/dummy.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/security.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/security.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/testcase.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/testcase.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/tidata.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/tidata.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/utils.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/utils.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/__init__.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSFile.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSImage.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSMetadata.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPageTemplate.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPythonScript.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSSecurity.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_all.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/__init__.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSFile.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSImage.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSImage.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSMetadata.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSMetadata.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPageTemplate.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPageTemplate.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPythonScript.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPythonScript.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSSecurity.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSSecurity.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_all.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_all.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/DirectoryView.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSDTMLMethod.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSExternalMethod.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSFile.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSImage.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSMetadata.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSObject.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSPageTemplate.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSPropertiesObject.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSPythonScript.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSSTXMethod.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/FSZSQLMethod.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/Permissions.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/__init__.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/utils.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/utils.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/version.txt
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/EditorUtils
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/site
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/Extensions
+@dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/doc
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/images
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/templates