Index: head/games/valyriatear/Makefile =================================================================== --- head/games/valyriatear/Makefile (revision 517711) +++ head/games/valyriatear/Makefile (revision 517712) @@ -1,53 +1,52 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= valyriatear -PORTVERSION= 1.0.0 -PORTREVISION= 11 +PORTVERSION= 1.1.0 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open Source J-RPG based on the Hero of Allacrost engine # Valyria Tear underwent a licensing audit. # The main game is GPLv2 but artwork/music/fonts are a variety of licenses: # GPLv2, GPLv3 (with font exception), OFL-1.1, CC0, CC-BY-3, and CC-BY-SA-3. LICENSE= GPLv2 LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libvorbis.so:audio/libvorbis \ libpng.so:graphics/png USE_GITHUB= yes GH_ACCOUNT= Bertram25 GH_PROJECT= ValyriaTear -GH_TAGNAME= ${PORTVERSION}-gcc5 # contains relevant tolua++ fixes +GH_TUPLE= ValyriaTear:luabind:76d4061:luabind/src/luabind \ + ValyriaTear:vt-utils:299411e:utils/src/utils USES= alias cmake compiler:c++11-lang gettext-tools gl gnome iconv \ lua:51 openal sdl xorg CMAKE_ARGS= -DUSE_PCH_COMPILATION=OFF -USE_SDL= sdl image ttf -USE_GL= gl glu +USE_SDL= sdl2 image2 ttf2 +USE_GL= gl glu glew USE_XORG= x11 xext sm ice -USE_CXXSTD= c++03 INSTALLS_ICONS= yes LLD_UNSAFE= yes PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_CMAKE_OFF= -DDISABLE_TRANSLATIONS:BOOL=OFF +#NLS_CMAKE_OFF= -DDISABLE_TRANSLATIONS:BOOL=ON # broken, so be happy with just not installing translation files NLS_USES= gettext post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/CMake/Modules/*.cmake post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/MANUAL ${STAGEDIR}${DOCSDIR}/ .include Index: head/games/valyriatear/distinfo =================================================================== --- head/games/valyriatear/distinfo (revision 517711) +++ head/games/valyriatear/distinfo (revision 517712) @@ -1,3 +1,7 @@ -TIMESTAMP = 1491391131 -SHA256 (Bertram25-ValyriaTear-1.0.0-1.0.0-gcc5_GH0.tar.gz) = c15beceb0bbb2315604a52ae050d02e08fe414da87de4d5e035faa10a8d97e9e -SIZE (Bertram25-ValyriaTear-1.0.0-1.0.0-gcc5_GH0.tar.gz) = 100883404 +TIMESTAMP = 1573667905 +SHA256 (Bertram25-ValyriaTear-1.1.0_GH0.tar.gz) = b284ea240eff83e83f1c55c1504a6629a5a20eb8c10b854f36423093c31d80fe +SIZE (Bertram25-ValyriaTear-1.1.0_GH0.tar.gz) = 116812274 +SHA256 (ValyriaTear-luabind-76d4061_GH0.tar.gz) = 1730a0ae592d4a21fc345708cd9eb187879e8b1e3d959e6956b926fed677963b +SIZE (ValyriaTear-luabind-76d4061_GH0.tar.gz) = 189716 +SHA256 (ValyriaTear-vt-utils-299411e_GH0.tar.gz) = 4b87f6f209da06ccd3f5c228fcf9cd6235f7963267f0c4f2217ffe8450f11a9a +SIZE (ValyriaTear-vt-utils-299411e_GH0.tar.gz) = 41918 Index: head/games/valyriatear/files/patch-src_main.cpp =================================================================== --- head/games/valyriatear/files/patch-src_main.cpp (revision 517711) +++ head/games/valyriatear/files/patch-src_main.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/main.cpp.orig 2016-04-25 20:52:18 UTC -+++ src/main.cpp -@@ -459,7 +459,7 @@ int main(int argc, char *argv[]) - chdir(path.c_str()); - #elif (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SOLARIS)) && !defined(RELEASE_BUILD) - // Look for data files in DATADIR only if they are not available in the current directory. -- if(std::ifstream("dat/config/settings.lua") == NULL) { -+ if(!std::ifstream("dat/config/settings.lua").good()) { - if(chdir(PKG_DATADIR) != 0) { - throw Exception("ERROR: failed to change directory to data location", __FILE__, __LINE__, __FUNCTION__); - } Property changes on: head/games/valyriatear/files/patch-src_main.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/valyriatear/files/patch-src_engine_video_video.cpp =================================================================== --- head/games/valyriatear/files/patch-src_engine_video_video.cpp (revision 517711) +++ head/games/valyriatear/files/patch-src_engine_video_video.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/engine/video/video.cpp.orig 2016-04-25 20:52:18 UTC -+++ src/engine/video/video.cpp -@@ -434,7 +434,7 @@ bool VideoEngine::ApplySettings() - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); - SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); - -- if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == false) { -+ if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == NULL) { - // RGB values of 1 for each and 8 for depth seemed to be sufficient. - // 565 and 16 here because it works with them on this computer. - // NOTE from prophile: this ought to be changed to 5558 -@@ -447,7 +447,7 @@ bool VideoEngine::ApplySettings() - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0); - SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); - -- if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == false) { -+ if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == NULL) { - IF_PRINT_WARNING(VIDEO_DEBUG) << "SDL_SetVideoMode() failed with error: " << SDL_GetError() << std::endl; - - _temp_fullscreen = _fullscreen; Property changes on: head/games/valyriatear/files/patch-src_engine_video_video.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/valyriatear/files/patch-src-utils-ustring.cpp =================================================================== --- head/games/valyriatear/files/patch-src-utils-ustring.cpp (revision 517711) +++ head/games/valyriatear/files/patch-src-utils-ustring.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/utils/ustring.cpp.orig 2013-09-24 11:33:12 UTC -+++ src/utils/ustring.cpp -@@ -203,7 +203,7 @@ static bool UTF8ToUTF16(const char *sour - return false; - } - --#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) -+#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109 - // We are using an iconv API that uses const char* - const char *sourceChar = source; - #else Property changes on: head/games/valyriatear/files/patch-src-utils-ustring.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake =================================================================== --- head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake (nonexistent) +++ head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake (revision 517712) @@ -0,0 +1,28 @@ +--- CMake/Modules/FindGLEW.cmake.orig 2019-09-22 13:29:24 UTC ++++ CMake/Modules/FindGLEW.cmake +@@ -23,24 +23,11 @@ IF (WIN32) + DOC "The GLEW library") + ELSE (WIN32) + FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h +- /usr/include +- /usr/local/include +- /sw/include +- /opt/local/include +- ${GLEW_ROOT_DIR}/include + DOC "The directory where GL/glew.h resides") + + # Prefer the static library. + FIND_LIBRARY( GLEW_LIBRARY +- NAMES libGLEW.a GLEW +- PATHS +- /usr/lib64 +- /usr/lib +- /usr/local/lib64 +- /usr/local/lib +- /sw/lib +- /opt/local/lib +- ${GLEW_ROOT_DIR}/lib ++ NAMES GLEW + DOC "The GLEW library") + ENDIF (WIN32) + Property changes on: head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/valyriatear/files/patch-src_CMakeLists.txt =================================================================== --- head/games/valyriatear/files/patch-src_CMakeLists.txt (nonexistent) +++ head/games/valyriatear/files/patch-src_CMakeLists.txt (revision 517712) @@ -0,0 +1,15 @@ +--- src/CMakeLists.txt.orig 2019-09-22 13:29:24 UTC ++++ src/CMakeLists.txt +@@ -104,10 +104,10 @@ IF (NOT DISABLE_TRANSLATIONS) + SET(EXTRA_LIBRARIES ws2_32 winmm) + FIND_PACKAGE(LibIntl REQUIRED) + FIND_PACKAGE(Iconv REQUIRED) +- ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS) + FIND_PACKAGE(LibIntl REQUIRED) + FIND_PACKAGE(LibIconv REQUIRED) +- ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") ++ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FIND_PACKAGE(LibIntl REQUIRED) + ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS) + # explicit linking to libintl is required on Solaris Property changes on: head/games/valyriatear/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp =================================================================== --- head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp (nonexistent) +++ head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp (revision 517712) @@ -0,0 +1,11 @@ +--- src/utils/src/utils/ustring.cpp.orig 2018-10-19 17:18:23 UTC ++++ src/utils/src/utils/ustring.cpp +@@ -171,7 +171,7 @@ static bool UTF8ToUTF16(const std::string& source, uin + return false; + } + +-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) ++#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109 + // We are using an iconv API that uses const char* + const char *sourceChar = source.c_str(); + #else Property changes on: head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/valyriatear/pkg-plist =================================================================== --- head/games/valyriatear/pkg-plist (revision 517711) +++ head/games/valyriatear/pkg-plist (revision 517712) @@ -1,13 +1,18 @@ bin/valyriatear share/appdata/valyriatear.appdata.xml share/applications/valyriatear.desktop share/icons/hicolor/48x48/apps/valyriatear.png %%NLS%%share/locale/de/LC_MESSAGES/valyriatear.mo -%%NLS%%share/locale/en@quot/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/es/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/fr/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/gd/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/gl/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/it/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/ja/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/nl_NL/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/ru/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/sv/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/uk_UA/LC_MESSAGES/valyriatear.mo