diff --git a/devel/Makefile b/devel/Makefile index af7b2db6aa41..2e1c4ecd538f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -401,7 +401,6 @@ SUBDIR += cpprestsdk SUBDIR += cpptest SUBDIR += cppunit - SUBDIR += cppurses SUBDIR += cpputest SUBDIR += cproto SUBDIR += cpu_features @@ -6972,6 +6971,7 @@ SUBDIR += termbox SUBDIR += termcolor SUBDIR += terminality + SUBDIR += termox SUBDIR += tevent SUBDIR += tex-kpathsea SUBDIR += tex-libtexlua diff --git a/devel/termox/Makefile b/devel/termox/Makefile index 6740225c74d3..76b54d40842d 100644 --- a/devel/termox/Makefile +++ b/devel/termox/Makefile @@ -1,7 +1,6 @@ PORTNAME= cppurses DISTVERSIONPREFIX= v -DISTVERSION= 0.3-5 -DISTVERSIONSUFFIX= -g342a389 +DISTVERSION= 1.1.1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -11,13 +10,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= cmake compiler:c++14-lang ncurses +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= a-n-t-h-o-n-y -GH_PROJECT= CPPurses -GH_TUPLE= \ - a-n-t-h-o-n-y:Signals:fb1137a66aac53c9a82356feb9159fd911d4f213:a_n_t_h_o_n_y_Signals/libs/Signals \ - a-n-t-h-o-n-y:Chess-curses:f597add641463b5aeb7382d4f804f5c4e6df69d5:a_n_t_h_o_n_y_Chess_curses/demos/chess \ - a-n-t-h-o-n-y:Optional:daa1e69b7ff27aa05e47081ac90794f7881eaf5d:a_n_t_h_o_n_y_Optional/libs/Signals/libs/Optional -USE_LDCONFIG= yes +GH_PROJECT= TermOx +GH_TUPLE= a-n-t-h-o-n-y:Escape:45ca047:a_n_t_h_o_n_y_Escape/external/Escape \ + a-n-t-h-o-n-y:signals-light:1070e93:a_n_t_h_o_n_y_signals_light/external/signals-light \ + catchorg:Catch2:ff349a5:catchorg_Catch2/external/signals-light/external/Catch2 .include diff --git a/devel/termox/distinfo b/devel/termox/distinfo index a22706785ef8..c2fde3777535 100644 --- a/devel/termox/distinfo +++ b/devel/termox/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1587053425 -SHA256 (a-n-t-h-o-n-y-CPPurses-v0.3-5-g342a389_GH0.tar.gz) = ed43cd0f6002cfa18d962470c37085a11a769c4a28537cbfa21945f2042b70df -SIZE (a-n-t-h-o-n-y-CPPurses-v0.3-5-g342a389_GH0.tar.gz) = 3306549 -SHA256 (a-n-t-h-o-n-y-Signals-fb1137a66aac53c9a82356feb9159fd911d4f213_GH0.tar.gz) = da6821c141eec6196ab0df3778a1355b6903dfa4faa59cee128510cfde305126 -SIZE (a-n-t-h-o-n-y-Signals-fb1137a66aac53c9a82356feb9159fd911d4f213_GH0.tar.gz) = 55394 -SHA256 (a-n-t-h-o-n-y-Chess-curses-f597add641463b5aeb7382d4f804f5c4e6df69d5_GH0.tar.gz) = 7810740c10806586c02c765e28102d7d52c060e3232b09bd4cc091183bf2cfed -SIZE (a-n-t-h-o-n-y-Chess-curses-f597add641463b5aeb7382d4f804f5c4e6df69d5_GH0.tar.gz) = 178567 -SHA256 (a-n-t-h-o-n-y-Optional-daa1e69b7ff27aa05e47081ac90794f7881eaf5d_GH0.tar.gz) = 8345eb806255ec9c4f11f92b1aea9f4e9173408f47edb90565cc371acfb045af -SIZE (a-n-t-h-o-n-y-Optional-daa1e69b7ff27aa05e47081ac90794f7881eaf5d_GH0.tar.gz) = 45074 +TIMESTAMP = 1628872347 +SHA256 (a-n-t-h-o-n-y-TermOx-v1.1.1_GH0.tar.gz) = 6da0f085b240d0aa4284fd71cbfa5ffd14bb464e8c1b2ac04a49a55da85869d2 +SIZE (a-n-t-h-o-n-y-TermOx-v1.1.1_GH0.tar.gz) = 1743617 +SHA256 (a-n-t-h-o-n-y-Escape-45ca047_GH0.tar.gz) = 846b267b8f40990d8497a77d2b0dde5ceb03b6603103ee8de6b7f778d181f566 +SIZE (a-n-t-h-o-n-y-Escape-45ca047_GH0.tar.gz) = 33053 +SHA256 (a-n-t-h-o-n-y-signals-light-1070e93_GH0.tar.gz) = eb95058cd3f9945953c0a922884ffe136b6eff5a81aecfb3dae3626482489590 +SIZE (a-n-t-h-o-n-y-signals-light-1070e93_GH0.tar.gz) = 10041 +SHA256 (catchorg-Catch2-ff349a5_GH0.tar.gz) = 45983da4c511bc6ed68e391178ead52b0b40c5e8ad7ea5f3fc8c376432d1b6b7 +SIZE (catchorg-Catch2-ff349a5_GH0.tar.gz) = 655437 diff --git a/devel/termox/files/patch-src_CMakeLists.txt b/devel/termox/files/patch-src_CMakeLists.txt index 9979ac909d82..c5a9e471bd34 100644 --- a/devel/termox/files/patch-src_CMakeLists.txt +++ b/devel/termox/files/patch-src_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/CMakeLists.txt.orig 2019-11-25 00:40:32 UTC +--- src/CMakeLists.txt.orig 2021-07-01 01:20:18 UTC +++ src/CMakeLists.txt -@@ -33,7 +33,7 @@ if(${CMAKE_VERSION} VERSION_LESS "3.8") - set(CMAKE_CXX_STANDARD 14) - endif() - --add_library(cppurses STATIC "") -+add_library(cppurses SHARED "") - - find_package(Threads REQUIRED) +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.9) + # TermOx Library +-add_library(TermOx STATIC ++add_library(TermOx + common/mb_to_u32.cpp + common/timer.cpp + common/u32_to_mb.cpp