From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 10 07:10:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9668816A41F for ; Wed, 10 Aug 2005 07:10:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6487543D5A for ; Wed, 10 Aug 2005 07:10:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7A7AGBH074187 for ; Wed, 10 Aug 2005 07:10:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7A7AG1o074183; Wed, 10 Aug 2005 07:10:16 GMT (envelope-from gnats) Resent-Date: Wed, 10 Aug 2005 07:10:16 GMT Resent-Message-Id: <200508100710.j7A7AG1o074183@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, UMENO Takashi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D6BC16A41F for ; Wed, 10 Aug 2005 07:00:45 +0000 (GMT) (envelope-from umeno@belldandy.unnumbered.net) Received: from belldandy.unnumbered.net (gateway.unnumbered.net [61.197.240.129]) by mx1.FreeBSD.org (Postfix) with ESMTP id E44B843D45 for ; Wed, 10 Aug 2005 07:00:42 +0000 (GMT) (envelope-from umeno@belldandy.unnumbered.net) Received: from belldandy.unnumbered.net (localhost [127.0.0.1]) by belldandy.unnumbered.net (8.13.3/8.13.3) with ESMTP id j7A70exE021490 for ; Wed, 10 Aug 2005 16:00:40 +0900 (JST) (envelope-from umeno@belldandy.unnumbered.net) Received: (from umeno@localhost) by belldandy.unnumbered.net (8.13.3/8.13.3/Submit) id j7A70eM3021489; Wed, 10 Aug 2005 16:00:40 +0900 (JST) (envelope-from umeno) Message-Id: <200508100700.j7A70eM3021489@belldandy.unnumbered.net> Date: Wed, 10 Aug 2005 16:00:40 +0900 (JST) From: UMENO Takashi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/84735: Maintainer Update: games/pykawari to 8.2.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: UMENO Takashi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 07:10:17 -0000 >Number: 84735 >Category: ports >Synopsis: Maintainer Update: games/pykawari to 8.2.3 >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: Wed Aug 10 07:10:15 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 Jul 17 18:08:29 JST 2005 root@belldandy.unnumbered.net:/usr/obj/usr/src/sys/MISUZU1 i386 >Description: Maintainer Update: games/pykawari to 8.2.3 Original kawari-823.zip is now able to combile by gcc-3.4.x, so, remove some patch to compile by gcc-3.4.x. Remove files: files/patch-build_src_libkawari_wordcollection.h files/patch-build_src_misc_mmap.h >How-To-Repeat: N/A >Fix: This patch includes some Japanese EUC characters, please be careful to patch. diff -urN pykawari.orig/Makefile pykawari/Makefile --- pykawari.orig/Makefile Wed Jun 1 07:37:02 2005 +++ pykawari/Makefile Mon Jul 4 11:07:58 2005 @@ -6,17 +6,13 @@ # PORTNAME= pykawari -PORTVERSION= 8.2.2 -PORTREVISION= 3 +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 diff -urN pykawari.orig/distinfo pykawari/distinfo --- pykawari.orig/distinfo Wed Oct 13 19:09:23 2004 +++ pykawari/distinfo Wed Aug 10 15:46:00 2005 @@ -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 -urN pykawari.orig/files/patch-build_src_gcc.mak pykawari/files/patch-build_src_gcc.mak --- pykawari.orig/files/patch-build_src_gcc.mak Wed Jun 1 05:07:45 2005 +++ pykawari/files/patch-build_src_gcc.mak Wed Aug 10 15:34:50 2005 @@ -1,67 +1,82 @@ ---- 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 Wed Jun 22 05:28:54 2005 ++++ build/src/gcc.mak Wed Aug 10 15:33:29 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 - - # (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' + ## if you have 'upx' and want to use it + # UPX = 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 -+PYTHON_LIBS = -L${PYTHONBASE}/lib/${PYTHON_VERSION}/config -l${PYTHON_VERSION} - - #========================================================================== - # 以下、基本的に書き換え不要 -@@ -146,19 +147,19 @@ - $(CXX) -o $@ -bundle $(SHIOOBJ) $(LIBOBJ) $(LDFLAGS) - - $(MACH)/kosui$(EXEEXT) : $(KOSUIOBJ) $(LIBOBJ) -- $(CXX) -o $@ $(KOSUIOBJ) $(LIBOBJ) $(LDFLAGS) -+ $(CXX) -o $@ $(KOSUIOBJ) $(LIBOBJ) $(LDFLAGS) ${PTHREAD_LIBS} -lutil - $(STRIP) $@ + ## 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} - $(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 -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 Wed Jun 1 05:07:45 2005 +++ pykawari/files/patch-build_src_libkawari_wordcollection.h Thu Jan 1 09:00:00 1970 @@ -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::Delete(id)){ -- WordList[id-1]=NULL; -+ TWordCollection::WordList[id-1]=NULL; - return true; - }else{ - return false; - } - } - virtual ~TWordPointerCollection (){ -- for (typename std::vector::iterator it=WordList.begin(); it < WordList.end(); it++){ -+ for (typename std::vector::iterator it=TWordCollection::WordList.begin(); it < TWordCollection::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 Wed Jun 1 05:07:45 2005 +++ pykawari/files/patch-build_src_misc_mmap.h Thu Jan 1 09:00:00 1970 @@ -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(key,DataType())); - // if(it==upper_bound(key)) it=insert(pair(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(key,data)); -- insert(TMMap::value_type(key,data)); -+ insert(typename TMMap::value_type(key,data)); - } - - }; >Release-Note: >Audit-Trail: >Unformatted: