git: da6b20923c28 - main - japanese/multiskkserv: Fix build with cdb-20251021
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 31 Mar 2026 10:32:24 UTC
The branch main has been updated by mce:
URL: https://cgit.FreeBSD.org/ports/commit/?id=da6b20923c286b16b202df3dda545656bf25e195
commit da6b20923c286b16b202df3dda545656bf25e195
Author: Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-03-27 09:18:40 +0000
Commit: Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-03-31 10:31:53 +0000
japanese/multiskkserv: Fix build with cdb-20251021
Add EXTRA_PATCHES.
PR: 290686
Approved by: fluffy (mentor)
---
japanese/multiskkserv/Makefile | 2 ++
japanese/multiskkserv/files/extra-patch-configure.ac | 11 +++++++++++
2 files changed, 13 insertions(+)
diff --git a/japanese/multiskkserv/Makefile b/japanese/multiskkserv/Makefile
index e609ede970a5..30a08d50dca4 100644
--- a/japanese/multiskkserv/Makefile
+++ b/japanese/multiskkserv/Makefile
@@ -1,5 +1,6 @@
PORTNAME= multiskkserv
DISTVERSION= 20240224
+PORTREVISION= 1
CATEGORIES= japanese
MAINTAINER= mew14930xvi@inbox.lv
@@ -33,6 +34,7 @@ OPTIONS_DEFAULT= CDB
CDB_DESC= Use databases/cdb instead of bundled tinycdb
CDB_EXTRACT_DEPENDS= ${NONEXISTENT}:databases/cdb:build
CDB_CONFIGURE_ON= --with-cdb=`${MAKE} -C ${PORTSDIR}/databases/cdb -V WRKSRC`
+CDB_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-configure.ac
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tools/skkdic-p2cdb ${STAGEDIR}${PREFIX}/bin
diff --git a/japanese/multiskkserv/files/extra-patch-configure.ac b/japanese/multiskkserv/files/extra-patch-configure.ac
new file mode 100644
index 000000000000..3a3c751af68c
--- /dev/null
+++ b/japanese/multiskkserv/files/extra-patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2025-10-28 08:55:54 UTC
++++ configure.ac
+@@ -118,7 +118,7 @@ else
+ CDB_DIR="$with_cdb"
+ CDB_INCLUDES="-I$with_cdb"
+ available_cdb="yes"
+- for j in cdb.a buffer.a unix.a byte.a alloc.a; do
++ for j in cdb.a buffer.a unix.a byte.a; do
+ if test -f "$with_cdb/$j"; then
+ LIBADD_CDB="$LIBADD_CDB $with_cdb/$j"
+ else