diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-06-08 08:04:44 +0000 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-06-08 08:04:44 +0000 |
commit | b2876937d3a7db983fa14d47d6d86465c83196e2 (patch) | |
tree | b45d770c93711df577e370484192426aac874962 /games/multimc | |
parent | 766c7c46383e45c6bff43a3e5eff02e04013940a (diff) | |
download | ports-b2876937d3a7db983fa14d47d6d86465c83196e2.tar.gz ports-b2876937d3a7db983fa14d47d6d86465c83196e2.zip |
games/multimc: Update to 0.6.2
Changes: https://multimc.org/posts/0-6-2-update.html
PR: 228819
Submitted by: tsundoku <me@tsundoku.ne.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=471985
Diffstat (limited to 'games/multimc')
-rw-r--r-- | games/multimc/Makefile | 10 | ||||
-rw-r--r-- | games/multimc/distinfo | 14 | ||||
-rw-r--r-- | games/multimc/files/patch-CMakeLists.txt | 11 | ||||
-rw-r--r-- | games/multimc/files/patch-api_logic_minecraft_update_FMLLibrariesTask.h | 10 | ||||
-rw-r--r-- | games/multimc/files/patch-application_CMakeLists.txt | 31 |
5 files changed, 10 insertions, 66 deletions
diff --git a/games/multimc/Makefile b/games/multimc/Makefile index e4616e9eea66..5d7a92b2f59d 100644 --- a/games/multimc/Makefile +++ b/games/multimc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= multimc -DISTVERSION= 0.6.0 +DISTVERSION= 0.6.2 CATEGORIES= games java MAINTAINER= me@tsundoku.ne.jp @@ -16,8 +16,8 @@ USES= cmake:outsource compiler:c++14-lang USE_GITHUB= yes GH_ACCOUNT= MultiMC GH_PROJECT= MultiMC5 -GH_TUPLE= MultiMC:libnbtplusplus:4b305bb:libnbtplusplus/libraries/libnbtplusplus \ - MultiMC:quazip:164acc3:quazip/libraries/quazip +GH_TUPLE= MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \ + MultiMC:quazip:3691d57:quazip/libraries/quazip USE_LDCONFIG= yes USE_JAVA= 1.8+ USE_QT5= buildtools core concurrent gui network qmake testlib_build widgets xml @@ -28,10 +28,6 @@ CXXFLAGS+= -Wno-inconsistent-missing-override \ -Wno-delete-non-virtual-dtor \ -DLWJGL_DIR='\"${LOCALBASE}/lib/lwjgl2.9.3\"' -post-patch: - @${REINPLACE_CMD} 's,usr/local,${PREFIX:S@^/@@},g' \ - ${WRKSRC}/application/CMakeLists.txt - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libMultiMC_*.so diff --git a/games/multimc/distinfo b/games/multimc/distinfo index cd4cfaf6a489..2da065dbb638 100644 --- a/games/multimc/distinfo +++ b/games/multimc/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1514826359 -SHA256 (MultiMC-MultiMC5-0.6.0_GH0.tar.gz) = ac458be99250d2a369ee805bf9560e396d0e0f16a95cc84c36eb0ef1e94a6374 -SIZE (MultiMC-MultiMC5-0.6.0_GH0.tar.gz) = 1844862 -SHA256 (MultiMC-libnbtplusplus-4b305bb_GH0.tar.gz) = 576391fb7aac44e8d8e2012f38b1f0bbb08cb9d0cd9104f162cfdee4b83e5627 -SIZE (MultiMC-libnbtplusplus-4b305bb_GH0.tar.gz) = 47080 -SHA256 (MultiMC-quazip-164acc3_GH0.tar.gz) = fb289ba497f2e315a8e85881ca78218f859d7a72f11463251cfb83271c4381b7 -SIZE (MultiMC-quazip-164acc3_GH0.tar.gz) = 103454 +TIMESTAMP = 1528391891 +SHA256 (MultiMC-MultiMC5-0.6.2_GH0.tar.gz) = d5e5fdc3234ac423e4abf8ea3b46d851c2df54713eae61f2171cb6f85de78fee +SIZE (MultiMC-MultiMC5-0.6.2_GH0.tar.gz) = 2257365 +SHA256 (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 14f16c8e6dc264017684774cdd9c6f149855e464895b28c29f9f55ea76d34f1a +SIZE (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 47406 +SHA256 (MultiMC-quazip-3691d57_GH0.tar.gz) = 17a9457360053fa2c6c849c75fa760383036bd14d7d8f7bd0d958bfc2a584009 +SIZE (MultiMC-quazip-3691d57_GH0.tar.gz) = 103508 diff --git a/games/multimc/files/patch-CMakeLists.txt b/games/multimc/files/patch-CMakeLists.txt deleted file mode 100644 index d0a2282ff20a..000000000000 --- a/games/multimc/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2017-12-18 00:19:43 UTC -+++ CMakeLists.txt -@@ -5,6 +5,8 @@ if(IS_IN_SOURCE_BUILD) - message(AUTHOR_WARNING "You are building MultiMC in-source. This is NOT recommended!") - endif() - -+set(CMAKE_INSTALL_PREFIX "/") -+ - if(WIN32) - # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows - cmake_policy(SET CMP0020 OLD) diff --git a/games/multimc/files/patch-api_logic_minecraft_update_FMLLibrariesTask.h b/games/multimc/files/patch-api_logic_minecraft_update_FMLLibrariesTask.h deleted file mode 100644 index 96c79debe10a..000000000000 --- a/games/multimc/files/patch-api_logic_minecraft_update_FMLLibrariesTask.h +++ /dev/null @@ -1,10 +0,0 @@ ---- api/logic/minecraft/update/FMLLibrariesTask.h.orig 2018-06-03 04:17:36 UTC -+++ api/logic/minecraft/update/FMLLibrariesTask.h -@@ -1,6 +1,7 @@ - #pragma once - #include "tasks/Task.h" - #include "net/NetJob.h" -+#include "minecraft/VersionFilterData.h" - class MinecraftInstance; - - class FMLLibrariesTask : public Task diff --git a/games/multimc/files/patch-application_CMakeLists.txt b/games/multimc/files/patch-application_CMakeLists.txt deleted file mode 100644 index 4ccfd7ec9938..000000000000 --- a/games/multimc/files/patch-application_CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ ---- application/CMakeLists.txt.orig 2017-12-18 00:19:43 UTC -+++ application/CMakeLists.txt -@@ -27,11 +27,11 @@ set(MultiMC_PASTE_EE_API_KEY "" CACHE ST - set(MultiMC_ANALYTICS_ID "" CACHE STRING "ID you can get from Google analytics") - - #### Check the current Git commit and branch --include(GetGitRevisionDescription) --get_git_head_revision(MultiMC_GIT_REFSPEC MultiMC_GIT_COMMIT) -+#include(GetGitRevisionDescription) -+#get_git_head_revision(MultiMC_GIT_REFSPEC MultiMC_GIT_COMMIT) - --message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}") --message(STATUS "Git refspec: ${MultiMC_GIT_REFSPEC}") -+#message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}") -+#message(STATUS "Git refspec: ${MultiMC_GIT_REFSPEC}") - - set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}") - -@@ -390,9 +390,9 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin - install(PROGRAMS package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) - - elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") -- set(MultiMC_BINARY_DEST_DIR "usr/bin" CACHE STRING "Relative path from packaging root to the binary directory") -- set(MultiMC_LIBRARY_DEST_DIR "usr/lib" CACHE STRING "Relative path from packaging root to the library directory") -- set(MultiMC_SHARE_DEST_DIR "usr/share/multimc" CACHE STRING "Relative path from packaging root to the shared data directory") -+ set(MultiMC_BINARY_DEST_DIR "usr/local/bin" CACHE STRING "Relative path from packaging root to the binary directory") -+ set(MultiMC_LIBRARY_DEST_DIR "usr/local/lib" CACHE STRING "Relative path from packaging root to the library directory") -+ set(MultiMC_SHARE_DEST_DIR "usr/local/share/multimc" CACHE STRING "Relative path from packaging root to the shared data directory") - set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary for the purposes of linux packaging") - set(JARS_DEST_DIR "${MultiMC_SHARE_DEST_DIR}") - |