5 files changed, 53 insertions, 24 deletions

diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index 7823103200e5..86f1d8276234 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	pykawari
-PORTVERSION=	8.1.0
-PORTREVISION=	2
+PORTVERSION=	8.2.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kawari
 DISTNAME=	kawari-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.lzh
+EXTRACT_SUFX=	.zip
 
-PATCH_SITES=	http://rinakusu.at.infoseek.co.jp/
-PATCHFILES=	kawari-810-py-module.patch
-PATCH_DIST_STRIP=	-p1
+PATCH_SITES=	http://ninix-aya.sourceforge.jp/
+PATCHFILES=	kawari-822.diff.gz \
+		kawari-822-2.diff.gz
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
-COMMENT=	Pykawari is a real kawari8 module for ninix-aya
+COMMENT=	A real kawari8 module for ninix-aya
 
-EXTRACT_DEPENDS=lha:${PORTSDIR}/archivers/lha
+EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	ninix:${PORTSDIR}/games/ninix-aya
 
-EXTRACT_CMD=	lha
-EXTRACT_BEFORE_ARGS=	xfqw=${WRKDIR}
+EXTRACT_CMD=	${UNZIP_CMD}
+EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
@@ -52,7 +51,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${PREFIX}/share/kawari
-	(cd ${WRKSRC}; ${TAR} -cf - document license.txt readme.1st build/build.txt) | ${TAR} -xvpf - -C ${PREFIX}/share/kawari
+	(cd ${WRKSRC}; ${TAR} -cf - document license.txt readme.1st build/BUILD.TXT) | ${TAR} -xvpf - -C ${PREFIX}/share/kawari
 	${LN} -f ${WRKSRC}/build/mach/freebsd/libshiori.so ${WRKSRC}/build/mach/freebsd/_kawari8.so
 	${MKDIR} ${PREFIX}/libexec/ninix
 	${INSTALL_PROGRAM} ${WRKSRC}/build/mach/freebsd/_kawari8.so ${PREFIX}/libexec/ninix
diff --git a/games/pykawari/distinfo b/games/pykawari/distinfo
index 74c14f4a0563..c8adee9df86b 100644
--- a/games/pykawari/distinfo
+++ b/games/pykawari/distinfo
@@ -1,4 +1,6 @@
-MD5 (kawari-810.lzh) = 20021f6164f306a2ff9063f3f357cf20
-SIZE (kawari-810.lzh) = 1329287
-MD5 (kawari-810-py-module.patch) = 1074f8c088f7a7b6c0ac20e5af08aa92
-SIZE (kawari-810-py-module.patch) = 5221
+MD5 (kawari-822.zip) = 73c8fe087be1b1e6cb2f0013c6bd1a34
+SIZE (kawari-822.zip) = 1385455
+MD5 (kawari-822.diff.gz) = 2e4b4600fa146440a08ee6bed2301ea6
+SIZE (kawari-822.diff.gz) = 296
+MD5 (kawari-822-2.diff.gz) = e54b0467ca20e4be18206b998a7dbb8f
+SIZE (kawari-822-2.diff.gz) = 659
diff --git a/games/pykawari/files/patch-build::src::gcc.mak b/games/pykawari/files/patch-build::src::gcc.mak
index a8437c69d7e9..ddb828e5d0fb 100644
--- a/games/pykawari/files/patch-build::src::gcc.mak
+++ b/games/pykawari/files/patch-build::src::gcc.mak
@@ -1,15 +1,39 @@
---- build/src/gcc.mak.orig	Fri Mar 12 20:29:21 2004
-+++ build/src/gcc.mak	Fri Mar 12 20:38:29 2004
-@@ -6,7 +6,7 @@
+--- build/src/gcc.mak.orig	Sat Aug 28 19:16:34 2004
++++ build/src/gcc.mak	Sat Oct  2 15:26:37 2004
+@@ -6,21 +6,21 @@
  # ターゲットによって書き換え
  
  ## mach type: cygwin, mingw, linux, freebsd, darwin
--MACH_TYPE = linux
+-MACH_TYPE = mingw
 +MACH_TYPE = freebsd
  
  ## target name
  SHIORI = shiori
-@@ -42,6 +42,7 @@
+ 
+ ## if use STLport, set STLport=yes
+-STLport = yes
++# STLport = yes
+ 
+ # (STLport) specify library include directory.
+-STLP_CFLAGS = -I/MinGW/include/stlport
+-STLP_LIBS = -lstlport_mingw32_static
++# STLP_CFLAGS = -I/MinGW/include/stlport
++# STLP_LIBS = -lstlport_mingw32_static
+ ## fi
+ 
+ ## if you have 'upx'
+-UPX = upx
++# UPX = upx
+ 
+ #==========================================================================
+ # EXPERIMENTAL FEATURES
+@@ -37,11 +37,12 @@
+ ## fi
+ 
+ ## if use Python SAORI(and Python I/F), set PYTHON=yes
+-#PYTHON = yes
++PYTHON = yes
+ 
  ## (Python) and if win32
  # PYTHON_CFLAGS = -I/python22jp/include
  # PYTHON_LIBS = -L/python22jp/libs
diff --git a/games/pykawari/pkg-descr b/games/pykawari/pkg-descr
index 9f5631be5495..01d855e644ef 100644
--- a/games/pykawari/pkg-descr
+++ b/games/pykawari/pkg-descr
@@ -2,4 +2,3 @@ Pykawari is a real kawari8 module for ninix-aya.
 
 For more information, see
 WWW: http://kawari.sourceforge.net/
-WWW: http://rinakusu.at.infoseek.co.jp/
diff --git a/games/pykawari/pkg-plist b/games/pykawari/pkg-plist
index 478aedd98cbe..f3ce125c4ee5 100644
--- a/games/pykawari/pkg-plist
+++ b/games/pykawari/pkg-plist
@@ -1,6 +1,4 @@
 libexec/ninix/_kawari8.so
-share/kawari/license.txt
-share/kawari/readme.1st
 share/kawari/document/banners/kawalinks.png
 share/kawari/document/banners/kawari.png
 share/kawari/document/banners/kawaribts.png
@@ -9,12 +7,15 @@ share/kawari/document/banners/kawarisf.png
 share/kawari/document/banners/kawari_bbs.png
 share/kawari/document/banners/kawari_logo.png
 share/kawari/document/banners/kpcg_banner.png
+share/kawari/document/banners/fake-kawaribts.png
+share/kawari/document/banners/fake-kawalinks.png
 share/kawari/document/images/logo.png
 share/kawari/document/images/logo2.png
 share/kawari/document/images/ver_731.png
 share/kawari/document/images/ver_790.png
 share/kawari/document/images/ver_800.png
 share/kawari/document/images/ver_810.png
+share/kawari/document/images/ver_820.png
 share/kawari/document/index.html
 share/kawari/document/kawari.css
 share/kawari/document/kis_reference.html
@@ -33,7 +34,11 @@ share/kawari/document/tips.html
 share/kawari/document/users.html
 share/kawari/document/convert.html
 share/kawari/document/errormes.html
-share/kawari/build/build.txt
+share/kawari/document/source.html
+share/kawari/document/changelog.txt
+share/kawari/license.txt
+share/kawari/readme.1st
+share/kawari/build/BUILD.TXT
 @dirrm share/kawari/document/banners
 @dirrm share/kawari/document/images
 @dirrm share/kawari/document