From b6a6e0f36e786b2906b02c08b444efdfaa23886d Mon Sep 17 00:00:00 2001 From: fcambus Date: Sat, 1 Mar 2025 15:43:31 +0000 Subject: [PATCH] Update syncterm to 1.6. --- comms/syncterm/Makefile | 4 +-- comms/syncterm/distinfo | 4 +-- .../patches/patch-src_build_Common_gmake | 30 +++++++++---------- .../patches/patch-src_xpdev_genwrap_h | 14 ++++----- .../patches/patch-src_xpdev_ini_file_c | 14 --------- comms/syncterm/pkg/PLIST | 14 +++++---- 6 files changed, 35 insertions(+), 45 deletions(-) delete mode 100644 comms/syncterm/patches/patch-src_xpdev_ini_file_c diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile index c56b441b35ad..8967d1024284 100644 --- a/comms/syncterm/Makefile +++ b/comms/syncterm/Makefile @@ -1,7 +1,6 @@ COMMENT= BBS terminal program -DISTNAME= syncterm-1.1 -REVISION= 4 +DISTNAME= syncterm-1.6 CATEGORIES= comms net @@ -29,6 +28,7 @@ MAKE_FLAGS= RELEASE=1 \ WITHOUT_CRYPTLIB=1 \ USE_SDL=1 \ SDL_CONFIG=${LOCALBASE}/bin/sdl2-config \ + MANPREFIX=${PREFIX} \ QUIET= CFLAGS+= -DN_CURSES_LIB CFLAGS+= ${PICFLAG} diff --git a/comms/syncterm/distinfo b/comms/syncterm/distinfo index 5fdd49badc56..6fbbbed7bf3c 100644 --- a/comms/syncterm/distinfo +++ b/comms/syncterm/distinfo @@ -1,2 +1,2 @@ -SHA256 (syncterm-1.1-src.tgz) = 0XfkRMbLlrzuV2B17RcdPYeC1kB4VcTWgOHeqOMyp6Y= -SIZE (syncterm-1.1-src.tgz) = 18270212 +SHA256 (syncterm-1.6-src.tgz) = eeOuQ9OfmKWSJo/0AJQJTaYqpYe1uSXmt0WdZqXRHUk= +SIZE (syncterm-1.6-src.tgz) = 10986287 diff --git a/comms/syncterm/patches/patch-src_build_Common_gmake b/comms/syncterm/patches/patch-src_build_Common_gmake index 12c7fb9324c7..1732c1fabba6 100644 --- a/comms/syncterm/patches/patch-src_build_Common_gmake +++ b/comms/syncterm/patches/patch-src_build_Common_gmake @@ -1,23 +1,23 @@ Don't hardcode -fpic, some of our architectures need -fPIC. -Don't hardcode -O2. +Don't hardcode -O3. Index: src/build/Common.gmake --- src/build/Common.gmake.orig +++ src/build/Common.gmake -@@ -225,7 +225,6 @@ endif - ifeq ($(machine),x86_64) - machine := x64 +@@ -279,7 +279,6 @@ ifeq ($(machine_uname),x86_64) + machine_uname := x64 endif --CFLAGS += -fpic - ifeq ($(machine),sparc64) - CFLAGS += -D__BIG_ENDIAN__ + ifndef win +- CFLAGS += -fpic endif -@@ -433,7 +432,7 @@ ifdef DEBUG + ifeq ($(machine_uname),sparc64) + CFLAGS += -D__BIG_ENDIAN__ +@@ -524,7 +523,7 @@ ifdef DEBUG else # RELEASE - # -finline functions breaks the baja build badly. - # This also means that -O3 won't work either. -- CFLAGS := -O2 -fomit-frame-pointer -ffast-math -funroll-loops $(CFLAGS) -+ CFLAGS := -fomit-frame-pointer -ffast-math -funroll-loops $(CFLAGS) - endif - - -include targets.mk + # -finline-functions (used to) break the baja build badly. + # This also meant that -O3 wouldn't work either. +- CFLAGS := -O3 -Wno-unused-result -ffast-math -funroll-loops $(CFLAGS) -DNDEBUG ++ CFLAGS := -Wno-unused-result -ffast-math -funroll-loops $(CFLAGS) -DNDEBUG + ifndef NO_LTO + # Not Yet... this requires more care with library ordering. + # CFLAGS += -flto diff --git a/comms/syncterm/patches/patch-src_xpdev_genwrap_h b/comms/syncterm/patches/patch-src_xpdev_genwrap_h index e50be13cdb43..9db4524a10c0 100644 --- a/comms/syncterm/patches/patch-src_xpdev_genwrap_h +++ b/comms/syncterm/patches/patch-src_xpdev_genwrap_h @@ -3,12 +3,12 @@ ARCHITECTURE_DESC is unused, no need to error out for that. Index: src/xpdev/genwrap.h --- src/xpdev/genwrap.h.orig +++ src/xpdev/genwrap.h -@@ -208,7 +208,7 @@ extern "C" { - #elif defined(_M_IA64) || defined(__ia64__) - #define ARCHITECTURE_DESC "ia64" - #else -- #error "Need to describe target architecture" -+ #define ARCHITECTURE_DESC "unknown" +@@ -228,7 +228,7 @@ extern "C" { + #ifdef UNAME_ARCHITECTURE_DESC + #define ARCHITECTURE_DESC UNAME_ARCHITECTURE_DESC + #else +- #error "Need to describe target architecture" ++ #define ARCHITECTURE_DESC "unknown" + #endif #endif - /*********************/ diff --git a/comms/syncterm/patches/patch-src_xpdev_ini_file_c b/comms/syncterm/patches/patch-src_xpdev_ini_file_c deleted file mode 100644 index 9a8c2dd798fe..000000000000 --- a/comms/syncterm/patches/patch-src_xpdev_ini_file_c +++ /dev/null @@ -1,14 +0,0 @@ -64bit time_t - -Index: src/xpdev/ini_file.c ---- src/xpdev/ini_file.c.orig -+++ src/xpdev/ini_file.c -@@ -707,7 +707,7 @@ char* iniSetDateTime(str_list_t* list, const char* sec - if(value==0) - SAFECOPY(str,"Never"); - else if((p=ctime_r(&value,tstr))==NULL) -- SAFEPRINTF(str,"0x%lx",value); -+ SAFEPRINTF(str,"0x%llx",value); - else if(!include_time) /* reformat into "Mon DD YYYY" */ - safe_snprintf(str,sizeof(str),"%.3s %.2s %.4s" ,p+4,p+8,p+20); - else /* reformat into "Mon DD YYYY HH:MM:SS" */ diff --git a/comms/syncterm/pkg/PLIST b/comms/syncterm/pkg/PLIST index 1730e8610785..16eb8be1171f 100644 --- a/comms/syncterm/pkg/PLIST +++ b/comms/syncterm/pkg/PLIST @@ -1,11 +1,15 @@ @bin bin/syncterm @man man/man1/syncterm.1 -share/applications/ share/applications/syncterm.desktop -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/64x64/ -share/icons/hicolor/64x64/apps/ +share/icons/hicolor/16x16/apps/syncterm.png +share/icons/hicolor/22x22/apps/syncterm.png +share/icons/hicolor/24x24/apps/syncterm.png +share/icons/hicolor/256x256/apps/syncterm.png +share/icons/hicolor/32x32/apps/syncterm.png +share/icons/hicolor/36x36/apps/syncterm.png +share/icons/hicolor/48x48/apps/syncterm.png share/icons/hicolor/64x64/apps/syncterm.png @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor +share/icons/hicolor/scalable/apps/syncterm-mini.svg +share/icons/hicolor/scalable/apps/syncterm.svg