From nobody Sat Jan 18 17:23:50 2025 X-Original-To: dev-commits-ports-all@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 4Yb3Nk5tNsz5kcXX; Sat, 18 Jan 2025 17:23:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yb3Nk2DyTz3qFV; Sat, 18 Jan 2025 17:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221030; 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=DJt5RETXrcF6o9a0thX8802/HSSLrtdQ4BCQu6NCZFc=; b=s5HccIniLYpiKJXLdrOK0SZCILwBlC1ZmaKzPYaNsvOMjCMrSv99SOeNLCOrvo7pdHZPsD CVcLHGqee7wDv65R83xezDZC1dNrsoImeEWQybegOo+hD4zSQCOXofgIscw49M2PcSGhr7 W1/nWxrVytHZxz8ZxQKY7kNN1x4bdE/+iDgQfxJHeC7ATZLLyFS5PxDopZsGuHz5BLkA9P yz5Cv75AwnSNO0KcvER0x2bLW//rSBHqhs4UwS2dN1KeiJf4D1bxa7X2UWzXvUvA5wOuA1 ITEllyN1ExcNjaV6fGCwhOBjo/aQ1XSb3YDaM3I5264+Q7XylSswKldPXtbNuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221030; 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=DJt5RETXrcF6o9a0thX8802/HSSLrtdQ4BCQu6NCZFc=; b=Vwg5QcaIXUnPcG5UJvyZGXvdVp2d3AVmDipOzKw6BGTnLAz6kUAXfEx45ZXWyhFiaoBxYx Uoj/MUAEL7dlqq10FceHC8yBdQvS/yOGMXrqG06y8wnimvtu4z3i6sOm3JK908YUv7FsQd X22RDhFUzUet94bnnCCUEQUQvApRw9wsq/6YbejBrsKdtYoWKpluyJGryx8DPrYV4ub7WR Uu86vSKTGIGLiAo/BW8L7HOer081n5RHNmpAhxOoTDSUXKLzSzNqL+gTOvPMNwGzjVV5jG 0XQwIYTkf2enU1UY7vexPRqE3DUph4eYmGhzIXwwVF/opgkCvYqDV+wdbJtbbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737221030; a=rsa-sha256; cv=none; b=bisCt6OiLGIPicPaxRCn1j5tmtIjcTa1u2K/SsWnEbS2kcOfbM8VG0TjzhzDRD429n/Q+Q Nf6HeA4LD9ty7/3PEIXklsncpGTTS+VolsUpBMbY/1iyVyZ58KCfUMU+Umhqh9Hi8YcLS8 74jpfj9e5an4XNmx2Ri8ygX5fLxtnnl7xFEynaCTzQf8YJnZt6SAbJWce5ycryM+K5H4BF 3yfG+7ULzoDSUEjnxeHegae7GR6o2IJg0/7clLBSwQ4ZP2JhYmmtDZmHAv5pUAAyf/AbA9 npAzyAItk+mH0d9c3pBz4KGT6gOiKZ+PyAjKaxvzwatBkUGw+Wc6/4mfnronyQ== 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 4Yb3Nk1nw0z1Ccm; Sat, 18 Jan 2025 17:23:50 +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 50IHNoc9041326; Sat, 18 Jan 2025 17:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IHNo6l041323; Sat, 18 Jan 2025 17:23:50 GMT (envelope-from git) Date: Sat, 18 Jan 2025 17:23:50 GMT Message-Id: <202501181723.50IHNo6l041323@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 48417960e938 - main - net/yaz: Fix build with ICU 76.1 and improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48417960e9385be0bf3e5dcafc3b10f4da2e60f7 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=48417960e9385be0bf3e5dcafc3b10f4da2e60f7 commit 48417960e9385be0bf3e5dcafc3b10f4da2e60f7 Author: Daniel Engberg AuthorDate: 2025-01-18 16:36:17 +0000 Commit: Daniel Engberg CommitDate: 2025-01-18 17:23:17 +0000 net/yaz: Fix build with ICU 76.1 and improve port * Backport upstream commit 24bcca60b69b0ce162f63377e621de5cf53dcf76.patch * Fix detection of newer versions of tcl * Clean up port Makefile to follow Porters Handbook more closely Reference: https://github.com/indexdata/m4/pull/4 PR: 283564 Approved by: portmgr (maintainer timeout, 3+ weeks) --- net/yaz/Makefile | 22 +++++++++++++--------- net/yaz/files/patch-configure.ac | 11 +++++++++++ net/yaz/files/patch-m4_ac__check__icu.m4 | 11 +++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 050168385c25..d1dd5a7b4744 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -14,33 +14,37 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libicuuc.so:devel/icu \ libgnutls.so:security/gnutls -USES= gnome iconv libtool ncurses pathfix localbase:ldflags \ - pkgconfig readline shebangfix tcl +USES= autoreconf gnome iconv libtool ncurses pathfix \ + localbase:ldflags pkgconfig readline shebangfix tcl SHEBANG_FILES= src/yaz-asncomp -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes + MAKE_JOBS_UNSAFE= yes -CONFIGURE_ARGS= --enable-shared --with-iconv=${ICONV_PREFIX} \ - --with-xml2 --with-xslt --with-icu --enable-tcpd +GNU_CONFIGURE= yes + LIBS+= -lexecinfo PORTDOCS= * +CONFIGURE_ARGS= --enable-shared \ + --enable-tcpd \ + --with-iconv=${ICONV_PREFIX} \ + --with-icu \ + --with-xml2 \ + --with-xslt + OPTIONS_DEFINE= DOCS MEMCACHED REDIS MEMCACHED_DESC= Memcached distributed cache system support + MEMCACHED_CONFIGURE_WITH= memcached MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached REDIS_CONFIGURE_WITH= redis REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis -post-patch: - @${REINPLACE_CMD} 's|tclsh |tclsh${TCL_VER} |' ${WRKSRC}/configure - post-configure: @${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/share/man,' \ ${WRKSRC}/doc/Makefile diff --git a/net/yaz/files/patch-configure.ac b/net/yaz/files/patch-configure.ac new file mode 100644 index 000000000000..78a2182f1375 --- /dev/null +++ b/net/yaz/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2025-01-04 19:57:47 UTC ++++ configure.ac +@@ -18,7 +18,7 @@ test -z "$YACC" && AC_MSG_WARN([GNU Bison not found]) + AC_CHECK_PROGS([YACC], 'bison -y') + test -z "$YACC" -a ! -f src/cql.c && AC_MSG_ERROR([GNU Bison not found]) + test -z "$YACC" && AC_MSG_WARN([GNU Bison not found]) +-AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh]) ++AC_CHECK_PROGS([TCLSH], [tclsh tclsh9.0 tclsh8.7 tclsh8.6 tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh]) + AC_PROG_INSTALL + AM_PROG_LIBTOOL + AM_PROG_CC_C_O diff --git a/net/yaz/files/patch-m4_ac__check__icu.m4 b/net/yaz/files/patch-m4_ac__check__icu.m4 new file mode 100644 index 000000000000..4c1776ba3dfd --- /dev/null +++ b/net/yaz/files/patch-m4_ac__check__icu.m4 @@ -0,0 +1,11 @@ +--- m4/ac_check_icu.m4.orig 2021-12-02 14:20:48 UTC ++++ m4/ac_check_icu.m4 +@@ -26,7 +26,7 @@ AC_DEFUN([AC_CHECK_ICU], + ICU_VERSION=`$pkgconfigpath --modversion icu-i18n` + ICU_CPPFLAGS="" + ICU_CFLAGS=`$pkgconfigpath --cflags icu-i18n` +- ICU_LIBS=`$pkgconfigpath --libs icu-i18n` ++ ICU_LIBS=`$pkgconfigpath --libs icu-i18n icu-uc` + else + AC_MSG_RESULT([not found]) + fi