git: 7d518e8ab030 - main - comms/ebook2cw: chase addition of libmpg123

From: Diane Bruce <db_at_FreeBSD.org>
Date: Sun, 12 Jul 2026 19:22:37 UTC
The branch main has been updated by db:

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

commit 7d518e8ab030514bca7dedc23d5443e68e06fed3
Author:     Diane Bruce <db@FreeBSD.org>
AuthorDate: 2026-07-12 19:18:43 +0000
Commit:     Diane Bruce <db@FreeBSD.org>
CommitDate: 2026-07-12 19:18:43 +0000

    comms/ebook2cw: chase addition of libmpg123
    
    From LAME 3.101  July 09 2026
    Use external libmpg123 instead of internal mpglib for mpeg decoding
    (unix-like systems which use the autotools ("configure; make; make install")
    build system). There are years of improvements in libmpg123 which we do not
    have in mpglib. Patch by Thomas Orgis of the mpg123 project.
    
    - upstream ebook2cw does not have this change yet
    - there is no static library for libmpg123 so remove that from Makefile for now
    - fix bogus /usr/local that crept in
    - Finally bumped PORTREVISION
---
 comms/ebook2cw/Makefile             |  2 ++
 comms/ebook2cw/files/patch-Makefile | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile
index 210da6dcd83e..72c4228933c9 100644
--- a/comms/ebook2cw/Makefile
+++ b/comms/ebook2cw/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ebook2cw
 DISTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	https://fkurz.net/ham/ebook2cw/
 
@@ -11,6 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libmpg123.so:audio/mpg123 \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis
 
diff --git a/comms/ebook2cw/files/patch-Makefile b/comms/ebook2cw/files/patch-Makefile
index e69a00d09e6f..cc7a99a5f22f 100644
--- a/comms/ebook2cw/files/patch-Makefile
+++ b/comms/ebook2cw/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	2023-08-16 18:54:49 UTC
 +++ Makefile
-@@ -1,30 +1,16 @@ VERSION=0.8.5
+@@ -1,37 +1,23 @@ VERSION=0.8.5
  # ebook2cw Makefile -- Fabian Kurz, DJ5CW -- http://fkurz.net/ham/ebook2cw.html
  
  VERSION=0.8.5
@@ -14,7 +14,7 @@
 -
  CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\"
 +CFLAGS+= -I%%LOCALBASE%%/include -D LAME -D OGGV
-+LDFLAGS+= -L%%LOCALBASE%%/lib -lintl -lmp3lame -lvorbis -lvorbisenc -logg
++LDFLAGS+= -L%%LOCALBASE%%/lib -lintl -lmp3lame -lvorbis -lvorbisenc -logg -lmpg123
  
 -ifeq ($(USE_LAME), YES)
 -		CFLAGS:=$(CFLAGS) -D LAME
@@ -30,9 +30,17 @@
 -ifeq ($(UNAME), Darwin)
 -	LDFLAGS += -lintl
 -endif
--
--all: ebook2cw
 +all: ebook2cw cgi
  
+-all: ebook2cw
+-
  ebook2cw: ebook2cw.c codetables.h
  	$(CC) ebook2cw.c -pedantic -Wall -Wno-format-truncation -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw
+ 	msgfmt -o po/de.mo po/de.po
+ 
+ cgi: ebook2cw.c codetables.h
+-	$(CC) -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi
++	$(CC) ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi
+ 
+ cgibuffered: ebook2cw.c codetables.h
+ 	$(CC) -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi