- Update to 8.2.8

- Unbreak on GCC 4.X

PR:		ports/131085
Submitted by:	UMENO Takashi <umeno@rr.iij4u.or.jp> (maintainer)

4 files changed, 34 insertions, 14 deletions

diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index 72463a7683ab..f9ab574dc200 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	pykawari
-PORTVERSION=	8.2.4
-PORTREVISION=	2
+PORTVERSION=	8.2.8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kawari
 DISTNAME=	kawari-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	A real kawari8 module for ninix-aya
@@ -28,16 +26,13 @@ PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/kawari-${PORTVERSION:S/.//g}
 CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC
 .endif
diff --git a/games/pykawari/distinfo b/games/pykawari/distinfo
index 9ac8f9a68ae4..ffad54aa97ec 100644
--- a/games/pykawari/distinfo
+++ b/games/pykawari/distinfo
@@ -1,3 +1,3 @@
-MD5 (kawari-824.zip) = 28bf746386e15e343f8445b83f53edb3
-SHA256 (kawari-824.zip) = ef4904650bcc502d916d18dd342373001e9524e18d4c00262469f0c41d424a52
-SIZE (kawari-824.zip) = 1251826
+MD5 (kawari-828.zip) = 2bee28909bdeaa8989662ba997c30c7a
+SHA256 (kawari-828.zip) = 32416386aca63b94842120808d501838f812efdf6ea5f9dd1659c1bff848ab02
+SIZE (kawari-828.zip) = 1279146
diff --git a/games/pykawari/files/patch-build__src__misc__mmap.h b/games/pykawari/files/patch-build__src__misc__mmap.h
new file mode 100644
index 000000000000..079d4ed9d403
--- /dev/null
+++ b/games/pykawari/files/patch-build__src__misc__mmap.h
@@ -0,0 +1,16 @@
+--- ./build/src/misc/mmap.h.orig	2009-03-02 17:17:28.000000000 +0100
++++ ./build/src/misc/mmap.h	2009-03-02 17:17:37.000000000 +0100
+@@ -24,11 +24,11 @@
+ 	{
+ //		iterator it=lower_bound(key);
+ //		std::multimap<KeyType,DataType>::iterator it;
+-		typename std::multimap<KeyType, DataType>::iterator it=lower_bound(key);
++		typename std::multimap<KeyType, DataType>::iterator it=std::multimap<KeyType, DataType>::lower_bound(key);
+ 		// 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(typename TMMap<KeyType,DataType>::value_type(key,DataType()));
++		if(it==std::multimap<KeyType, DataType>::upper_bound(key)) it=insert(typename TMMap<KeyType,DataType>::value_type(key,DataType()));
+ 		return((*it).second);
+ 	}
+ /*
diff --git a/games/pykawari/files/patch-build_src_gcc.mak b/games/pykawari/files/patch-build_src_gcc.mak
index 7bcf2f6ce81e..c618ee0451c3 100644
--- a/games/pykawari/files/patch-build_src_gcc.mak
+++ b/games/pykawari/files/patch-build_src_gcc.mak
@@ -1,5 +1,5 @@
---- build/src/gcc.mak.orig	Tue Jun 21 22:28:54 2005
-+++ build/src/gcc.mak	Wed Sep 14 10:00:26 2005
+--- build/src/gcc.mak.orig	2008-01-20 17:13:34.000000000 +0900
++++ build/src/gcc.mak	2009-01-29 01:34:48.000000000 +0900
 @@ -8,14 +8,14 @@
  #==========================================================================
  
@@ -32,13 +32,22 @@
 +SHIORI_PYTHON = yes
  
  ## Global options
--CFLAGS  = -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
+-CFLAGS  = -O1 -I. -DNDEBUG -Wall -fomit-frame-pointer
 -LDFLAGS = -s
 +CFLAGS  += -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
 +LDFLAGS += -s
  
  #==========================================================================
  # Directories
+@@ -70,7 +70,7 @@
+ ifeq ($(STLport),yes)
+ 	CFLAGS  := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS)
+ 	LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP)
+-	LIBS    := $(LIBS) $(LIBS_STLP)
++	LIBS    := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}
+ endif
+ 
+ ifeq ($(SAORI_NATIVE),yes)
 @@ -104,7 +104,7 @@
  	ifndef CFLAGS_PYTHON
  		CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
@@ -53,7 +62,7 @@
  .PHONY: clean cleanall depend upx
  
 -all : $(ALLTARGET) upx
-+#all : $(ALLTARGET) 
++#all : $(ALLTARGET) upx
 +all : $(ALLTARGET) $(UPX)
  
  $(MACH)/$(DYNLIBPREFIX)$(SHIORI)$(DYNLIBEXT) : $(SHIOOBJ) $(COREOBJ) $(DEPLIB)