diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile index 86a1b37571f8..b90c1ae8b84d 100644 --- a/comms/syncterm/Makefile +++ b/comms/syncterm/Makefile @@ -1,53 +1,46 @@ PORTNAME= syncterm -DISTVERSION= 1.7 +DISTVERSION= 1.8 CATEGORIES= comms MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= shurd@freebsd.org COMMENT= ANSI-BBS terminal which supports telnet, rlogin, and SSH WWW= https://syncterm.bbsdev.net/ LICENSE= GPLv2 -USES= gmake perl5 tar:tgz +USES= cmake perl5 tar:tgz USE_PERL5= build -MAKEFILE= GNUmakefile -MAKE_ARGS+= INSTALL_EXE="${INSTALL_PROGRAM}" \ - MANPREFIX="${PREFIX}/share" \ - PREFIX="${PREFIX}" \ - RELEASE=1 \ - WITHOUT_ALSA_SOUND=yes -ALL_TARGET= ${PORTNAME} - -CFLAGS+= -I../xpdev -NO_CCACHE= yes + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS_DEFINE= JXL PORTAUDIO PULSEAUDIO SDL X11 -OPTIONS_DEFAULT= JXL X11 +OPTIONS_DEFINE= JXL PORTAUDIO PULSEAUDIO SDL WAYLAND X11 +OPTIONS_DEFAULT= JXL WAYLAND X11 JXL_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libjxl.pc:graphics/libjxl JXL_USES= pkgconfig -JXL_MAKE_ARGS_OFF= WITHOUT_JPEG_XL=1 +JXL_CMAKE_OFF= -DWITHOUT_JPEG_XL=ON PORTAUDIO_BUILD_DEPENDS= ${LOCALBASE}/include/portaudio.h:audio/portaudio -PORTAUDIO_MAKE_ARGS_OFF= WITHOUT_PORTAUDIO=1 +PORTAUDIO_CMAKE_OFF= -DWITHOUT_PORTAUDIO=ON PULSEAUDIO_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libpulse-simple.pc:audio/pulseaudio PULSEAUDIO_USES= pkgconfig -PULSEAUDIO_MAKE_ARGS_OFF= NO_PULSEAUDIO=1 +PULSEAUDIO_CMAKE_OFF= -DWITHOUT_PULSEAUDIO=ON SDL_BUILD_DEPENDS= ${LOCALBASE}/bin/sdl2-config:devel/sdl20 -SDL_MAKE_ARGS= USE_SDL=1 \ - USE_SDL_AUDIO=1 -SDL_MAKE_ARGS_OFF= WITHOUT_SDL=1 +SDL_CMAKE_OFF= -DWITHOUT_SDL=ON + +WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-client.pc:graphics/wayland +WAYLAND_USES= pkgconfig +WAYLAND_CMAKE_OFF= -DWITHOUT_WAYLAND=ON X11_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 \ ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama \ ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr \ ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender X11_USES= pkgconfig -X11_MAKE_ARGS_OFF= NO_X=1 +X11_CMAKE_OFF= -DWITHOUT_X11=ON .include diff --git a/comms/syncterm/distinfo b/comms/syncterm/distinfo index 037e3be80273..5f7a2a665be6 100644 --- a/comms/syncterm/distinfo +++ b/comms/syncterm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760239214 -SHA256 (syncterm-1.7-src.tgz) = bed2a55b17bc2fc2ae65463fe87835c68defe519820657421b99dba18edb90c8 -SIZE (syncterm-1.7-src.tgz) = 11002120 +TIMESTAMP = 1776547091 +SHA256 (syncterm-1.8-src.tgz) = 7e32abdff51f151ed70bcc34e0d17f7832f477d2e80be9af59acd31908bbc4b8 +SIZE (syncterm-1.8-src.tgz) = 14642645 diff --git a/comms/syncterm/files/patch-3rdp_build_CMakeLists.txt b/comms/syncterm/files/patch-3rdp_build_CMakeLists.txt new file mode 100644 index 000000000000..7617695a3cad --- /dev/null +++ b/comms/syncterm/files/patch-3rdp_build_CMakeLists.txt @@ -0,0 +1,11 @@ +--- 3rdp/build/CMakeLists.txt.orig 2026-04-18 20:39:40 UTC ++++ 3rdp/build/CMakeLists.txt +@@ -94,4 +94,8 @@ FetchContent_Declare(CryptLib + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PATCHES} . + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/hashpatch.pl . + COMMAND ${CMAKE_COMMAND} -E rename makefile makefile.old) ++# No network is used for this dependency (DOWNLOAD_COMMAND is empty), so the ++# port-level FETCHCONTENT_FULLY_DISCONNECTED guard would block a purely local ++# zip extraction. Shadow it here so population always runs. ++set(FETCHCONTENT_FULLY_DISCONNECTED FALSE) + FetchContent_MakeAvailable(CryptLib) diff --git a/comms/syncterm/files/patch-src_syncterm_CMakeLists.txt b/comms/syncterm/files/patch-src_syncterm_CMakeLists.txt new file mode 100644 index 000000000000..7dde3261cc3e --- /dev/null +++ b/comms/syncterm/files/patch-src_syncterm_CMakeLists.txt @@ -0,0 +1,13 @@ +--- src/syncterm/CMakeLists.txt.orig 2026-04-18 20:39:38 UTC ++++ src/syncterm/CMakeLists.txt +@@ -209,7 +209,9 @@ if(UNIX) + + install(TARGETS syncterm DESTINATION bin) + if(UNIX) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncterm.man TYPE MAN) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncterm.man ++ DESTINATION share/man/man1 ++ RENAME syncterm.1) + install(FILES syncterm.desktop DESTINATION share/applications) + install(FILES syncterm.desktop DESTINATION share/applications) + install(FILES syncterm16.png DESTINATION share/icons/hicolor/16x16/apps RENAME syncterm.png) diff --git a/comms/syncterm/files/patch-src_xpdev_CMakeLists.txt b/comms/syncterm/files/patch-src_xpdev_CMakeLists.txt new file mode 100644 index 000000000000..e8b5702fb42e --- /dev/null +++ b/comms/syncterm/files/patch-src_xpdev_CMakeLists.txt @@ -0,0 +1,16 @@ +--- src/xpdev/CMakeLists.txt.orig 2026-04-18 20:39:40 UTC ++++ src/xpdev/CMakeLists.txt +@@ -276,6 +276,13 @@ else() + if(WITHOUT_CRYPTLIB) + target_compile_definitions(xpdev PUBLIC WITHOUT_CRYPTLIB) + else() ++ if(NOT TARGET cl) ++ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../3rdp/build cryptlib EXCLUDE_FROM_ALL) ++ endif() + target_compile_definitions(xpdev PUBLIC WITH_CRYPTLIB) + target_link_libraries(xpdev cl) ++ get_target_property(_CL_INC cl INTERFACE_INCLUDE_DIRECTORIES) ++ if(_CL_INC) ++ target_include_directories(xpdev PRIVATE ${_CL_INC}) ++ endif() + endif() diff --git a/comms/syncterm/pkg-descr b/comms/syncterm/pkg-descr index 11fd485b9335..2a33062e0dd6 100644 --- a/comms/syncterm/pkg-descr +++ b/comms/syncterm/pkg-descr @@ -1,3 +1,3 @@ An ANSI-BBS terminal designed to connect to remote BBSs via telnet, rlogin, or SSH. Supports ANSI music and the IBM charset when possible. Will run from a -console, under X11 using XLib, or using SDL. +console, under X11 using XLib, Wayland, or using SDL.