git: cc310247020d - main - comms/syncterm: Update to 1.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Mon, 02 Dec 2024 14:28:26 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc310247020d50af5b60c7893cce0fd7d3c300e5

commit cc310247020d50af5b60c7893cce0fd7d3c300e5
Author:     Stephen Hurd <shurd@FreeBSD.org>
AuthorDate: 2024-11-24 21:46:58 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-02 14:27:35 +0000

    comms/syncterm: Update to 1.3
    
    Updates SyncTERM to 1.3 and fixes some portlint errors.
    
    Submitter becomes maintainer.
    
    PR:             282954
---
 comms/syncterm/Makefile                            | 63 +++++++++++-----------
 comms/syncterm/distinfo                            |  5 +-
 .../files/cl-dont-validate-va-list.patch.in        | 11 ++++
 comms/syncterm/files/patch-3rdp_build_GNUmakefile  | 10 ++++
 comms/syncterm/pkg-plist                           | 13 +++++
 5 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile
index d06424660c7b..4a0c20358576 100644
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@@ -1,48 +1,51 @@
 PORTNAME=	syncterm
-PORTVERSION=	1.0
-PORTREVISION=	1
+DISTVERSION=	1.3
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	shurd@freebsd.org
 COMMENT=	ANSI-BBS terminal which supports telnet, rlogin, and SSH
 WWW=		https://syncterm.bbsdev.net/
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	as:devel/binutils
-
-WRKSRC=		${WRKDIR}/syncterm-${PORTVERSION}/src/syncterm
 USES=		gmake perl5 tar:tgz
 USE_PERL5=	build
 MAKEFILE=	GNUmakefile
-PLIST_FILES=	bin/syncterm \
-		share/man/man1/syncterm.1.gz \
-		share/applications/syncterm.desktop \
-		share/icons/hicolor/64x64/apps/syncterm.png
-
+MAKE_ARGS+=	WITHOUT_ALSA_SOUND=yes \
+		PREFIX="${PREFIX}" \
+		MANPREFIX="${PREFIX}/share" \
+		INSTALL_EXE="${INSTALL_PROGRAM}" \
+		RELEASE=1
+ALL_TARGET=	${PORTNAME}
+
+CFLAGS+=	-I../xpdev
 NO_CCACHE=	yes
-MAKE_JOBS_UNSAFE=	yes
-MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
-MAKE_ARGS+=	-C ${WRKSRC}
-MAKE_ARGS+=	PREFIX="${PREFIX}"
-MAKE_ARGS+=	MANPREFIX="${PREFIX}/share"
-MAKE_ARGS+=	INSTALL_EXE="${INSTALL_PROGRAM}"
-MAKE_ARGS+=	RELEASE=1
-
-OPTIONS_DEFINE=	X11 SDL
-OPTIONS_DEFAULT=	X11 SDL
-
-X11_USES=	xorg
-X11_USE=	xorg=x11
-X11_MAKE_ARGS_OFF=	NO_X=1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+OPTIONS_DEFINE=	PORTAUDIO PULSEAUDIO SDL X11
+OPTIONS_DEFAULT=	X11
 
-SDL_USES=	sdl
-SDL_USE=	SDL=sdl
-SDL_MAKE_ARGS=	USE_SDL=1
+PORTAUDIO_BUILD_DEPENDS=	${LOCALBASE}/include/portaudio.h:audio/portaudio
+PORTAUDIO_MAKE_ARGS_OFF=	WITHOUT_PORTAUDIO=1
+
+PULSEAUDIO_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpulse-simple.pc:audio/pulseaudio
+PULSEAUDIO_USES=	pkgconfig
+PULSEAUDIO_MAKE_ARGS_OFF=	NO_PULSEAUDIO=1
+
+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
 
-ONLY_FOR_ARCHS=		i386 amd64 powerpc powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	does not configure except on i386, amd64, and powerpc*
+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
+
+post-configure:
+	${CP} ${FILESDIR}/cl-dont-validate-va-list.patch.in ${WRKSRC}/3rdp/build/cl-dont-validate-va-list.patch
 
 .include <bsd.port.mk>
diff --git a/comms/syncterm/distinfo b/comms/syncterm/distinfo
index 9f004fb80e6d..8ed35a624273 100644
--- a/comms/syncterm/distinfo
+++ b/comms/syncterm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (syncterm-1.0.tgz) = e77f28580b22b6ea077ab377be15a35b5a965adb731cec9a71573647fe824b37
-SIZE (syncterm-1.0.tgz) = 8310619
+TIMESTAMP = 1732513310
+SHA256 (syncterm-1.3-src.tgz) = d039644c87c3b29afd3333ec6942d822a85d8d853f67a069132dac1bd691cd8b
+SIZE (syncterm-1.3-src.tgz) = 10470687
diff --git a/comms/syncterm/files/cl-dont-validate-va-list.patch.in b/comms/syncterm/files/cl-dont-validate-va-list.patch.in
new file mode 100644
index 000000000000..64ee6321938e
--- /dev/null
+++ b/comms/syncterm/files/cl-dont-validate-va-list.patch.in
@@ -0,0 +1,11 @@
+--- misc/int_err.c.orig	2024-12-01 18:55:35.113669000 -0500
++++ misc/int_err.c	2024-12-01 18:55:54.976487000 -0500
+@@ -41,7 +41,7 @@
+ 	ANALYSER_HINT_STRING( format );
+ 	ANALYSER_HINT_FORMAT_STRING( format );
+ 
+-	REQUIRES_B( verifyVAList( argPtr ) );
++	//REQUIRES_B( verifyVAList( argPtr ) );
+ 
+ 	/* Clear return value */
+ 	clearErrorInfo( errorInfo );
diff --git a/comms/syncterm/files/patch-3rdp_build_GNUmakefile b/comms/syncterm/files/patch-3rdp_build_GNUmakefile
new file mode 100644
index 000000000000..639ac4c8825f
--- /dev/null
+++ b/comms/syncterm/files/patch-3rdp_build_GNUmakefile
@@ -0,0 +1,10 @@
+--- 3rdp/build/GNUmakefile.orig	2024-11-25 05:31:08 UTC
++++ 3rdp/build/GNUmakefile
+@@ -193,6 +193,7 @@ $(CRYPTLIB_BUILD): $(3RDP_ROOT)/dist/cryptlib.zip $(3R
+ 	$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-fix-cpuid-order.patch
+ 	$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-fix-cbli-incompatible.patch
+ 	$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-mingw64-unicode-gibble.patch
++	$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-dont-validate-va-list.patch
+ 	$(QUIET)perl -pi.bak -e 's/^(#define CRYPTLIB_VERSION.*)$$/"$$1\n#define CRYPTLIB_PATCHES \"" . (chomp($$val = `cat cl-*.patch | if (which md5sum > \/dev\/null 2>&1); then md5sum; else md5; fi`), $$val) . "\""/e' $(CRYPT_SRC)/cryptlib.h
+ 	$(QUIET)sed -E -iorig 's/%%MIN_MAC_OSX_VERSION%%/${MIN_MAC_OSX_VERSION}/g' $(CRYPT_SRC)/tools/ccopts.sh
+ ifdef FIXED_FIXED_SEED
diff --git a/comms/syncterm/pkg-plist b/comms/syncterm/pkg-plist
new file mode 100644
index 000000000000..673ee4bf92a8
--- /dev/null
+++ b/comms/syncterm/pkg-plist
@@ -0,0 +1,13 @@
+bin/syncterm
+share/applications/syncterm.desktop
+share/icons/hicolor/16x16/apps/syncterm.png
+share/icons/hicolor/22x22/apps/syncterm.png
+share/icons/hicolor/24x24/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
+share/icons/hicolor/256x256/apps/syncterm.png
+share/icons/hicolor/scalable/apps/syncterm.svg
+share/icons/hicolor/scalable/apps/syncterm-mini.svg
+share/man/man1/syncterm.1.gz