diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index 096aca2695d..258198ad3a0 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2008/03/19 13:02:59 winiger Exp $
+# $OpenBSD: Makefile,v 1.8 2008/04/15 09:36:37 martynas Exp $
 
 COMMENT=		Python web development megaframework
 
-VERSION=		1.0.4.2
-DISTNAME=		TurboGears-${VERSION}
-PKGNAME=		py-turbogears-${VERSION}p0
+MODPY_EGG_VERSION=	1.0.4.4
+DISTNAME=		TurboGears-${MODPY_EGG_VERSION}
+PKGNAME=		py-turbogears-${MODPY_EGG_VERSION}
 
 CATEGORIES=		www
 
@@ -18,7 +18,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://files.turbogears.org/eggs/
+MASTER_SITES=		http://cheeseshop.python.org/packages/source/T/TurboGears/ \
+			http://files.turbogears.org/eggs/
 
 MODULES=		lang/python
 
@@ -41,8 +42,6 @@ RUN_DEPENDS=		::databases/py-sqlalchemy \
 REGRESS_DEPENDS=	${RUN_DEPENDS} \
 			::databases/py-sqlite2
 
-SUBST_VARS=		VERSION
-
 MODPY_SETUPTOOLS=	Yes
 
 .include <bsd.port.mk>
diff --git a/www/py-turbogears/distinfo b/www/py-turbogears/distinfo
index 50bc0a70a97..9fbb9a7f04f 100644
--- a/www/py-turbogears/distinfo
+++ b/www/py-turbogears/distinfo
@@ -1,5 +1,5 @@
-MD5 (TurboGears-1.0.4.2.tar.gz) = fhxiN8YIwkk4wC2/ldHrqg==
-RMD160 (TurboGears-1.0.4.2.tar.gz) = 2Bg8lcCRslZIMAxTawkruAmLOr0=
-SHA1 (TurboGears-1.0.4.2.tar.gz) = IhAWsQeTsGSW1DQ7zMfwP5Ig6x8=
-SHA256 (TurboGears-1.0.4.2.tar.gz) = m6eSNvIEQ3wUwY4p1cophWGBr2A15ljVidhgZ0PJiTo=
-SIZE (TurboGears-1.0.4.2.tar.gz) = 1107817
+MD5 (TurboGears-1.0.4.4.tar.gz) = oDpm/PfWh/171CBaAf0h3Q==
+RMD160 (TurboGears-1.0.4.4.tar.gz) = rlSFfoKWE0WmnF7aj+I1Q6JjnkE=
+SHA1 (TurboGears-1.0.4.4.tar.gz) = d4j7ZV48J2z91wvQERmJ9NTRQPo=
+SHA256 (TurboGears-1.0.4.4.tar.gz) = zJPCKT1rCIy1VOCEuOw1+ezl1DxDZ2DPD23sGjMYz64=
+SIZE (TurboGears-1.0.4.4.tar.gz) = 1108722
diff --git a/www/py-turbogears/patches/patch-setup_py b/www/py-turbogears/patches/patch-setup_py
index 732967d3bc6..ccb05ad7bd8 100644
--- a/www/py-turbogears/patches/patch-setup_py
+++ b/www/py-turbogears/patches/patch-setup_py
@@ -1,6 +1,6 @@
-$OpenBSD: patch-setup_py,v 1.3 2008/02/01 19:15:40 martynas Exp $
---- setup.py.orig	Mon Jan 21 23:34:11 2008
-+++ setup.py	Fri Jan 25 22:33:36 2008
+$OpenBSD: patch-setup_py,v 1.4 2008/04/15 09:36:37 martynas Exp $
+--- setup.py.orig	Mon Mar  3 23:30:58 2008
++++ setup.py	Sun Apr 13 03:16:20 2008
 @@ -12,19 +12,6 @@ if sys.version_info < (2, 3):
  execfile(os.path.join("turbogears", "release.py"))
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-setup_py,v 1.3 2008/02/01 19:15:40 martynas Exp $
 -    "ConfigObj >= 4.3.2",
 -    "DecoratorTools >= 1.4",
 -    "FormEncode >= 0.7.1",
--    "PasteScript >= 0.9.7,<1.6",
+-    "PasteScript >= 1.6.2",
 -    "RuleDispatch >= 0.5a0.dev-r2303",
 -    "setuptools >= 0.6c2",
 -    "simplejson >= 1.3",
diff --git a/www/py-turbogears/pkg/PLIST b/www/py-turbogears/pkg/PLIST
index 7e67e79064a..753f775322d 100644
--- a/www/py-turbogears/pkg/PLIST
+++ b/www/py-turbogears/pkg/PLIST
@@ -1,12 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/02/01 19:15:40 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.4 2008/04/15 09:36:37 martynas Exp $
 bin/tg-admin
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/TurboGears-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/TurboGears-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/turbogears/
 lib/python${MODPY_VERSION}/site-packages/turbogears/__init__.py
 lib/python${MODPY_VERSION}/site-packages/turbogears/__init__.pyc
@@ -905,64 +905,54 @@ lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/cale
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/calendar.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-af.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-al.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-bg-cp1251.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-bg.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-big5-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-big5-utf8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-big5.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-br.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ca.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-cs-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-cs-utf8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-cs-win.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-cs-cp1250.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-cs.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-da.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-de.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-du.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-de_at.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-de_de.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-el.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-en.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-es.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-fi.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-fr.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-he-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-he-utf8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-hr-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-hr-utf8.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-he.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-hr.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-hu-cp1252.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-hu.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-it.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-jp.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ko-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ko-utf8.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ja.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ko-euc_kr.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ko.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-lt-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-lt-utf8.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-lt.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-lv-cp1252.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-lv.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-nl.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-no.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pl-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pl-utf8.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pl.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pt-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pt-utf8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pt.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-pt_br.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ro-cp1250.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ro.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ru-cp1251.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ru-koi8_r.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ru.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-ru_win_.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-si.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-sk.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-sp.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-sl.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-sq.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-sv.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-tr-cp1254.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-tr.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-cn-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-cn-utf8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-cn.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-tw-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-tw-utf8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-tw.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-utf-8.js
-lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh-utf8.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-uk-cp1251.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-uk-koi8_u.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-uk.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh_cn-gbk.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh_cn.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh_tw-big5.js
+lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/lang/calendar-zh_tw.js
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/menuarrow.gif
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/menuarrow2.gif
 lib/python${MODPY_VERSION}/site-packages/turbogears/widgets/static/calendar/skins/