5 files changed, 70 insertions, 97 deletions

diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index af54fdf8c37d..d66e64af081a 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -6,18 +6,13 @@
 #
 
 PORTNAME=	pykawari
-PORTVERSION=	8.2.2
-PORTREVISION=	3
+PORTVERSION=	8.2.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kawari
 DISTNAME=	kawari-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.zip
 
-PATCH_SITES=	http://ninix-aya.sourceforge.jp/
-PATCHFILES=	kawari-822.diff.gz \
-		kawari-822-2.diff.gz
-
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	A real kawari8 module for ninix-aya
 
diff --git a/games/pykawari/distinfo b/games/pykawari/distinfo
index c8adee9df86b..434eed75a3fb 100644
--- a/games/pykawari/distinfo
+++ b/games/pykawari/distinfo
@@ -1,6 +1,2 @@
-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
+MD5 (kawari-823.zip) = df4ea5ed2cb68b378a50ba0c10b10ccf
+SIZE (kawari-823.zip) = 1241058
diff --git a/games/pykawari/files/patch-build_src_gcc.mak b/games/pykawari/files/patch-build_src_gcc.mak
index ddb828e5d0fb..2926f754a8c8 100644
--- a/games/pykawari/files/patch-build_src_gcc.mak
+++ b/games/pykawari/files/patch-build_src_gcc.mak
@@ -1,67 +1,88 @@
---- 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 @@
- # ターゲットによって書き換え
+--- build/src/gcc.mak.orig	Tue Jun 21 22:28:54 2005
++++ build/src/gcc.mak	Wed Sep 14 10:00:26 2005
+@@ -8,14 +8,14 @@
+ #==========================================================================
  
- ## mach type: cygwin, mingw, linux, freebsd, darwin
+ ## choose your target: cygwin, mingw, linux, freebsd, darwin
 -MACH_TYPE = mingw
 +MACH_TYPE = freebsd
  
- ## target name
+ ## output name
  SHIORI = shiori
  
- ## if use STLport, set STLport=yes
--STLport = yes
-+# STLport = yes
+ ## if you have 'upx' and want to use it
+ # UPX = upx
+-UPX = upx
++
  
- # (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 want to use STLport, set STLport=yes
+ # STLport = yes
+@@ -24,17 +24,17 @@
+ SAORI_NATIVE = yes
  
- ## if you have 'upx'
--UPX = upx
-+# UPX = upx
+ ## if you want to use Python SAORI, set SAORI_PYTHON=yes
+-# SAORI_PYTHON = yes
++SAORI_PYTHON = yes
  
- #==========================================================================
- # EXPERIMENTAL FEATURES
-@@ -37,11 +37,12 @@
- ## fi
+ ## if you want to use Java SAORI, set SAORI_JAVA=yes
+ # SAORI_JAVA = yes
  
- ## if use Python SAORI(and Python I/F), set PYTHON=yes
--#PYTHON = yes
-+PYTHON = yes
+ ## if you want to make a Python SHIORI, set SHIORI_PYTHON=yes
+-# SHIORI_PYTHON = yes
++SHIORI_PYTHON = yes
  
- ## (Python) and if win32
- # PYTHON_CFLAGS = -I/python22jp/include
- # PYTHON_LIBS = -L/python22jp/libs
-+PYTHON_LIBS = -L${PYTHONBASE}/lib/${PYTHON_VERSION}/config -l${PYTHON_VERSION}
+ ## Global options
+-CFLAGS  = -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
+-LDFLAGS = -s
++CFLAGS  += -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
++LDFLAGS += -s
  
  #==========================================================================
- # 以下、基本的に書き換え不要
-@@ -146,19 +147,19 @@
- 	$(CXX) -o $@ -bundle $(SHIOOBJ) $(LIBOBJ) $(LDFLAGS)
+ # Directories
+@@ -96,7 +96,7 @@
+ 
+ ifeq ($(SHIORI_PYTHON),yes)
+ 	_LINK_PYTHON = 1
+-	SHIOSRC := $(SHIOSRC) $(SHIOSRC_python)
++	SHIOSRC := $(SHIOSRC) $(SHIOSRC_PYTHON)
+ endif
+ 
+ ifdef _LINK_PYTHON_
+@@ -104,7 +104,7 @@
+ 	ifndef CFLAGS_PYTHON
+ 		CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
+ 		CFLAGS  := $(CFLAGS_PYTHON) $(CFLAGS)
+-		LIBS    := $(LIBS) -lpython$(PYTHON_VER)
++		LIBS    := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}
+ 	endif
+ endif
+ 
+@@ -145,22 +145,23 @@
+ ## TARGETS ##
+ .PHONY: clean cleanall depend upx
+ 
+-all : $(ALLTARGET) upx
++#all : $(ALLTARGET) 
++all : $(ALLTARGET) $(UPX)
+ 
+ $(MACH)/$(DYNLIBPREFIX)$(SHIORI)$(DYNLIBEXT) : $(SHIOOBJ) $(COREOBJ) $(DEPLIB)
+ 	$(CXX) -o$@ $(SHARED_$(MACH_TYPE)) $(LDFLAGS) $(SHIOOBJ) $(COREOBJ) $(LIBS)
  
- $(MACH)/kosui$(EXEEXT) : $(KOSUIOBJ) $(LIBOBJ)
--	$(CXX) -o $@ $(KOSUIOBJ) $(LIBOBJ) $(LDFLAGS)
-+	$(CXX) -o $@ $(KOSUIOBJ) $(LIBOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
- 	$(STRIP) $@
+ $(MACH)/kosui$(EXEEXT) : $(KOSUIOBJ) $(COREOBJ) $(DEPLIB)
+-	$(CXX) -o$@ $(LDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS)
++	$(CXX) -o$@ $(LDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS) ${PTHREAD_LIBS} -lutil
  
  $(MACH)/kawari_encode$(EXEEXT) : tool/kawari_encode$(OBJEXT) $(CRYPTOBJ)
--	$(CXX) -o $@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
-+	$(CXX) -o $@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS}
- 	$(STRIP) $@
+-	$(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
++	$(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
  
  $(MACH)/kawari_encode2$(EXEEXT) : tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ)
--	$(CXX) -o $@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
-+	$(CXX) -o $@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS}
- 	$(STRIP) $@
+-	$(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
++	$(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
  
  $(MACH)/kawari_decode2$(EXEEXT) : tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ)
--	$(CXX) -o $@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
-+	$(CXX) -o $@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS}
- 	$(STRIP) $@
+-	$(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
++	$(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
  
- .SUFFIXES : .cpp .h
+ $(MACH)/libjvm.dll.a : win32jvm.def
+ 	dlltool --def win32jvm.def -l $@ --dllname jvm.dll -k -C -a
diff --git a/games/pykawari/files/patch-build_src_libkawari_wordcollection.h b/games/pykawari/files/patch-build_src_libkawari_wordcollection.h
deleted file mode 100644
index 01e6bbdabb8b..000000000000
--- a/games/pykawari/files/patch-build_src_libkawari_wordcollection.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- build/src/libkawari/wordcollection.h.orig	Fri Jan 31 03:31:14 2003
-+++ build/src/libkawari/wordcollection.h	Wed Jun  1 00:39:13 2005
-@@ -95,14 +95,14 @@
- 	// Delete NULL
- 	virtual bool Delete(unsigned int id){
- 		if(TWordCollection<T*,Compare>::Delete(id)){
--			WordList[id-1]=NULL;
-+			TWordCollection<T*,Compare>::WordList[id-1]=NULL;
- 			return true;
- 		}else{
- 			return false;
- 		}
- 	}
- 	virtual ~TWordPointerCollection (){
--		for (typename std::vector<T*>::iterator it=WordList.begin(); it < WordList.end(); it++){
-+		for (typename std::vector<T*>::iterator it=TWordCollection<T*,Compare>::WordList.begin(); it < TWordCollection<T*,Compare>::WordList.end(); it++){
- 			if((*it))
- 				delete (*it);
- 		}
diff --git a/games/pykawari/files/patch-build_src_misc_mmap.h b/games/pykawari/files/patch-build_src_misc_mmap.h
deleted file mode 100644
index a2f27d784c34..000000000000
--- a/games/pykawari/files/patch-build_src_misc_mmap.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/src/misc/mmap.h.orig	Thu Jan 30 04:19:12 2003
-+++ build/src/misc/mmap.h	Wed Jun  1 00:35:09 2005
-@@ -27,7 +27,7 @@
- 		// 2001/12/16 suikyo@yk.rim.or.jp : imortal entry bug
- //		if(it==end()) it=insert(pair<KeyType,DataType>(key,DataType()));
- //		if(it==upper_bound(key)) it=insert(pair<const KeyType,DataType>(key,DataType()));
--		if(it==upper_bound(key)) it=insert(TMMap::value_type(key,DataType()));
-+		if(it==upper_bound(key)) it=insert(typename TMMap::value_type(key,DataType()));
- 		return((*it).second);
- 	}
- /*
-@@ -42,7 +42,7 @@
- 	void Add(const KeyType& key,const DataType& data)
- 	{
- //		insert(pair<const KeyType,DataType>(key,data));
--		insert(TMMap::value_type(key,data));
-+		insert(typename TMMap::value_type(key,data));
- 	}
- 
- };