2 files changed, 8 insertions, 154 deletions

diff --git a/www/py-webware/Makefile b/www/py-webware/Makefile
index ef1c39693355..138ab70caeb3 100644
--- a/www/py-webware/Makefile
+++ b/www/py-webware/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	webware
-DISTVERSION=	1.1.1
+PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	SF/${PORTNAME}/Webware/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,8 +19,8 @@ NO_BUILD=	yes
 
 WEBWARE_USER?=	webkit
 WEBWARE_GROUP?=	${WEBWARE_USER}
-USERS=${WEBWARE_USER}
-GROUPS=${WEBWARE_GROUP}
+USERS=		${WEBWARE_USER}
+GROUPS=		${WEBWARE_GROUP}
 WEBWARE_MASTER_DIR?=${PREFIX}/share/webware
 WEBKIT_HOME_DIR?=${PREFIX}/www/webkit
 INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
diff --git a/www/py-webware/pkg-plist b/www/py-webware/pkg-plist
index 486803962d3a..9b59765aa0f3 100644
--- a/www/py-webware/pkg-plist
+++ b/www/py-webware/pkg-plist
@@ -1669,149 +1669,6 @@ etc/rc.d/webkit.sh-dist
 %%WEBWARE_MASTER_DIR%%/clean.py
 %%WEBWARE_MASTER_DIR%%/install.log
 %%WEBWARE_MASTER_DIR%%/install.py
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper/Examples
-@dirrm %%WEBWARE_MASTER_DIR%%/CGIWrapper
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit/Examples
-@dirrm %%WEBWARE_MASTER_DIR%%/COMKit
-@dirrm %%WEBWARE_MASTER_DIR%%/DocSupport
-@dirrm %%WEBWARE_MASTER_DIR%%/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit/Examples
-@dirrm %%WEBWARE_MASTER_DIR%%/KidKit
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Core
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Design
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Videos/Command
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Videos/Middle/Videos.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Videos/Middle
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Videos
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Resources/Template.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Resources
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Run
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKBackRef.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKBasic.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKClone.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKDateTime.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKDefaultMinMax.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKDelete.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKDeleteMark.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKDump.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKEnums.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKExcel.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKInheritance.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKInheritanceAbstract.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKList.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKModelInh1.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKModelInh2.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKModelInh3.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKMultipleStores.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKMultipleThreads.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKNone.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKObjRef.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKObjRefReuse.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKRefresh.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKString.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests/MKTypeValueChecking.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/WebBrowser/Help
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit/WebBrowser
-@dirrm %%WEBWARE_MASTER_DIR%%/MiddleKit
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/MiscUtils
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Examples
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/PSP
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/TaskKit
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Tests/UserManagerTest.mkmodel
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/UserKit
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters/CGIPlus
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters/common
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters/mod_webkit1
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters/mod_webkit2
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters/wkISAPI
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters/wkcgi
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Adapters
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Admin
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Cache
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Configs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/ErrorMsgs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Examples
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Logs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Sessions
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/StartScripts
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tasks
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Dir
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test1
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test2
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test3
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test4
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test5
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test5join1
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test5join2
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/vhosts
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Testing
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Basic/Configs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Basic/TestContext
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Basic
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/WebKit
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils/Docs/Source/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils/Docs/Source/Files
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils/Docs/Source/Summaries
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils/Docs/Source
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils/Docs
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils/Tests
-@dirrm %%WEBWARE_MASTER_DIR%%/WebUtils
-@dirrm %%WEBWARE_MASTER_DIR%%/bin
-@dirrm %%WEBWARE_MASTER_DIR%%
 www/webkit/AppServer
 www/webkit/Configs/AppServer.config
 www/webkit/Configs/Application.config
@@ -1826,11 +1683,7 @@ www/webkit/MyContext/__init__.py
 www/webkit/WebKit.cgi
 www/webkit/error404.html
 www/webkit/webkit
-@exec chown -R webkit:webkit %D/www/webkit/Cache %D/www/webkit/Logs %D/www/webkit/ErrorMsgs %D/www/webkit/Sessions
-@dirrm www/webkit/Cache
-@dirrm www/webkit/Configs
-@dirrm www/webkit/ErrorMsgs
-@dirrm www/webkit/Logs
-@dirrm www/webkit/MyContext
-@dirrm www/webkit/Sessions
-@dirrm www/webkit
+@dir(webkit,webkit,) www/webkit/Sessions
+@dir(webkit,webkit,) www/webkit/Logs
+@dir(webkit,webkit,) www/webkit/ErrorMsgs
+@dir(webkit,webkit,) www/webkit/Cache