From nobody Wed Jul 30 11:44:30 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bsVk66MDyz63WVP; Wed, 30 Jul 2025 11:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bsVk641Y3z3NFd; Wed, 30 Jul 2025 11:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753875870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj7U2qcqQ7zsHT3leVD/T2e/JEMKzXoTC/uV/1pCCIg=; b=ITvSWKJSnX/bCi4SICYCLe624fhX1KLan3UzqPVhmd7rSsUmPl+1hmRaE0E0+qLtKlPxYF k9NBg8DfUsgVXauBD2jexuiK9g7XeYaBB0xXCXDvRBjPmDwIRfeYb6i0rM/ySlqvwEJYpl jwsqMe/cKpxHXcOVKfNBNEluEzRrNSqImKTVNwAMlAyhPAPzuhFzzcbcI/k6EQ3GLmOgSk HRMctXEsIknjAx3rqNk2+1F90tisMtZuAqLNI8ZcpBxg2PJahTF64EF11vBRl5qyb+J/Tg QMwkNnmY+sj9RpU45EVkCwjMFdx4EWo2sm+U/OK9KUt8Nh3VygwJ84uobkxP2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753875870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj7U2qcqQ7zsHT3leVD/T2e/JEMKzXoTC/uV/1pCCIg=; b=dAk7r89ZMA6/sv895A9QbZLOwHrKMIK64vx4it8xVoEQxNBG8+PvzAB26GpjhB8RlSlRJh VcRRB1VrMOxFg6VOXWXX1ytEyHAhwS3vKBDXSb/b3n8ndebPia3Eg2OziiBT9nTmpLr097 DADxf55M1xZT/bMJbbCVRMPLjSfdgdKAHNZRyA4bIti6/8HEOLbq0AKE0J0yxD63tBbGo+ LRHwlM7dSss/d5qkcrEE2R1XASC3i/UyZ7ykNeRCvsOOOS6saMVaF6TrzrHqEutNXAx8mj cQHJesiaZZ1LIZoPMGvysAmbzfRD+9J3d4KhYvGofAqpj9AOvfcJU0kXt4S0Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753875870; a=rsa-sha256; cv=none; b=O/uKVQbHtZ8HrOp9Bq6mYEShz5iFzFA0p0pWCaqScE4RUS9swIz1+WRGkMWNBY0hYesESd pCHJfDMqTBVLCL41kir0PaPHpSH+zEqadEK92i6acBM12eUsdm3e2bU10XyqtDYEU7rSOG iQpqbH7sRTWdnizL76iCWUaaS+dv0aAH/COqdM12g15ZLo6mFx6bf578ShvVpth7Y9oONx oyiEXcbrCjeiDUGPuE1ENAClTuBVWuDRqV2/0WnTL8msZCHbwb/mJzBtYVWtHGtVVlW7zL 63llYCNL5HoENZjJiUFI9YN8Aj8Q5zFCo8RHgvpdBoTz38uk3OdShHjbjUzDPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bsVk63Z6yz12T; Wed, 30 Jul 2025 11:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56UBiUNx031622; Wed, 30 Jul 2025 11:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56UBiUQD031619; Wed, 30 Jul 2025 11:44:30 GMT (envelope-from git) Date: Wed, 30 Jul 2025 11:44:30 GMT Message-Id: <202507301144.56UBiUQD031619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?=C3=84lven?= Subject: git: ce8ceb06f79f - main - comms/morse: update 2.5 => 2.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alven X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce8ceb06f79ff7a425e71b0be9bff0c72516295e Auto-Submitted: auto-generated The branch main has been updated by alven: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce8ceb06f79ff7a425e71b0be9bff0c72516295e commit ce8ceb06f79ff7a425e71b0be9bff0c72516295e Author: Älven AuthorDate: 2025-07-27 13:54:43 +0000 Commit: Älven CommitDate: 2025-07-30 11:43:25 +0000 comms/morse: update 2.5 => 2.6 * Switch to Gitlab upstream * Use textproc/xmlto for man page generation * Format using portfmt(1) * Actualise patches to current version * Use explicit localbase:ldflags helper for X11 option instead of CFLAGS and LDFLAGS * Regression: build with X11 option set failed with: ./alarm.h:15:15: error: a parameter list without types is only allowed in a function definition PR: 288513 Approved by: yuri@ (Mentor) --- comms/morse/Makefile | 39 ++++++++------- comms/morse/distinfo | 5 +- comms/morse/files/patch-Makefile | 36 ++++++-------- comms/morse/files/patch-QSO.1 | 5 -- comms/morse/files/patch-morse.1 | 85 -------------------------------- comms/morse/files/patch-morse.d-Makefile | 8 +-- comms/morse/files/patch-qso.d-Makefile | 8 +-- 7 files changed, 46 insertions(+), 140 deletions(-) diff --git a/comms/morse/Makefile b/comms/morse/Makefile index d2d71232532a..cbe502e80b3d 100644 --- a/comms/morse/Makefile +++ b/comms/morse/Makefile @@ -1,9 +1,6 @@ PORTNAME= morse -PORTVERSION= 2.5 -PORTREVISION= 2 +DISTVERSION= 2.6 CATEGORIES= comms hamradio -MASTER_SITES= http://www.catb.org/~esr/morse/ \ - LOCAL/db MAINTAINER= hamradio@FreeBSD.org COMMENT= Morse Code Trainer @@ -12,27 +9,33 @@ WWW= http://www.catb.org/~esr/morse/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -PLIST_FILES= bin/morsec bin/QSO share/man/man1/QSO.1.gz share/man/man1/morsec.1.gz +BUILD_DEPENDS= xmlto>0:textproc/xmlto -OPTIONS_SINGLE= SOUND -OPTIONS_SINGLE_SOUND= OSS X11 PULSEAUDIO -OPTIONS_DEFAULT= OSS +USE_GITLAB= yes +GL_ACCOUNT= esr +GL_PROJECT= morse-classic -OSS_DESC= Beep using OSS (/dev/dsp) -X11_DESC= Beep using X server -PULSEAUDIO_DESC= Beep using Pulse Audio +PLIST_FILES= bin/morsec \ + bin/QSO \ + share/man/man1/morsec.1.gz \ + share/man/man1/QSO.1.gz -OSS_MAKE_ARGS= DEVICE=OSS +OPTIONS_DEFAULT= OSS +OPTIONS_SINGLE= SOUND +OPTIONS_SINGLE_SOUND= OSS PULSEAUDIO X11 -X11_MAKE_ARGS= DEVICE=X11 -X11_USES= xorg -X11_USE= XORG=x11 -X11_CFLAGS= -I${LOCALBASE}/include -X11_LDFLAGS= -L${LOCALBASE}/lib +OSS_DESC= Beep using OSS (/dev/dsp) +PULSEAUDIO_DESC= Beep using PulseAudio +X11_DESC= Beep using X.Org Server -PULSEAUDIO_MAKE_ARGS= DEVICE=PA +OSS_MAKE_ARGS= DEVICE=OSS PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_USES= pkgconfig +PULSEAUDIO_MAKE_ARGS= DEVICE=PA +X11_BROKEN= ./alarm.h:15:15: error: a parameter list without types is only allowed in a function definition +X11_USES= localbase:ldflags xorg +X11_USE= XORG=x11 +X11_MAKE_ARGS= DEVICE=X11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/morse ${STAGEDIR}${PREFIX}/bin/morsec diff --git a/comms/morse/distinfo b/comms/morse/distinfo index 761e989b3fff..0ea88231845d 100644 --- a/comms/morse/distinfo +++ b/comms/morse/distinfo @@ -1,2 +1,3 @@ -SHA256 (morse-2.5.tar.gz) = 476d1e8e95bb173b1aadc755db18f7e7a73eda35426944e1abd57c20307d4987 -SIZE (morse-2.5.tar.gz) = 46470 +TIMESTAMP = 1753622427 +SHA256 (morse-classic-2.6.tar.bz2) = ec44144d52a1eef36fbe0ca400c54556a7ba8f8c3de38d80512d19703b89f615 +SIZE (morse-classic-2.6.tar.bz2) = 45356 diff --git a/comms/morse/files/patch-Makefile b/comms/morse/files/patch-Makefile index 1bcf5dc10a87..a4e93a87edc4 100644 --- a/comms/morse/files/patch-Makefile +++ b/comms/morse/files/patch-Makefile @@ -1,21 +1,19 @@ ---- Makefile.orig 2012-11-26 22:52:36.000000000 -0800 -+++ Makefile 2012-12-04 11:58:37.000000000 -0800 -@@ -26,7 +26,7 @@ +--- Makefile.orig 2024-02-14 19:40:27 UTC ++++ Makefile +@@ -28,10 +28,10 @@ + #DEVICE = X11 #DEVICE = Linux #DEVICE = OSS - #DEVICE = ALSA --DEVICE = PA -+#DEVICE = PA +-DEVICE = ALSA ++#DEVICE = ALSA + #DEVICE = PA - VERSION=2.5 - -@@ -37,16 +37,16 @@ - qso.d/*.[ch] qso.d/Makefile - - default: all -- make testmorse -+ ${MAKE} testmorse +-VERSION=$(shell sed -n