3 files changed, 47 insertions, 49 deletions

diff --git a/www/zope-FileSystemSite/Makefile b/www/zope-FileSystemSite/Makefile
index aeef459f65a1..127fb33fa230 100644
--- a/www/zope-FileSystemSite/Makefile
+++ b/www/zope-FileSystemSite/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	FileSystemSite
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	www zope
-MASTER_SITES=	http://zope.org/Members/philikon/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	http://zope.org/Members/infrae/FileSystemSite/${PORTNAME}-${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
@@ -24,17 +23,14 @@ DIST_SUBDIR=	zope
 ZOPEPRODUCTNAME=${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
-CPIO=		cpio --quiet -pdum -R
 
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	@ ${CHMOD} -R og+rX ${WRKSRC}/
-	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && ${FIND} . \
-	  | ${CPIO} ${BINOWN}:${BINGRP} \
-	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
+	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
+	@${CHMOD} -R og+rX ${WRKSRC}/
+	@${CP} -R ${WRKSRC} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
 
 post-install:
 .if !defined(BATCH)
diff --git a/www/zope-FileSystemSite/distinfo b/www/zope-FileSystemSite/distinfo
index 5394ec0b446b..70341b023c05 100644
--- a/www/zope-FileSystemSite/distinfo
+++ b/www/zope-FileSystemSite/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/FileSystemSite-1.3.tgz) = 00b258f829c018bb883ca19d4ab193ef
-SIZE (zope/FileSystemSite-1.3.tgz) = 41360
+MD5 (zope/FileSystemSite-1.4.1.tgz) = 5c3bf90234187f0d37ab3dcf2c4c4129
+SIZE (zope/FileSystemSite-1.4.1.tgz) = 41683
diff --git a/www/zope-FileSystemSite/pkg-plist b/www/zope-FileSystemSite/pkg-plist
index 17d522f3716b..6d95267fed28 100644
--- a/www/zope-FileSystemSite/pkg-plist
+++ b/www/zope-FileSystemSite/pkg-plist
@@ -1,39 +1,30 @@
-%%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/Extensions/SiteExport.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/Extensions/SiteExport.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/DirectoryView.py
 %%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/Permissions.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/Permissions.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/README.txt
 %%ZOPEPRODUCTDIR%%/FileSystemSite/__init__.py
-%%ZOPEPRODUCTDIR%%/FileSystemSite/__init__.pyc
+%%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/dtml/addFSDirView.dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/custdtml.dtml
 %%ZOPEPRODUCTDIR%%/FileSystemSite/dtml/custfile.dtml
@@ -53,43 +44,54 @@
 %%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/__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/__init__.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/content.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/dummy.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/security.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/testcase.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/tidata.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/base/utils.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/__init__.py
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSFile.py
-%%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/__init__.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSFile.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSImage.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSMetadata.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPageTemplate.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSPythonScript.pyc
+%%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_FSSecurity.pyc
 %%ZOPEPRODUCTDIR%%/FileSystemSite/tests/test_all.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/utils.py
+%%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.pyc
-%%ZOPEPRODUCTDIR%%/FileSystemSite/version.txt
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/EditorUtils
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite/site
 @dirrm %%ZOPEPRODUCTDIR%%/FileSystemSite/ExampleSite