Attachment #56131 for bug #84735

View | Details | Raw Unified | Return to bug 84735
Collapse All | Expand All




#

PORTNAME=	pykawari
PORTVERSION=	8.2.3
PORTREVISION=	0
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

Lines 1-6 Link Here

(-)pykawari/distinfo (-6 / +2 lines)
1	MD5 (kawari-822.zip) = 73c8fe087be1b1e6cb2f0013c6bd1a34	1	MD5 (kawari-823.zip) = df4ea5ed2cb68b378a50ba0c10b10ccf
2	SIZE (kawari-822.zip) = 1385455	2	SIZE (kawari-823.zip) = 1241058
3	MD5 (kawari-822.diff.gz) = 2e4b4600fa146440a08ee6bed2301ea6
4	SIZE (kawari-822.diff.gz) = 296
5	MD5 (kawari-822-2.diff.gz) = e54b0467ca20e4be18206b998a7dbb8f
6	SIZE (kawari-822-2.diff.gz) = 659




--- build/src/gcc.mak.orig	Wed Jun 22 05:28:54 2005
+++ build/src/gcc.mak	Wed Aug 10 15:33:29 2005
@@ -8,14 +8,14 @@
 #==========================================================================
 
 ## choose your target: cygwin, mingw, linux, freebsd, darwin
-MACH_TYPE = mingw
+MACH_TYPE = freebsd
 
 ## output name
 SHIORI = shiori
 
 ## if you have 'upx' and want to use it
 # UPX = upx
+# 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
+
 
 ## if you want to use STLport, set STLport=yes
 # STLport = yes
@@ -24,13 +24,13 @@
 SAORI_NATIVE = yes
 
 ## if you want to use Python SAORI, set SAORI_PYTHON=yes
-# SAORI_PYTHON = yes
+SAORI_PYTHON = yes
 
 ## if you want to use Java SAORI, set SAORI_JAVA=yes
 # SAORI_JAVA = yes
 
 ## if you want to make a Python SHIORI, set SHIORI_PYTHON=yes
-# SHIORI_PYTHON = yes
+SHIORI_PYTHON = yes
 
 ## Global options
 CFLAGS  = -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
@@ -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) $(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} -lutil
 	$(STRIP) $@
 
 $(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} -lutil
 	$(STRIP) $@
 
 $(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} -lutil
 	$(STRIP) $@
 
 $(MACH)/libjvm.dll.a : win32jvm.def
 	dlltool --def win32jvm.def -l $@ --dllname jvm.dll -k -C -a




--- 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);
 		}




--- 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));
 	}
 
 };

Return to bug 84735

Lines 6-22 Link Here

(-)pykawari/Makefile (-6 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= pykawari	8	PORTNAME= pykawari
9	PORTVERSION= 8.2.2	9	PORTVERSION= 8.2.3
10	PORTREVISION= 3	10	PORTREVISION= 0
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= kawari	13	MASTER_SITE_SUBDIR= kawari
14	DISTNAME= kawari-${PORTVERSION:S/.//g}	14	DISTNAME= kawari-${PORTVERSION:S/.//g}
15	EXTRACT_SUFX= .zip	15	EXTRACT_SUFX= .zip
16
17	PATCH_SITES= http://ninix-aya.sourceforge.jp/
18	PATCHFILES= kawari-822.diff.gz \
19	kawari-822-2.diff.gz
20		16
21	MAINTAINER= umeno@rr.iij4u.or.jp	17	MAINTAINER= umeno@rr.iij4u.or.jp
22	COMMENT= A real kawari8 module for ninix-aya	18	COMMENT= A real kawari8 module for ninix-aya

Lines 1-67 Link Here

(-)pykawari/files/patch-build_src_gcc.mak (-52 / +67 lines)
1	--- build/src/gcc.mak.orig Sat Aug 28 19:16:34 2004	1	--- build/src/gcc.mak.orig Wed Jun 22 05:28:54 2005
2	+++ build/src/gcc.mak Sat Oct 2 15:26:37 2004	2	+++ build/src/gcc.mak Wed Aug 10 15:33:29 2005
3	@@ -6,21 +6,21 @@	3	@@ -8,14 +8,14 @@
4	# ¥¿¡¼¥²¥Ã¥È¤Ë¤è¤Ã¤Æ½ñ¤´¹¤¨	4	#==========================================================================
5		5
6	## mach type: cygwin, mingw, linux, freebsd, darwin	6	## choose your target: cygwin, mingw, linux, freebsd, darwin
7	-MACH_TYPE = mingw	7	-MACH_TYPE = mingw
8	+MACH_TYPE = freebsd	8	+MACH_TYPE = freebsd
9		9
10	## target name	10	## output name
11	SHIORI = shiori	11	SHIORI = shiori
12		12
13	## if use STLport, set STLport=yes	13	## if you have 'upx' and want to use it
14	-STLport = yes	14	# UPX = upx
15	+# STLport = yes
16
17	# (STLport) specify library include directory.
18	-STLP_CFLAGS = -I/MinGW/include/stlport
19	-STLP_LIBS = -lstlport_mingw32_static
20	+# STLP_CFLAGS = -I/MinGW/include/stlport
21	+# STLP_LIBS = -lstlport_mingw32_static
22	## fi
23
24	## if you have 'upx'
25	-UPX = upx	15	-UPX = upx
26	+# UPX = upx	16	+
27		17
28	#==========================================================================	18	## if you want to use STLport, set STLport=yes
29	# EXPERIMENTAL FEATURES	19	# STLport = yes
30	@@ -37,11 +37,12 @@	20	@@ -24,13 +24,13 @@
31	## fi	21	SAORI_NATIVE = yes
32		22
33	## if use Python SAORI(and Python I/F), set PYTHON=yes	23	## if you want to use Python SAORI, set SAORI_PYTHON=yes
34	-#PYTHON = yes	24	-# SAORI_PYTHON = yes
35	+PYTHON = yes	25	+SAORI_PYTHON = yes
36		26
37	## (Python) and if win32	27	## if you want to use Java SAORI, set SAORI_JAVA=yes
38	# PYTHON_CFLAGS = -I/python22jp/include	28	# SAORI_JAVA = yes
39	# PYTHON_LIBS = -L/python22jp/libs	29
40	+PYTHON_LIBS = -L${PYTHONBASE}/lib/${PYTHON_VERSION}/config -l${PYTHON_VERSION}	30	## if you want to make a Python SHIORI, set SHIORI_PYTHON=yes
41		31	-# SHIORI_PYTHON = yes
42	#==========================================================================	32	+SHIORI_PYTHON = yes
43	# °Ê²¼¡¢´ðËÜÅª¤Ë½ñ¤´¹¤¨ÉÔÍ×	33
44	@@ -146,19 +147,19 @@	34	## Global options
45	$(CXX) -o $@ -bundle $(SHIOOBJ) $(LIBOBJ) $(LDFLAGS)	35	CFLAGS = -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
46		36	@@ -96,7 +96,7 @@
47	$(MACH)/kosui$(EXEEXT) : $(KOSUIOBJ) $(LIBOBJ)	37
48	- $(CXX) -o $@ $(KOSUIOBJ) $(LIBOBJ) $(LDFLAGS)	38	ifeq ($(SHIORI_PYTHON),yes)
49	+ $(CXX) -o $@ $(KOSUIOBJ) $(LIBOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil	39	_LINK_PYTHON = 1
50	$(STRIP) $@	40	- SHIOSRC := $(SHIOSRC) $(SHIOSRC_python)
		41	+ SHIOSRC := $(SHIOSRC) $(SHIOSRC_PYTHON)
		42	endif
		43
		44	ifdef _LINK_PYTHON_
		45	@@ -104,7 +104,7 @@
		46	ifndef CFLAGS_PYTHON
		47	CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
		48	CFLAGS := $(CFLAGS_PYTHON) $(CFLAGS)
		49	- LIBS := $(LIBS) -lpython$(PYTHON_VER)
		50	+ LIBS := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}
		51	endif
		52	endif
		53
		54	@@ -145,22 +145,23 @@
		55	## TARGETS ##
		56	.PHONY: clean cleanall depend upx
		57
		58	-all : $(ALLTARGET) upx
		59	+#all : $(ALLTARGET)
		60	+all : $(ALLTARGET) $(UPX)
		61
		62	$(MACH)/$(DYNLIBPREFIX)$(SHIORI)$(DYNLIBEXT) : $(SHIOOBJ) $(COREOBJ) $(DEPLIB)
		63	$(CXX) -o$@ $(SHARED_$(MACH_TYPE)) $(LDFLAGS) $(SHIOOBJ) $(COREOBJ) $(LIBS)
		64
		65	$(MACH)/kosui$(EXEEXT) : $(KOSUIOBJ) $(COREOBJ) $(DEPLIB)
		66	- $(CXX) -o$@ $(LDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS)
		67	+ $(CXX) -o$@ $(LDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS) ${PTHREAD_LIBS} -lutil
51		68
52	$(MACH)/kawari_encode$(EXEEXT) : tool/kawari_encode$(OBJEXT) $(CRYPTOBJ)	69	$(MACH)/kawari_encode$(EXEEXT) : tool/kawari_encode$(OBJEXT) $(CRYPTOBJ)
53	- $(CXX) -o $@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)	70	- $(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
54	+ $(CXX) -o $@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS}	71	+ $(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
55	$(STRIP) $@
56		72
57	$(MACH)/kawari_encode2$(EXEEXT) : tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ)	73	$(MACH)/kawari_encode2$(EXEEXT) : tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ)
58	- $(CXX) -o $@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)	74	- $(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
59	+ $(CXX) -o $@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS}	75	+ $(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
60	$(STRIP) $@
61		76
62	$(MACH)/kawari_decode2$(EXEEXT) : tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ)	77	$(MACH)/kawari_decode2$(EXEEXT) : tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ)
63	- $(CXX) -o $@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)	78	- $(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS)
64	+ $(CXX) -o $@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS}	79	+ $(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil
65	$(STRIP) $@
66		80
67	.SUFFIXES : .cpp .h	81	$(MACH)/libjvm.dll.a : win32jvm.def
		82	dlltool --def win32jvm.def -l $@ --dllname jvm.dll -k -C -a

Lines 1-19 Link Here

(-)pykawari/files/patch-build_src_libkawari_wordcollection.h (-19 lines)
1	--- build/src/libkawari/wordcollection.h.orig Fri Jan 31 03:31:14 2003
2	+++ build/src/libkawari/wordcollection.h Wed Jun 1 00:39:13 2005
3	@@ -95,14 +95,14 @@
4	// Delete NULL
5	virtual bool Delete(unsigned int id){
6	if(TWordCollection<T*,Compare>::Delete(id)){
7	- WordList[id-1]=NULL;
8	+ TWordCollection<T*,Compare>::WordList[id-1]=NULL;
9	return true;
10	}else{
11	return false;
12	}
13	}
14	virtual ~TWordPointerCollection (){
15	- for (typename std::vector<T*>::iterator it=WordList.begin(); it < WordList.end(); it++){
16	+ for (typename std::vector<T>::iterator it=TWordCollection<T,Compare>::WordList.begin(); it < TWordCollection<T*,Compare>::WordList.end(); it++){
17	if((*it))
18	delete (*it);
19	}

Lines 1-20 Link Here

(-)pykawari/files/patch-build_src_misc_mmap.h (-20 lines)
1	--- build/src/misc/mmap.h.orig Thu Jan 30 04:19:12 2003
2	+++ build/src/misc/mmap.h Wed Jun 1 00:35:09 2005
3	@@ -27,7 +27,7 @@
4	// 2001/12/16 suikyo@yk.rim.or.jp : imortal entry bug
5	// if(it==end()) it=insert(pair<KeyType,DataType>(key,DataType()));
6	// if(it==upper_bound(key)) it=insert(pair<const KeyType,DataType>(key,DataType()));
7	- if(it==upper_bound(key)) it=insert(TMMap::value_type(key,DataType()));
8	+ if(it==upper_bound(key)) it=insert(typename TMMap::value_type(key,DataType()));
9	return((*it).second);
10	}
11	/*
12	@@ -42,7 +42,7 @@
13	void Add(const KeyType& key,const DataType& data)
14	{
15	// insert(pair<const KeyType,DataType>(key,data));
16	- insert(TMMap::value_type(key,data));
17	+ insert(typename TMMap::value_type(key,data));
18	}
19
20	};