diff --git a/chinese/py-zhCodecs/Makefile b/chinese/py-zhCodecs/Makefile
index 00cd95ade9c..8358f09d2eb 100644
--- a/chinese/py-zhCodecs/Makefile
+++ b/chinese/py-zhCodecs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/12/29 19:32:37 fgsch Exp $
+# $OpenBSD: Makefile,v 1.5 2003/10/13 16:24:27 sturm Exp $
 
 COMMENT=	"Python Unicode codecs for Chinese charsets"
 
@@ -7,35 +7,27 @@ DISTNAME=	ChineseCodecs${VERSION}
 PKGNAME=	py-zhCodecs-${VERSION}
 CATEGORIES=    	chinese devel
 
-HOMEPAGE=	http://www.sf.net/projects/python-codecs/
+HOMEPAGE=	http://sourceforge.net/projects/python-codecs/
 
 MAINTAINER=	Shell Hung <shell@openbsd.org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/ \
-		ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/
+MASTER_SITES=	ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/
 
-PYTHON_VER=	2.1
+MODULES=	python
+
+MODPY_DISTUTILS_INSTALLARGS=	-O1
+
+WRKSRC=	${WRKDIST}/Python
 
-BUILD_DEPENDS+=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
-RUN_DEPENDS=	${BUILD_DEPENDS}
 NO_REGRESS=	Yes
 
-PY_CMD=		cd ${WRKSRC}/Python; python${PYTHON_VER} ./setup.py
-
-SUBST_VARS=	PYTHON_VER
-
 post-extract:
-	@${CHMOD} 711 ${WRKSRC}/Python/chinesetw
-
-do-build:
-	${PY_CMD} build --build-base=${WRKSRC}
-
-do-install:
-	${PY_CMD} install -O1 --prefix=${PREFIX}
+	@${CHMOD} 711 ${WRKSRC}/chinesetw
 
 .include <bsd.port.mk>
diff --git a/chinese/py-zhCodecs/pkg/DESCR b/chinese/py-zhCodecs/pkg/DESCR
index e8cce8a8857..122fea0e754 100644
--- a/chinese/py-zhCodecs/pkg/DESCR
+++ b/chinese/py-zhCodecs/pkg/DESCR
@@ -1,4 +1,2 @@
 This package supports Python interfaces for conversions between
 Chinese and Unicode.
-
-WWW: ${HOMEPAGE}
diff --git a/chinese/py-zhCodecs/pkg/PLIST b/chinese/py-zhCodecs/pkg/PLIST
index 9efbb5b1ef4..c703230e70e 100644
--- a/chinese/py-zhCodecs/pkg/PLIST
+++ b/chinese/py-zhCodecs/pkg/PLIST
@@ -1,33 +1,33 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/01/07 15:48:00 shell Exp $
-lib/python${PYTHON_VER}/site-packages/big5_tw.py
-lib/python${PYTHON_VER}/site-packages/big5_tw.pyc
-lib/python${PYTHON_VER}/site-packages/big5_tw.pyo
-lib/python${PYTHON_VER}/site-packages/chinesecn/__init__.py
-lib/python${PYTHON_VER}/site-packages/chinesecn/__init__.pyc
-lib/python${PYTHON_VER}/site-packages/chinesecn/__init__.pyo
-lib/python${PYTHON_VER}/site-packages/chinesecn/euc_gb23122utf.py
-lib/python${PYTHON_VER}/site-packages/chinesecn/euc_gb23122utf.pyc
-lib/python${PYTHON_VER}/site-packages/chinesecn/euc_gb23122utf.pyo
-lib/python${PYTHON_VER}/site-packages/chinesecn/utf2euc_gb2312.py
-lib/python${PYTHON_VER}/site-packages/chinesecn/utf2euc_gb2312.pyc
-lib/python${PYTHON_VER}/site-packages/chinesecn/utf2euc_gb2312.pyo
-lib/python${PYTHON_VER}/site-packages/chinesetw/__init__.py
-lib/python${PYTHON_VER}/site-packages/chinesetw/__init__.pyc
-lib/python${PYTHON_VER}/site-packages/chinesetw/__init__.pyo
-lib/python${PYTHON_VER}/site-packages/chinesetw/big52utf1.py
-lib/python${PYTHON_VER}/site-packages/chinesetw/big52utf1.pyc
-lib/python${PYTHON_VER}/site-packages/chinesetw/big52utf1.pyo
-lib/python${PYTHON_VER}/site-packages/chinesetw/big52utf2.py
-lib/python${PYTHON_VER}/site-packages/chinesetw/big52utf2.pyc
-lib/python${PYTHON_VER}/site-packages/chinesetw/big52utf2.pyo
-lib/python${PYTHON_VER}/site-packages/chinesetw/utf2big51.py
-lib/python${PYTHON_VER}/site-packages/chinesetw/utf2big51.pyc
-lib/python${PYTHON_VER}/site-packages/chinesetw/utf2big51.pyo
-lib/python${PYTHON_VER}/site-packages/chinesetw/utf2big52.py
-lib/python${PYTHON_VER}/site-packages/chinesetw/utf2big52.pyc
-lib/python${PYTHON_VER}/site-packages/chinesetw/utf2big52.pyo
-lib/python${PYTHON_VER}/site-packages/eucgb2312_cn.py
-lib/python${PYTHON_VER}/site-packages/eucgb2312_cn.pyc
-lib/python${PYTHON_VER}/site-packages/eucgb2312_cn.pyo
-@dirrm lib/python${PYTHON_VER}/site-packages/chinesetw
-@dirrm lib/python${PYTHON_VER}/site-packages/chinesecn
+@comment $OpenBSD: PLIST,v 1.2 2003/10/13 16:24:27 sturm Exp $
+lib/python${MODPY_VERSION}/site-packages/big5_tw.py
+lib/python${MODPY_VERSION}/site-packages/big5_tw.pyc
+lib/python${MODPY_VERSION}/site-packages/big5_tw.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesecn/__init__.py
+lib/python${MODPY_VERSION}/site-packages/chinesecn/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesecn/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesecn/euc_gb23122utf.py
+lib/python${MODPY_VERSION}/site-packages/chinesecn/euc_gb23122utf.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesecn/euc_gb23122utf.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesecn/utf2euc_gb2312.py
+lib/python${MODPY_VERSION}/site-packages/chinesecn/utf2euc_gb2312.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesecn/utf2euc_gb2312.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesetw/__init__.py
+lib/python${MODPY_VERSION}/site-packages/chinesetw/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesetw/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesetw/big52utf1.py
+lib/python${MODPY_VERSION}/site-packages/chinesetw/big52utf1.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesetw/big52utf1.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesetw/big52utf2.py
+lib/python${MODPY_VERSION}/site-packages/chinesetw/big52utf2.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesetw/big52utf2.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesetw/utf2big51.py
+lib/python${MODPY_VERSION}/site-packages/chinesetw/utf2big51.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesetw/utf2big51.pyo
+lib/python${MODPY_VERSION}/site-packages/chinesetw/utf2big52.py
+lib/python${MODPY_VERSION}/site-packages/chinesetw/utf2big52.pyc
+lib/python${MODPY_VERSION}/site-packages/chinesetw/utf2big52.pyo
+lib/python${MODPY_VERSION}/site-packages/eucgb2312_cn.py
+lib/python${MODPY_VERSION}/site-packages/eucgb2312_cn.pyc
+lib/python${MODPY_VERSION}/site-packages/eucgb2312_cn.pyo
+@dirrm lib/python${MODPY_VERSION}/site-packages/chinesetw
+@dirrm lib/python${MODPY_VERSION}/site-packages/chinesecn