Update to 2.0b2

PR:		35058
Submitted by:	maintainer

4 files changed, 58 insertions, 40 deletions

diff --git a/korean/pycodec/Makefile b/korean/pycodec/Makefile
index 1f98447d95cb..6b49849a4c28 100644
--- a/korean/pycodec/Makefile
+++ b/korean/pycodec/Makefile
@@ -6,29 +6,17 @@
 #
 
 PORTNAME=	pycodec
-PORTVERSION=	1.4
+PORTVERSION=	2.0b2
 CATEGORIES=	korean python converters
-MASTER_SITES=	ftp://people.linuxkorea.co.kr/pub/Python/ \
-		ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/ \
-		ftp://www3.kr.freebsd.org/pub/FreeBSD/ports/distfiles/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	koco
 DISTNAME=	KoreanCodecs-${PORTVERSION}
 
 MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
-PYTHON_CODECDIR=${PYTHON_LIBDIR}/encodings
-PLIST_SUB+=	PYTHON_CODECDIR=${PYTHON_CODECDIR:S,^${LOCALBASE}/,,g}
-
-# Since there's only one popular encoding in korea,
-# this codec doesn't install into site-packages like ja-pycodec
-# for using like unicode("KANADARA", "euc-kr")
-do-build:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/euc_kr.py* ${WRKSRC}/uhc.py* \
-		${PYTHON_CODECDIR}/
-	${MKDIR} ${PYTHON_CODECDIR}/korean
-	${INSTALL_DATA} ${WRKSRC}/korean/* ${PYTHON_CODECDIR}/korean
+PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
+MAKEFILE=	misc/Makefile.FreeBSD
+MAKE_ENV=	PORTSDIR="${PORTSDIR}"
 
 .include <bsd.port.mk>
diff --git a/korean/pycodec/distinfo b/korean/pycodec/distinfo
index c18cc0b508e6..76854b7e22fb 100644
--- a/korean/pycodec/distinfo
+++ b/korean/pycodec/distinfo
@@ -1 +1 @@
-MD5 (KoreanCodecs-1.4.tar.gz) = f10fe99044a4737bb78b75c291e44160
+MD5 (KoreanCodecs-2.0b2.tar.gz) = 0103c4d88a4f9078f39a7d33526d5ec6
diff --git a/korean/pycodec/pkg-descr b/korean/pycodec/pkg-descr
index b94cbd8139e8..f05246b02c69 100644
--- a/korean/pycodec/pkg-descr
+++ b/korean/pycodec/pkg-descr
@@ -2,3 +2,5 @@ This package provides Unicode codecs that make Python aware of
 Korean character encoding 'EUC-KR'. By using this package, 
 Korean characters can be treated as a character string
 instead of a byte sequence.
+
+WWW: http://sourceforge.net/projects/koco
diff --git a/korean/pycodec/pkg-plist b/korean/pycodec/pkg-plist
index 8a06f78577dd..27196eed9b6c 100644
--- a/korean/pycodec/pkg-plist
+++ b/korean/pycodec/pkg-plist
@@ -1,21 +1,49 @@
-%%PYTHON_CODECDIR%%/euc_kr.py
-%%PYTHON_CODECDIR%%/euc_kr.pyc
-%%PYTHON_CODECDIR%%/korean/__init__.py
-%%PYTHON_CODECDIR%%/korean/euc2ucs.py
-%%PYTHON_CODECDIR%%/korean/hanja2ucs.py
-%%PYTHON_CODECDIR%%/korean/misc2ucs.py
-%%PYTHON_CODECDIR%%/korean/ucs2euc.py
-%%PYTHON_CODECDIR%%/korean/ucs2hanja.py
-%%PYTHON_CODECDIR%%/korean/ucs2misc.py
-%%PYTHON_CODECDIR%%/korean/ucs2uhc.py
-%%PYTHON_CODECDIR%%/korean/uhc2ucs.py
-%%PYTHON_CODECDIR%%/korean/__init__.pyc
-%%PYTHON_CODECDIR%%/korean/euc2ucs.pyc
-%%PYTHON_CODECDIR%%/korean/hanja2ucs.pyc
-%%PYTHON_CODECDIR%%/korean/misc2ucs.pyc
-%%PYTHON_CODECDIR%%/korean/ucs2euc.pyc
-%%PYTHON_CODECDIR%%/korean/ucs2hanja.pyc
-%%PYTHON_CODECDIR%%/korean/ucs2misc.pyc
-%%PYTHON_CODECDIR%%/korean/ucs2uhc.pyc
-%%PYTHON_CODECDIR%%/korean/uhc2ucs.pyc
-@dirrm %%PYTHON_CODECDIR%%/korean
+%%PYTHON_SITELIBDIR%%/KoreanCodecs.pth
+%%PYTHON_SITELIBDIR%%/korean/__init__.py
+%%PYTHON_SITELIBDIR%%/korean/__init__.pyc
+%%PYTHON_SITELIBDIR%%/korean/c/__init__.py
+%%PYTHON_SITELIBDIR%%/korean/c/__init__.pyc
+%%PYTHON_SITELIBDIR%%/korean/cp949.py
+%%PYTHON_SITELIBDIR%%/korean/cp949.pyc
+%%PYTHON_SITELIBDIR%%/korean/euc_kr.py
+%%PYTHON_SITELIBDIR%%/korean/euc_kr.pyc
+%%PYTHON_SITELIBDIR%%/korean/hangul.py
+%%PYTHON_SITELIBDIR%%/korean/hangul.pyc
+%%PYTHON_SITELIBDIR%%/korean/iso_2022_kr.py
+%%PYTHON_SITELIBDIR%%/korean/iso_2022_kr.pyc
+%%PYTHON_SITELIBDIR%%/korean/johab.py
+%%PYTHON_SITELIBDIR%%/korean/johab.pyc
+%%PYTHON_SITELIBDIR%%/korean/mappings/__init__.py
+%%PYTHON_SITELIBDIR%%/korean/mappings/__init__.pyc
+%%PYTHON_SITELIBDIR%%/korean/mappings/johab_ideograph.py
+%%PYTHON_SITELIBDIR%%/korean/mappings/johab_ideograph.pyc
+%%PYTHON_SITELIBDIR%%/korean/mappings/ksc5601_hangul.py
+%%PYTHON_SITELIBDIR%%/korean/mappings/ksc5601_hangul.pyc
+%%PYTHON_SITELIBDIR%%/korean/mappings/ksc5601_ideograph.py
+%%PYTHON_SITELIBDIR%%/korean/mappings/ksc5601_ideograph.pyc
+%%PYTHON_SITELIBDIR%%/korean/mappings/ksc5601_misc.py
+%%PYTHON_SITELIBDIR%%/korean/mappings/ksc5601_misc.pyc
+%%PYTHON_SITELIBDIR%%/korean/mappings/uhc.py
+%%PYTHON_SITELIBDIR%%/korean/mappings/uhc.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/__init__.py
+%%PYTHON_SITELIBDIR%%/korean/python/__init__.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/cp949.py
+%%PYTHON_SITELIBDIR%%/korean/python/cp949.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/euc_kr.py
+%%PYTHON_SITELIBDIR%%/korean/python/euc_kr.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/iso_2022_kr.py
+%%PYTHON_SITELIBDIR%%/korean/python/iso_2022_kr.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/johab.py
+%%PYTHON_SITELIBDIR%%/korean/python/johab.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/qwerty2bul.py
+%%PYTHON_SITELIBDIR%%/korean/python/qwerty2bul.pyc
+%%PYTHON_SITELIBDIR%%/korean/python/unijohab.py
+%%PYTHON_SITELIBDIR%%/korean/python/unijohab.pyc
+%%PYTHON_SITELIBDIR%%/korean/qwerty2bul.py
+%%PYTHON_SITELIBDIR%%/korean/qwerty2bul.pyc
+%%PYTHON_SITELIBDIR%%/korean/unijohab.py
+%%PYTHON_SITELIBDIR%%/korean/unijohab.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/korean/python
+@dirrm %%PYTHON_SITELIBDIR%%/korean/mappings
+@dirrm %%PYTHON_SITELIBDIR%%/korean/c
+@dirrm %%PYTHON_SITELIBDIR%%/korean