Index: head/games/pykawari/Makefile =================================================================== --- head/games/pykawari/Makefile (revision 365540) +++ head/games/pykawari/Makefile (revision 365541) @@ -1,48 +1,46 @@ # Created by: UMENO Takashi # $FreeBSD$ PORTNAME= pykawari PORTVERSION= 8.2.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/kawari/kawari/${PORTVERSION} DISTNAME= kawari-${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org COMMENT= Real kawari8 module for ninix-aya +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/license.txt + RUN_DEPENDS= ninix:${PORTSDIR}/games/ninix-aya -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= # empty +BUILD_WRKSRC= ${WRKSRC}/build/src -PLIST_SUB= LOCALBASE=${LOCALBASE} +USES= gmake python zip +MAKEFILE= gcc.mak +MAKE_ARGS= CXX="${CXX}" CFLAGS="${CXXFLAGS}" \ + PYTHONBASE="${PYTHONBASE}" PYTHON_VERSION="${PYTHON_VERSION}" -USES= gmake zip -USE_PYTHON= yes +CFLAGS+= -I. -DNDEBUG -I${PYTHON_INCLUDEDIR} -fPIC -WRKSRC= ${WRKDIR}/kawari-${PORTVERSION:S/.//g} -CFLAGS+= ${PTHREAD_CFLAGS} -fPIC +DATADIR= ${PREFIX}/share/kawari -NO_STAGE= yes -.include - -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CFLAGS+= -fPIC -.endif - post-patch: @${REINPLACE_CMD} -e 's|shell python|shell ${PYTHON_CMD}|' \ - ${WRKSRC}/build/src/gcc.mak + ${BUILD_WRKSRC}/gcc.mak -do-build: - (cd ${WRKSRC}/build/src; CFLAGS="${CFLAGS}" ${MAKE_CMD} -f gcc.mak PYTHONBASE=${PYTHONBASE} PYTHON_VERSION=${PYTHON_VERSION} PTHREAD_LIBS=${PTHREAD_LIBS} CXX=${CXX}) - do-install: - ${MKDIR} ${PREFIX}/share/kawari - (cd ${WRKSRC}; ${TAR} -cf - document license.txt readme.1st build/BUILD.TXT) | ${TAR} -xvpf - -C ${PREFIX}/share/kawari - ${LN} -f ${WRKSRC}/build/mach/freebsd/libshiori.so ${WRKSRC}/build/mach/freebsd/_kawari8.so - ${MKDIR} ${PREFIX}/libexec/ninix - ${INSTALL_PROGRAM} ${WRKSRC}/build/mach/freebsd/_kawari8.so ${PREFIX}/libexec/ninix + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ninix \ + ${STAGEDIR}${DATADIR}/build + (cd ${WRKSRC}/build/mach/freebsd && ${INSTALL_LIB} libshiori.so \ + ${STAGEDIR}${PREFIX}/libexec/ninix/_kawari8.so) + (cd ${WRKSRC} && ${COPYTREE_SHARE} document \ + ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} license.txt readme.1st \ + ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC}/build && ${INSTALL_DATA} BUILD.TXT \ + ${STAGEDIR}${DATADIR}/build) -.include +.include Index: head/games/pykawari/files/patch-build__src__libkawari__kawari_dict.cpp =================================================================== --- head/games/pykawari/files/patch-build__src__libkawari__kawari_dict.cpp (nonexistent) +++ head/games/pykawari/files/patch-build__src__libkawari__kawari_dict.cpp (revision 365541) @@ -0,0 +1,10 @@ +--- build/src/libkawari/kawari_dict.cpp.orig ++++ build/src/libkawari/kawari_dict.cpp +@@ -32,6 +32,7 @@ + using namespace kawari_log; + //--------------------------------------------------------------------------- + #include ++#include + using namespace std; + //--------------------------------------------------------------------------- + // 範囲外のインデックス Property changes on: head/games/pykawari/files/patch-build__src__libkawari__kawari_dict.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/pykawari/files/patch-build__src__libkawari__kawari_ns.cpp =================================================================== --- head/games/pykawari/files/patch-build__src__libkawari__kawari_ns.cpp (nonexistent) +++ head/games/pykawari/files/patch-build__src__libkawari__kawari_ns.cpp (revision 365541) @@ -0,0 +1,10 @@ +--- build/src/libkawari/kawari_ns.cpp.orig ++++ build/src/libkawari/kawari_ns.cpp +@@ -18,6 +18,7 @@ + #include "misc/misc.h" + using namespace kawari_log; + //--------------------------------------------------------------------------- ++#include + using namespace std; + //--------------------------------------------------------------------------- + // 範囲外のインデックス Property changes on: head/games/pykawari/files/patch-build__src__libkawari__kawari_ns.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/pykawari/files/patch-build__src__misc__mmap.h =================================================================== --- head/games/pykawari/files/patch-build__src__misc__mmap.h (revision 365540) +++ head/games/pykawari/files/patch-build__src__misc__mmap.h (revision 365541) @@ -1,16 +1,25 @@ --- ./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::iterator it; - typename std::multimap::iterator it=lower_bound(key); + typename std::multimap::iterator it=std::multimap::lower_bound(key); // 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(typename TMMap::value_type(key,DataType())); -+ if(it==std::multimap::upper_bound(key)) it=insert(typename TMMap::value_type(key,DataType())); ++ if(it==std::multimap::upper_bound(key)) it=this->insert(typename TMMap::value_type(key,DataType())); return((*it).second); } /* +@@ -43,7 +43,7 @@ + void Add(const KeyType& key,const DataType& data) + { + // insert(pair(key,data)); +- insert(typename TMMap::value_type(key,data)); ++ this->insert(typename TMMap::value_type(key,data)); + } + + }; Index: head/games/pykawari/files/patch-build__src__shiori__kawari_shiori.cpp =================================================================== --- head/games/pykawari/files/patch-build__src__shiori__kawari_shiori.cpp (nonexistent) +++ head/games/pykawari/files/patch-build__src__shiori__kawari_shiori.cpp (revision 365541) @@ -0,0 +1,10 @@ +--- build/src/shiori/kawari_shiori.cpp.orig ++++ build/src/shiori/kawari_shiori.cpp +@@ -75,6 +75,7 @@ + #include + #include + #include ++#include + using namespace std; + //--------------------------------------------------------------------------- + #include "shiori/kawari_shiori.h" Property changes on: head/games/pykawari/files/patch-build__src__shiori__kawari_shiori.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/pykawari/files/patch-build__src__shiori__shiori.cpp =================================================================== --- head/games/pykawari/files/patch-build__src__shiori__shiori.cpp (nonexistent) +++ head/games/pykawari/files/patch-build__src__shiori__shiori.cpp (revision 365541) @@ -0,0 +1,10 @@ +--- build/src/shiori/shiori.cpp.orig ++++ build/src/shiori/shiori.cpp +@@ -24,6 +24,7 @@ + #include "include/shiori.h" + //--------------------------------------------------------------------------- + #include ++#include + using namespace std; + //--------------------------------------------------------------------------- + namespace { Property changes on: head/games/pykawari/files/patch-build__src__shiori__shiori.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/pykawari/files/patch-build_src_gcc.mak =================================================================== --- head/games/pykawari/files/patch-build_src_gcc.mak (revision 365540) +++ head/games/pykawari/files/patch-build_src_gcc.mak (revision 365541) @@ -1,88 +1,88 @@ --- 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 @@ #========================================================================== ## 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 -UPX = upx + ## if you want to use STLport, set STLport=yes # STLport = yes @@ -24,17 +24,17 @@ 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 = -O1 -I. -DNDEBUG -Wall -fomit-frame-pointer -LDFLAGS = -s +CFLAGS += -Os -I. -DNDEBUG -Wall -fomit-frame-pointer -+LDFLAGS += -s ++# 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]") 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) upx +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 ++ $(CXX) -o$@ $(LDFLAGS) $(KOSUIOBJ) $(COREOBJ) $(LIBS) -pthread -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 ++ $(CXX) -o$@ tool/kawari_encode$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) -pthread -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} -lutil ++ $(CXX) -o$@ tool/kawari_encode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) -pthread -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} -lutil ++ $(CXX) -o$@ tool/kawari_decode2$(OBJEXT) $(CRYPTOBJ) $(LDFLAGS) -pthread -lutil $(MACH)/libjvm.dll.a : win32jvm.def dlltool --def win32jvm.def -l $@ --dllname jvm.dll -k -C -a Index: head/games/pykawari/pkg-plist =================================================================== --- head/games/pykawari/pkg-plist (revision 365540) +++ head/games/pykawari/pkg-plist (revision 365541) @@ -1,46 +1,46 @@ libexec/ninix/_kawari8.so -share/kawari/document/banners/kawalinks.png -share/kawari/document/banners/kawari.png -share/kawari/document/banners/kawaribts.png -share/kawari/document/banners/kawariplus.png -share/kawari/document/banners/kawarisf.png -share/kawari/document/banners/kawari_bbs.png -share/kawari/document/banners/kawari_logo.png -share/kawari/document/banners/kpcg_banner.png -share/kawari/document/banners/fake-kawaribts.png -share/kawari/document/banners/fake-kawalinks.png -share/kawari/document/images/logo.png -share/kawari/document/images/logo2.png -share/kawari/document/images/ver_731.png -share/kawari/document/images/ver_790.png -share/kawari/document/images/ver_800.png -share/kawari/document/images/ver_810.png -share/kawari/document/images/ver_820.png -share/kawari/document/index.html -share/kawari/document/kawari.css -share/kawari/document/kis_reference.html -share/kawari/document/kiu_specbnf.txt -share/kawari/document/kosui.html -share/kawari/document/license.html -share/kawari/document/programming.html -share/kawari/document/programming_1.html -share/kawari/document/programming_2.html -share/kawari/document/programming_3.html -share/kawari/document/programming_4.html -share/kawari/document/programming_5.html -share/kawari/document/start.html -share/kawari/document/story.html -share/kawari/document/tips.html -share/kawari/document/users.html -share/kawari/document/convert.html -share/kawari/document/errormes.html -share/kawari/document/source.html -share/kawari/document/changelog.txt -share/kawari/license.txt -share/kawari/readme.1st -share/kawari/build/BUILD.TXT -@dirrm share/kawari/document/banners -@dirrm share/kawari/document/images -@dirrm share/kawari/document -@dirrm share/kawari/build -@dirrm share/kawari +%%DATADIR%%/build/BUILD.TXT +%%DATADIR%%/document/banners/kawalinks.png +%%DATADIR%%/document/banners/kawari.png +%%DATADIR%%/document/banners/kawaribts.png +%%DATADIR%%/document/banners/kawariplus.png +%%DATADIR%%/document/banners/kawarisf.png +%%DATADIR%%/document/banners/kawari_bbs.png +%%DATADIR%%/document/banners/kawari_logo.png +%%DATADIR%%/document/banners/kpcg_banner.png +%%DATADIR%%/document/banners/fake-kawaribts.png +%%DATADIR%%/document/banners/fake-kawalinks.png +%%DATADIR%%/document/images/logo.png +%%DATADIR%%/document/images/logo2.png +%%DATADIR%%/document/images/ver_731.png +%%DATADIR%%/document/images/ver_790.png +%%DATADIR%%/document/images/ver_800.png +%%DATADIR%%/document/images/ver_810.png +%%DATADIR%%/document/images/ver_820.png +%%DATADIR%%/document/index.html +%%DATADIR%%/document/kawari.css +%%DATADIR%%/document/kis_reference.html +%%DATADIR%%/document/kiu_specbnf.txt +%%DATADIR%%/document/kosui.html +%%DATADIR%%/document/license.html +%%DATADIR%%/document/programming.html +%%DATADIR%%/document/programming_1.html +%%DATADIR%%/document/programming_2.html +%%DATADIR%%/document/programming_3.html +%%DATADIR%%/document/programming_4.html +%%DATADIR%%/document/programming_5.html +%%DATADIR%%/document/start.html +%%DATADIR%%/document/story.html +%%DATADIR%%/document/tips.html +%%DATADIR%%/document/users.html +%%DATADIR%%/document/convert.html +%%DATADIR%%/document/errormes.html +%%DATADIR%%/document/source.html +%%DATADIR%%/document/changelog.txt +%%DATADIR%%/license.txt +%%DATADIR%%/readme.1st +@dirrm %%DATADIR%%/document/images +@dirrm %%DATADIR%%/document/banners +@dirrm %%DATADIR%%/document +@dirrm %%DATADIR%%/build +@dirrm %%DATADIR%%