3 files changed, 56 insertions, 34 deletions

diff --git a/emulators/tic-80/Makefile b/emulators/tic-80/Makefile
index a16e780407f1..4b54adbeeda8 100644
--- a/emulators/tic-80/Makefile
+++ b/emulators/tic-80/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	TIC-80
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.2736
-PORTREVISION=	1
+DISTVERSION=	1.1.2837
 CATEGORIES=	emulators games
 
 MAINTAINER=	fuz@FreeBSD.org
@@ -19,6 +18,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libjanet.so:lang/janet \
 		libpng16.so:graphics/png \
 		libquickjs.so:lang/quickjs \
+		libs7.so:lang/s7 \
 		libsquirrel.so:lang/squirrel \
 		libunwind.so:devel/libunwind
 
@@ -35,7 +35,7 @@ GH_TUPLE=	nesbox:blip-buf:330226d9b55ecbeea644e17b5e0f096a165ca07e:blip_buf/vend
 		nesbox:moonscript:17179283012b392bff972ad66231d73bfeec6e90:moonscript/vendor/moonscript \
 		cofyc:argparse:0d5f5d0745df14a3f373f7eed85bf524714f4524:argparse/vendor/argparse \
 		wasm3:wasm3:a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e:wasm3/vendor/wasm3 \
-		blueloveTH:pocketpy:v1.0.0:pocketpy/vendor/pocketpy \
+		blueloveTH:pocketpy:7312afdad24bb308037088d34b32ed0078fed7d2:pocketpy/vendor/pocketpy \
 		erkkah:naett:v0.3.1:naett/vendor/naett \
 		notnullnotvoid:msf_gif:v2.2:msfgif/vendor/msf_gif
 USE_GL=		gl glu glut
diff --git a/emulators/tic-80/distinfo b/emulators/tic-80/distinfo
index 661624e53013..148bd71781c4 100644
--- a/emulators/tic-80/distinfo
+++ b/emulators/tic-80/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1694199131
-SHA256 (nesbox-TIC-80-v1.1.2736_GH0.tar.gz) = cb9d1670471cad2920684eb8f479395232ea8fc78a1374559fd4b26c4821c999
-SIZE (nesbox-TIC-80-v1.1.2736_GH0.tar.gz) = 1810045
+TIMESTAMP = 1698094418
+SHA256 (nesbox-TIC-80-v1.1.2837_GH0.tar.gz) = a004bbc7b316a4b60d461ac4612fca4ab07e96ed1d1445086e70d1fc4d95961b
+SIZE (nesbox-TIC-80-v1.1.2837_GH0.tar.gz) = 1810478
 SHA256 (nesbox-blip-buf-330226d9b55ecbeea644e17b5e0f096a165ca07e_GH0.tar.gz) = e86870ecb4b7c3feac6afbf5ddd0aff809e14b2d16d9bde251b712fd4ecd6d99
 SIZE (nesbox-blip-buf-330226d9b55ecbeea644e17b5e0f096a165ca07e_GH0.tar.gz) = 51181
 SHA256 (tronkko-dirent-c885633e126a3a949ec0497273ec13e2c03e862c_GH0.tar.gz) = aab1f1d02c3148a3d49a18b8de878603263e62e4a48622121efec92e5b40710b
@@ -15,8 +15,8 @@ SHA256 (cofyc-argparse-0d5f5d0745df14a3f373f7eed85bf524714f4524_GH0.tar.gz) = b1
 SIZE (cofyc-argparse-0d5f5d0745df14a3f373f7eed85bf524714f4524_GH0.tar.gz) = 10152
 SHA256 (wasm3-wasm3-a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e_GH0.tar.gz) = 6a6d988a60f37caa24b997a6510229c4e89fce07aa666413da6ed9814ac0463f
 SIZE (wasm3-wasm3-a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e_GH0.tar.gz) = 2575346
-SHA256 (blueloveTH-pocketpy-v1.0.0_GH0.tar.gz) = 01b0d299b31f94056b66b1e140aad2ef9b75a14a7105bacd14283ea61b27e161
-SIZE (blueloveTH-pocketpy-v1.0.0_GH0.tar.gz) = 793267
+SHA256 (blueloveTH-pocketpy-7312afdad24bb308037088d34b32ed0078fed7d2_GH0.tar.gz) = 093b5d02c2b4b21d11edeb49b40c4e91bb49274f91e990b8fdb2dde72f51f6f2
+SIZE (blueloveTH-pocketpy-7312afdad24bb308037088d34b32ed0078fed7d2_GH0.tar.gz) = 899645
 SHA256 (erkkah-naett-v0.3.1_GH0.tar.gz) = 572ceeb0a6cb86e809bb2c7e971b2a4d257b69f981507c4deaf65aadf22ff15b
 SIZE (erkkah-naett-v0.3.1_GH0.tar.gz) = 87948
 SHA256 (notnullnotvoid-msf_gif-v2.2_GH0.tar.gz) = 96863cb0bf798af745e29cd258f1d004cdfcc47ef9991c04b4005e30b89f5ed4
diff --git a/emulators/tic-80/files/patch-CMakeLists.txt b/emulators/tic-80/files/patch-CMakeLists.txt
index 671ee2bc5d0f..fe114b21b662 100644
--- a/emulators/tic-80/files/patch-CMakeLists.txt
+++ b/emulators/tic-80/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2023-08-27 09:42:28 UTC
+--- CMakeLists.txt.orig	2023-10-22 11:51:43 UTC
 +++ CMakeLists.txt
 @@ -14,7 +14,6 @@ if(CMAKE_BUILD_TYPE)
      string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UC)
@@ -83,10 +83,31 @@
  # WREN
  ################################
  
-@@ -362,41 +307,6 @@ if (BAREMETALPI)
- endif()
+@@ -341,62 +286,6 @@ target_include_directories(wasm PUBLIC ${THIRDPARTY_DI
+ #target_include_directories(wasm PRIVATE ${THIRDPARTY_DIR}/wasm3/src/vm)
  
  ################################
+-# SCHEME (S7)
+-################################
+-
+-set(SCHEME_DIR ${THIRDPARTY_DIR}/s7)
+-set(SCHEME_SRC
+-    ${SCHEME_DIR}/s7.c
+-)
+-
+-add_library(scheme STATIC ${SCHEME_SRC})
+-set_target_properties(scheme PROPERTIES LINKER_LANGUAGE CXX)
+-target_include_directories(scheme PUBLIC ${SCHEME_DIR})
+-
+-if (N3DS)
+-    target_compile_definitions(scheme PRIVATE S7_N3DS)
+-endif()
+-
+-if (BAREMETALPI)
+-    target_compile_definitions(scheme PRIVATE S7_BAREMETALPI)
+-endif()
+-
+-################################
 -# SQUIRREL
 -################################
 -
@@ -122,11 +143,11 @@
 -target_include_directories(squirrel PRIVATE ${SQUIRREL_DIR}/sqstdlib)
 -
 -################################
- # PocketPy (Python)
+ # pocketpy (Python)
  ################################
  
-@@ -432,27 +342,8 @@ else()
-     target_compile_features(python PRIVATE cxx_std_17)
+@@ -417,27 +306,8 @@ if(EMSCRIPTEN)
+     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fexceptions")
  endif()
  
 -################################
@@ -154,7 +175,7 @@
  ################################
  # Blipbuf
  ################################
-@@ -461,36 +352,6 @@ add_library(blipbuf STATIC ${THIRDPARTY_DIR}/blip-buf/
+@@ -446,36 +316,6 @@ add_library(blipbuf STATIC ${THIRDPARTY_DIR}/blip-buf/
  target_include_directories(blipbuf INTERFACE ${THIRDPARTY_DIR}/blip-buf)
  
  ################################
@@ -191,7 +212,7 @@
  # Janet
  ################################
  
-@@ -529,9 +390,7 @@ if(BUILD_WITH_JANET)
+@@ -514,9 +354,7 @@ if(BUILD_WITH_JANET)
          )
      endif()
  
@@ -202,7 +223,7 @@
  endif()
  
  ################################
-@@ -578,24 +437,26 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED)
+@@ -563,24 +401,26 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED)
  
      target_include_directories(tic80core${SCRIPT}
          PRIVATE
@@ -224,7 +245,8 @@
          squirrel
 +        sqstdlib
          python
-         scheme
+-        scheme
++        s7
          quickjs
          blipbuf
 -        zlib
@@ -232,7 +254,7 @@
      )
  
      if(BUILD_WITH_MRUBY)
-@@ -608,7 +469,7 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED)
+@@ -593,7 +433,7 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED)
  
      if(${BUILD_DEPRECATED})
          target_compile_definitions(tic80core${SCRIPT} PRIVATE BUILD_DEPRECATED)
@@ -241,7 +263,7 @@
      endif()
  
      if(LINUX)
-@@ -656,6 +517,8 @@ endif()
+@@ -641,6 +481,8 @@ endif()
  ################################
  if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
  
@@ -250,7 +272,7 @@
      if(WIN32)
          set(HAVE_LIBC TRUE)
      endif()
-@@ -665,10 +528,6 @@ if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
+@@ -650,10 +492,6 @@ if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
          set(SDL_STATIC_PIC ON CACHE BOOL "" FORCE)
      endif()
  
@@ -261,7 +283,7 @@
  endif()
  
  ################################
-@@ -694,7 +553,7 @@ if(BUILD_SDL AND BUILD_PLAYER AND NOT RPI)
+@@ -679,7 +517,7 @@ if(BUILD_SDL AND BUILD_PLAYER AND NOT RPI)
          target_link_options(player-sdl PRIVATE -static)
      endif()
  
@@ -270,7 +292,7 @@
  endif()
  
  ################################
-@@ -835,34 +694,8 @@ endif()
+@@ -820,34 +658,8 @@ endif()
  # ZLIB
  ################################
  
@@ -306,7 +328,7 @@
  ################################
  # ZIP
  ################################
-@@ -871,6 +704,12 @@ set(CMAKE_DISABLE_TESTING ON CACHE BOOL "" FORCE)
+@@ -856,6 +668,12 @@ set(CMAKE_DISABLE_TESTING ON CACHE BOOL "" FORCE)
  add_subdirectory(${THIRDPARTY_DIR}/zip)
  
  ################################
@@ -319,7 +341,7 @@
  # bin2txt cart2prj prj2cart xplode wasmp2cart
  ################################
  
-@@ -891,7 +730,7 @@ if(BUILD_DEMO_CARTS)
+@@ -876,7 +694,7 @@ if(BUILD_DEMO_CARTS)
      target_link_libraries(wasmp2cart tic80core)
  
      add_executable(bin2txt ${TOOLS_DIR}/bin2txt.c)
@@ -328,7 +350,7 @@
  
      add_executable(xplode
          ${TOOLS_DIR}/xplode.c
-@@ -997,7 +836,7 @@ if(USE_NAETT)
+@@ -982,7 +800,7 @@ if(USE_NAETT)
  
      if(WIN32)
          target_link_libraries(naett INTERFACE winhttp)
@@ -337,7 +359,7 @@
          find_package(CURL REQUIRED)
          target_include_directories(naett PRIVATE ${CURL_INCLUDE_DIRS})
          target_link_libraries(naett ${CURL_LIBRARIES})
-@@ -1005,40 +844,6 @@ if(USE_NAETT)
+@@ -990,40 +808,6 @@ if(USE_NAETT)
  endif()
  
  ################################
@@ -378,7 +400,7 @@
  # TIC-80 studio
  ################################
  
-@@ -1082,9 +887,9 @@ if(WIN32)
+@@ -1067,9 +851,9 @@ if(WIN32)
      target_include_directories(tic80studio PRIVATE ${THIRDPARTY_DIR}/dirent/include)
  endif()
  
@@ -390,7 +412,7 @@
  
  if(USE_NAETT)
      target_compile_definitions(tic80studio PRIVATE USE_NAETT)
-@@ -1102,80 +907,6 @@ endif()
+@@ -1087,80 +871,6 @@ endif()
  target_compile_definitions(tic80studio PUBLIC BUILD_EDITORS)
  
  ################################
@@ -471,7 +493,7 @@
  # TIC-80 app
  ################################
  
-@@ -1216,7 +947,7 @@ if(BUILD_SDL)
+@@ -1201,7 +911,7 @@ if(BUILD_SDL)
          endif()
  
      elseif(NOT ANDROID)
@@ -480,7 +502,7 @@
      endif()
  
      target_link_libraries(tic80 tic80studio)
-@@ -1237,13 +968,13 @@ if(BUILD_SDL)
+@@ -1222,13 +932,13 @@ if(BUILD_SDL)
      endif()
  
      if(BUILD_SDLGPU)
@@ -496,7 +518,7 @@
          endif()
      endif()
  
-@@ -1314,7 +1045,7 @@ if(N3DS)
+@@ -1299,7 +1009,7 @@ if(N3DS)
          ${CMAKE_SOURCE_DIR}/src)
  
      target_link_directories(tic80_n3ds PRIVATE ${DEVKITPRO}/libctru/lib ${DEVKITPRO}/portlibs/3ds/lib)
@@ -505,7 +527,7 @@
  
      add_custom_command(TARGET tic80_n3ds
             POST_BUILD
-@@ -1374,7 +1105,7 @@ if(BUILD_STUB)
+@@ -1359,7 +1069,7 @@ if(BUILD_STUB)
              endif()
  
          else()
@@ -514,7 +536,7 @@
          endif()
  
          target_link_libraries(tic80${SCRIPT} tic80core${SCRIPT} argparse)
-@@ -1386,13 +1117,13 @@ if(BUILD_STUB)
+@@ -1371,13 +1081,13 @@ if(BUILD_STUB)
          endif()
  
          if(BUILD_SDLGPU)