git: cdc7414c6b2f - main - comms/ebook2cw: Update 0.8.2 => 0.8.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Sep 2025 09:11:43 UTC
The branch main has been updated by alven:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cdc7414c6b2f77b893be6149241f7ca7f16e8df2
commit cdc7414c6b2f77b893be6149241f7ca7f16e8df2
Author: Älven <alven@FreeBSD.org>
AuthorDate: 2025-08-05 09:06:50 +0000
Commit: Älven <alven@FreeBSD.org>
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 <bsd.port.mk>
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 <mail@fkurz.net>
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