From nobody Wed Sep 10 09:11:43 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 4cMFLR2nZ6z67KNk; Wed, 10 Sep 2025 09:11:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMFLR2547z3SfT; Wed, 10 Sep 2025 09:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757495503; 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=hytxXumLSZ1ZjKtuc4l8Hyoq5pDtlRkN2sCg8y5Tkqs=; b=yQiEWaQtNg41GJiE9py+ynaTKppuLs5tCQGOGsECrWySaLQQBnRP7XTGKPWMkbCMY7lOiK 1iD8AGi6i+3D+Rgl8f+GWgh7yiH4u3AtkAF+VGo5xGqlc8ZLFXqbFBvMfaCcc2MUOltH2K RHQmmoIvpgZ567jHaS0maWYF+nnFP2tQr2PhXE9j8daXzNv7qNAl6ItxeoVMu1CWQUcJfC bwfJ845Yi4EQeWm5UJl6cIpxIpIVyl1nnvxmp3psPf44vYvdbLpRQ1yo1WQW9nxzZgl2qv 50BXlw1k7RucGBnqzsd8id5MZWC9jxLv9FZmLIQTqiq9by13YPhbzmGCfor86w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757495503; 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=hytxXumLSZ1ZjKtuc4l8Hyoq5pDtlRkN2sCg8y5Tkqs=; b=vMhxpv15e+TCYnqgpJATEhaLyrUBlDPZgI+F2VeaSiLeoTa+FfUNxlfeCsV0HOSeLM1zhx w47HU0v3mCGBAHUAtINwSPglWMvNjMVX6suL9/rVssKPKgnYxRfaIr1Ocwq3gE7gEai/j7 f9lo6QfUlV9A9/kmbbk1X0dktBFdtR2L19hLSKL3jqHh+sNR1Y44kldBLrN0/sFOQY3kWg k4qvn5YH2/M2ynxkWWq851ZWbWQW3JCG6ow58VfshsLNuwH0ZsLjoPdJzwamQ7UV8qHlKR 5ny5H+fMF6EzodsEy/k/qf3k01RybVFC2ZLvVjZBCyJvj8EyTB2mK8BEB2tINg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757495503; a=rsa-sha256; cv=none; b=f7XILSgCzYpiiDD8E60pTaM9Zq1UBhehDDvbTDg+Oedwlr8YjJo+UMhxK1U3ddRurS8HMX 0Z0nZqg4X+vKgoiHNt6rnsXgxpC+gB9Nb0yIUgnmQFszixYXuCFwuvOKxpPRR2bfvYHe/w UOi/nvUQEbTrqDV/YGgXEpBodv4SdwM3iTkEJxXqIyjXoPe1QrUCSCU6H1ZyNgCmLGlL5J yUEJvd76wTZ9ASi1ACqkJ5zrL/5vjCwdHfOQCwg/d33Ri9OA4/5bBf56GkuYPunp6aUppN wgMCAowIKFGgrk/woDF/0HTCbypEnlSE5Dg314XwlfPrtkljoYndnZAWF3Buvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cMFLR1gybzGQ; Wed, 10 Sep 2025 09:11:43 +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 58A9BhvY091858; Wed, 10 Sep 2025 09:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58A9Bhxs091855; Wed, 10 Sep 2025 09:11:43 GMT (envelope-from git) Date: Wed, 10 Sep 2025 09:11:43 GMT Message-Id: <202509100911.58A9Bhxs091855@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: cdc7414c6b2f - main - comms/ebook2cw: Update 0.8.2 => 0.8.5 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: cdc7414c6b2f77b893be6149241f7ca7f16e8df2 Auto-Submitted: auto-generated The branch main has been updated by alven: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdc7414c6b2f77b893be6149241f7ca7f16e8df2 commit cdc7414c6b2f77b893be6149241f7ca7f16e8df2 Author: Älven AuthorDate: 2025-08-05 09:06:50 +0000 Commit: Älven CommitDate: 2025-09-10 09:11:11 +0000 comms/ebook2cw: Update 0.8.2 => 0.8.5 * Use https:// for MASTER_SITES, remove LOCAL/db + Add LICENSE_FILE * Use gettext (also add -lintl to Makefile) * Mark as PIE_UNSAFE * Improve post-install stance * Fix DOCS and EXAMPLES options to really work * Use %%PREFIX%% and %%LOCALBASE%% templates for Makefile * Fix pkg-descr PR: 288673 Approved by: yuri@ (Mentor) --- comms/ebook2cw/Makefile | 24 ++++++++++++++-------- comms/ebook2cw/distinfo | 5 +++-- comms/ebook2cw/files/patch-Makefile | 41 ++++++++++++++----------------------- comms/ebook2cw/pkg-descr | 2 +- comms/ebook2cw/pkg-plist | 4 ++-- 5 files changed, 36 insertions(+), 40 deletions(-) diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile index d0c5806895b9..210da6dcd83e 100644 --- a/comms/ebook2cw/Makefile +++ b/comms/ebook2cw/Makefile @@ -1,20 +1,23 @@ PORTNAME= ebook2cw -PORTVERSION= 0.8.2 -PORTREVISION= 3 +DISTVERSION= 0.8.5 CATEGORIES= comms hamradio -MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \ - LOCAL/db +MASTER_SITES= https://fkurz.net/ham/ebook2cw/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Convert text files into cw as an mp3 or ogg file WWW= https://fkurz.net/ham/ebook2cw.html LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis +USES= gettext + +PIE_UNSAFE= yes + OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @@ -23,14 +26,17 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|'g \ ${WRKSRC}/Makefile do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/ebook2cw ${STAGEDIR}${PREFIX}/bin/ebook2cw - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ebook2cw - ${INSTALL_DATA} ${WRKSRC}/ebook2cw.1 ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/ebook2cw ${STAGEDIR}${PREFIX}/bin/ebook2cw + ${INSTALL_MAN} ${WRKSRC}/ebook2cw.1 ${STAGEDIR}${PREFIX}/share/man/man1 + +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ebook2cw.conf isomap.txt utf8map.txt ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${EXAMPLESDIR}/$f .endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include diff --git a/comms/ebook2cw/distinfo b/comms/ebook2cw/distinfo index 57be1bb1010a..e7c2b516eb1c 100644 --- a/comms/ebook2cw/distinfo +++ b/comms/ebook2cw/distinfo @@ -1,2 +1,3 @@ -SHA256 (ebook2cw-0.8.2.tar.gz) = d8277ac6aaf9e64d9cb9a96457488b3a0dbd77e87622ded8f0825acb500c5758 -SIZE (ebook2cw-0.8.2.tar.gz) = 29170 +TIMESTAMP = 1754384661 +SHA256 (ebook2cw-0.8.5.tar.gz) = 571f734f12123b4affbad90b55dd4c9630b254afe343fa621fc5114b9bd25fc3 +SIZE (ebook2cw-0.8.5.tar.gz) = 34619 diff --git a/comms/ebook2cw/files/patch-Makefile b/comms/ebook2cw/files/patch-Makefile index 012d268cf5a6..e69a00d09e6f 100644 --- a/comms/ebook2cw/files/patch-Makefile +++ b/comms/ebook2cw/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2013-01-04 14:33:04 UTC +--- Makefile.orig 2023-08-16 18:54:49 UTC +++ Makefile -@@ -3,37 +3,26 @@ - # $Id: Makefile 547 2012-12-29 21:07:53Z dj1yfk $ +@@ -1,30 +1,16 @@ VERSION=0.8.5 + # ebook2cw Makefile -- Fabian Kurz, DJ5CW -- http://fkurz.net/ham/ebook2cw.html - VERSION=0.8.2 + VERSION=0.8.5 -DESTDIR ?= /usr -+DESTDIR ?= /usr/local ++DESTDIR ?= %%PREFIX%% +CC ?= gcc -# Set to NO to compile without Lame/Ogg-vorbis support @@ -13,8 +13,8 @@ -USE_OGG?=YES - CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -+CFLAGS+= -I/usr/local/include -D LAME -D OGGV -+LDFLAGS+= -L/usr/local/lib -lmp3lame -lvorbis -lvorbisenc -logg ++CFLAGS+= -I%%LOCALBASE%%/include -D LAME -D OGGV ++LDFLAGS+= -L%%LOCALBASE%%/lib -lintl -lmp3lame -lvorbis -lvorbisenc -logg -ifeq ($(USE_LAME), YES) - CFLAGS:=$(CFLAGS) -D LAME @@ -24,26 +24,15 @@ - CFLAGS:=$(CFLAGS) -D OGGV - LDFLAGS:=$(LDFLAGS) -lvorbis -lvorbisenc -logg -endif -+all: ebook2cw cgi +- + UNAME := $(shell uname) +-ifeq ($(UNAME), Darwin) +- LDFLAGS += -lintl +-endif - -all: ebook2cw -- - ebook2cw: ebook2cw.c codetables.h -- gcc ebook2cw.c -pedantic -Wall -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw -+ ${CC} ebook2cw.c -pedantic -Wall -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw - - cgi: ebook2cw.c codetables.h -- gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi -+ ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi - - cgibuffered: ebook2cw.c codetables.h -- gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi -+ ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi - - static: -- gcc -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -o ebook2cw -+ ${CC} -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -o ebook2cw ++all: ebook2cw cgi - install: - install -d -v $(DESTDIR)/share/man/man1/ + ebook2cw: ebook2cw.c codetables.h + $(CC) ebook2cw.c -pedantic -Wall -Wno-format-truncation -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw diff --git a/comms/ebook2cw/pkg-descr b/comms/ebook2cw/pkg-descr index f42e9338f88f..72770e6f0568 100644 --- a/comms/ebook2cw/pkg-descr +++ b/comms/ebook2cw/pkg-descr @@ -1,5 +1,5 @@ ebook2cw is a command line program (optional GUI available) which converts a plain text (ISO 8859-1 or UTF-8) ebook to morse code MP3 files. -It works on several platforms, including Windows and Linux. +It works on several platforms, including GNU/Linux and Windows. Written by Fabian Kurz, DJ1YFK diff --git a/comms/ebook2cw/pkg-plist b/comms/ebook2cw/pkg-plist index a55ada800cc4..339aa7c1f792 100644 --- a/comms/ebook2cw/pkg-plist +++ b/comms/ebook2cw/pkg-plist @@ -1,6 +1,6 @@ bin/ebook2cw -share/man/man1/ebook2cw.1.gz +%%PORTDOCS%%%%DOCSDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ebook2cw.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/isomap.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8map.txt -%%PORTDOCS%%%%DOCSDIR%%/README +share/man/man1/ebook2cw.1.gz