ports/81733: Maintainer Update: games/pykawari is now available to compile by gcc-3.4.2

[UMENO Takashi]

>Number:         81733
>Category:       ports
>Synopsis:       Maintainer Update: games/pykawari is now available to compile by gcc-3.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 31 17:00:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     UMENO Takashi
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
individual
>Environment:
System: FreeBSD belldandy.unnumbered.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun May 22 18:37:26 JST 2005 root at belldandy.unnumbered.net:/usr/src/sys/i386/compile/MISUZU1 i386


	
>Description:
Maintainer Update: games/pykawari is now available to compile by gcc-3.4.2.
And now games/ninix-aya on FreeBSD-5-stable can use games/pykawari without core dump.

>How-To-Repeat:
N/A
>Fix:

add files:
files/patch-build::src::libkawari::wordcollection.h
files/patch-build::src::misc::mmap.h

diff -urN pykawari.orig/Makefile pykawari/Makefile
--- pykawari.orig/Makefile	Sun May 22 06:30:57 2005
+++ pykawari/Makefile	Wed Jun  1 01:11:58 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	pykawari
 PORTVERSION=	8.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kawari
@@ -38,10 +38,6 @@
 CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
 
 .include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-USE_GCC=	3.3
-.endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fPIC
diff -urN pykawari.orig/files/patch-build::src::libkawari::wordcollection.h pykawari/files/patch-build::src::libkawari::wordcollection.h
--- pykawari.orig/files/patch-build::src::libkawari::wordcollection.h	Thu Jan  1 09:00:00 1970
+++ pykawari/files/patch-build::src::libkawari::wordcollection.h	Wed Jun  1 00:40:51 2005
@@ -0,0 +1,19 @@
+--- 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 -urN pykawari.orig/files/patch-build::src::misc::mmap.h pykawari/files/patch-build::src::misc::mmap.h
--- pykawari.orig/files/patch-build::src::misc::mmap.h	Thu Jan  1 09:00:00 1970
+++ pykawari/files/patch-build::src::misc::mmap.h	Wed Jun  1 00:36:45 2005
@@ -0,0 +1,20 @@
+--- 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 at 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));
+ 	}
+ 
+ };




>Release-Note:
>Audit-Trail:
>Unformatted: