--- Makefile.orig	2008-11-30 18:17:43.000000000 +0800
+++ Makefile	2008-11-30 20:16:13.000000000 +0800
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	webware
-DISTVERSION=	1.0r1
+DISTVERSION=	1.0
 CATEGORIES=	www python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Webware-1.0rc1
+DISTNAME=	Webware-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A versatile web application server written in Python
--- distinfo.orig	2008-07-03 17:00:24.000000000 +0800
+++ distinfo	2008-11-30 18:19:52.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (Webware-1.0rc1.tar.gz) = 52c1a2a0b7a0f9fe1a6f73ce63aaf320
-SHA256 (Webware-1.0rc1.tar.gz) = 7d5382dda61cbd0f3da442513472917eb8f2dc9233b3e08106e2cb748e7557fe
-SIZE (Webware-1.0rc1.tar.gz) = 945449
+MD5 (Webware-1.0.tar.gz) = dd9c07e289b51d29079b0d444ff18bda
+SHA256 (Webware-1.0.tar.gz) = 2e93d327c997a5a508cce517330e5a8da29b87632f426d7281e3c771039c7f71
+SIZE (Webware-1.0.tar.gz) = 956404
--- pkg-plist.orig	2008-11-30 18:17:51.000000000 +0800
+++ pkg-plist	2008-11-30 20:06:45.000000000 +0800
@@ -14,7 +14,7 @@
 %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/RelNotes-0.2.2.html
 %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/RelNotes-0.2.html
 %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/RelNotes-0.7.html
-%%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/RelNotes-1.0rc1.html
+%%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/RelNotes-1.0.html
 %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/SampleAdmin.html
 %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/SampleError.html
 %%WEBWARE_MASTER_DIR%%/CGIWrapper/Docs/Source/ClassHierarchy.html
@@ -101,7 +101,7 @@
 %%WEBWARE_MASTER_DIR%%/COMKit/Properties.pyc
 %%WEBWARE_MASTER_DIR%%/COMKit/__init__.py
 %%WEBWARE_MASTER_DIR%%/COMKit/__init__.pyc
-%%WEBWARE_MASTER_DIR%%/Docs/RelNotes-1.0rc1.html
+%%WEBWARE_MASTER_DIR%%/Docs/RelNotes-1.0.html
 %%WEBWARE_MASTER_DIR%%/DocSupport/.checksrc.config
 %%WEBWARE_MASTER_DIR%%/DocSupport/ClassList.py
 %%WEBWARE_MASTER_DIR%%/DocSupport/ClassList.pyc
@@ -282,6 +282,7 @@
 %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/RelNotes-0.9.2.html
 %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/RelNotes-0.9.3.html
 %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/RelNotes-0.9.html
+%%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/RelNotes-1.0.html
 %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source/ClassHierarchy.html
 %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source/ClassList.html
 %%WEBWARE_MASTER_DIR%%/MiddleKit/Docs/Source/FileList.html
@@ -683,7 +684,7 @@
 %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/__init__.py
 %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/__init__.pyc
 %%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/index.html
-%%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/RelNotes-1.0rc1.html
+%%WEBWARE_MASTER_DIR%%/MiscUtils/Docs/RelNotes-1.0.html
 %%WEBWARE_MASTER_DIR%%/MiscUtils/Error.py
 %%WEBWARE_MASTER_DIR%%/MiscUtils/Error.pyc
 %%WEBWARE_MASTER_DIR%%/MiscUtils/Funcs.py
@@ -876,7 +877,7 @@
 %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/__init__.py
 %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/__init__.pyc
 %%WEBWARE_MASTER_DIR%%/TaskKit/Docs/index.html
-%%WEBWARE_MASTER_DIR%%/TaskKit/Docs/RelNotes-1.0rc1.html
+%%WEBWARE_MASTER_DIR%%/TaskKit/Docs/RelNotes-1.0.html
 %%WEBWARE_MASTER_DIR%%/TaskKit/Properties.py
 %%WEBWARE_MASTER_DIR%%/TaskKit/Properties.pyc
 %%WEBWARE_MASTER_DIR%%/TaskKit/Scheduler.py
@@ -1307,7 +1308,7 @@
 %%WEBWARE_MASTER_DIR%%/WebKit/Docs/__init__.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Docs/docutils.conf
 %%WEBWARE_MASTER_DIR%%/WebKit/Docs/index.html
-%%WEBWARE_MASTER_DIR%%/WebKit/Docs/RelNotes-1.0rc1.html
+%%WEBWARE_MASTER_DIR%%/WebKit/Docs/RelNotes-1.0.html
 %%WEBWARE_MASTER_DIR%%/WebKit/ErrorMsgs/_README
 %%WEBWARE_MASTER_DIR%%/WebKit/Examples/AjaxPage.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Examples/AjaxPage.pyc
@@ -1451,7 +1452,6 @@
 %%WEBWARE_MASTER_DIR%%/WebKit/Tasks/SessionTask.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Tasks/__init__.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Tasks/__init__.pyc
-%%WEBWARE_MASTER_DIR%%/WebKit/Testing/CountVisits.rr
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/DebugPage.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/DebugPage.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Dir/File.html
@@ -1478,14 +1478,12 @@
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Forward3Target.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/IncludeURLTest.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/IncludeURLTest.pyc
-%%WEBWARE_MASTER_DIR%%/WebKit/Testing/ListBox.rr
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Main.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Main.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Servlet.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/Servlet.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/SetCookie.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/SetCookie.pyc
-%%WEBWARE_MASTER_DIR%%/WebKit/Testing/ShowTime.rr
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/TestCases.data
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/TestIMS.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/TestIMS.pyc
@@ -1529,11 +1527,8 @@
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/vhosts/Main.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/vhosts/__init__.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/vhosts/__init__.pyc
-%%WEBWARE_MASTER_DIR%%/WebKit/Testing/Welcome.rr
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/__init__.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/__init__.pyc
-%%WEBWARE_MASTER_DIR%%/WebKit/Testing/stress.py
-%%WEBWARE_MASTER_DIR%%/WebKit/Testing/stress.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/test.html
 %%WEBWARE_MASTER_DIR%%/WebKit/Testing/test.text
 %%WEBWARE_MASTER_DIR%%/WebKit/Tests/AppServerTest.py
@@ -1570,6 +1565,19 @@
 %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Test.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Tests/__init__.py
 %%WEBWARE_MASTER_DIR%%/WebKit/Tests/__init__.pyc
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress/CountVisits.rr
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress/ShowTime.rr
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress/ListBox.rr
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress/stress.py
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress/Welcome.rr
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress/stress.pyc
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/Docs.twill
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/WebKit.twill
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/Admin.twill
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/MKBrowser.twill
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/Testing.twill
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/KidKit.twill
+%%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill/PSP.twill
 %%WEBWARE_MASTER_DIR%%/WebKit/ThreadedAppServer.py
 %%WEBWARE_MASTER_DIR%%/WebKit/ThreadedAppServer.pyc
 %%WEBWARE_MASTER_DIR%%/WebKit/Transaction.py
@@ -1712,6 +1720,8 @@
 @dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Basic/TestContext
 @dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Basic/Configs
 @dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Tests/Basic
+@dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Tests/stress
+@dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Tests/twill
 @dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Tests
 @dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/vhosts
 @dirrmtry %%WEBWARE_MASTER_DIR%%/WebKit/Testing/URL/test5join2