libxo: Update to 2.0.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libxo: Update to 2.0.0
From: Charlotte Koch (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 5 Sep 2026 05:12:39 +0000
Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Fri Sep 4 22:12:31 2026 -0700
Changeset:	a12efb08b928c07e7be72669a603f3d33d70ff8e

Modified Files:
	libxo/Makefile
	libxo/PLIST
	libxo/distinfo
Added Files:
	libxo/patches/patch-configure.ac

Log Message:
libxo: Update to 2.0.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a12efb08b928c07e7be72669a603f3d33d70ff8e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libxo/Makefile                   |  8 +++-
 libxo/PLIST                      | 23 +++++++---
 libxo/distinfo                   |  7 +--
 libxo/patches/patch-configure.ac | 96 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 10 deletions(-)

diffs:
diff --git a/libxo/Makefile b/libxo/Makefile
index 75ee748cba..ee7bc989d5 100644
--- a/libxo/Makefile
+++ b/libxo/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	libxo-1.6.0
+DISTNAME=	libxo-2.0.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Juniper/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -13,13 +13,17 @@ LICENSE=	2-clause-bsd
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c
-USE_TOOLS+=	gmake perl:run
+USE_TOOLS+=	autoconf automake gmake msgfmt perl:run
 
 REPLACE_PERL+=	xolint/xolint.pl
 
 CONFIGURE_ARGS+=	MAKE=gmake
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fi && automake
+
 post-install:
 	find ${DESTDIR} -type f -name \*.la -delete
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libxo/PLIST b/libxo/PLIST
index 02e1e18e02..5190b476f3 100644
--- a/libxo/PLIST
+++ b/libxo/PLIST
@@ -9,30 +9,41 @@ include/libxo/xo_encoder.h
 lib/libxo.a
 lib/libxo.so
 lib/libxo.so.0
-lib/libxo.so.0.0.0
+lib/libxo.so.0.0
 lib/libxo/encoder/cbor.enc
 lib/libxo/encoder/csv.enc
 lib/libxo/encoder/libenc_cbor.a
 lib/libxo/encoder/libenc_cbor.so
 lib/libxo/encoder/libenc_cbor.so.0
-lib/libxo/encoder/libenc_cbor.so.0.0.0
+lib/libxo/encoder/libenc_cbor.so.0.0
 lib/libxo/encoder/libenc_csv.a
 lib/libxo/encoder/libenc_csv.so
 lib/libxo/encoder/libenc_csv.so.0
-lib/libxo/encoder/libenc_csv.so.0.0.0
+lib/libxo/encoder/libenc_csv.so.0.0
 lib/libxo/encoder/libenc_test.a
 lib/libxo/encoder/libenc_test.so
 lib/libxo/encoder/libenc_test.so.0
-lib/libxo/encoder/libenc_test.so.0.0.0
+lib/libxo/encoder/libenc_test.so.0.0
 lib/libxo/encoder/test.enc
+lib/libxo/libxo_filter.a
+lib/libxo/libxo_filter.so
+lib/libxo/libxo_filter.so.0
+lib/libxo/libxo_filter.so.0.0
+lib/libxo/libxo_format.a
+lib/libxo/libxo_format.so
+lib/libxo/libxo_format.so.0
+lib/libxo/libxo_format.so.0.0
+lib/libxo/xo_filter.lib
 lib/pkgconfig/libxo.pc
 man/man1/xo.1
 man/man1/xohtml.1
 man/man1/xolint.1
 man/man1/xopo.1
 man/man3/libxo.3
+man/man3/xo_add_filter.3
 man/man3/xo_attr.3
 man/man3/xo_create.3
+man/man3/xo_discarding_output.3
 man/man3/xo_emit.3
 man/man3/xo_emit_err.3
 man/man3/xo_err.3
@@ -55,7 +66,9 @@ man/man3/xo_set_version.3
 man/man3/xo_set_writer.3
 man/man3/xo_syslog.3
 man/man5/xo_format.5
-man/man7/libxo-csv.7
+man/man7/libxo.7
+man/man7/xo_csv.7
+man/man7/xo_filter.7
 man/man7/xo_options.7
 share/doc/libxo/Copyright
 share/libxo/external/jquery.js
diff --git a/libxo/distinfo b/libxo/distinfo
index 531aeda85e..6b3bdaa47c 100644
--- a/libxo/distinfo
+++ b/libxo/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-BLAKE2s (libxo-1.6.0.tar.gz) = 576ff04f55141c9526125954c0831d5f76c6c2100ef45251b344a66e2ab5c768
-SHA512 (libxo-1.6.0.tar.gz) = 3978d0201a7fbdb2618a89f81198f4d0c588cd608ac22fd5282463f17ce4f2238f4cb6915f52637f090e054216fdd2191f95df174d0c83ea44730c8f029cd324
-Size (libxo-1.6.0.tar.gz) = 706853 bytes
+BLAKE2s (libxo-2.0.0.tar.gz) = ae6b9ffcde0ded263ed0ee9f8aa809ae075272ebb1e8e683f3e29f8d865a81e4
+SHA512 (libxo-2.0.0.tar.gz) = 6e87121d22bd56225aae555ca301da0b55b3b7157a44261065f4746150b1363cfd5176b7ecb34d00a984c241c33adcc505869f0bb6e577c274a5052435b08fa3
+Size (libxo-2.0.0.tar.gz) = 1106498 bytes
+SHA1 (patch-configure.ac) = 45abb498d35bc55ef226eaff83c3a2101109db2e
diff --git a/libxo/patches/patch-configure.ac b/libxo/patches/patch-configure.ac
new file mode 100644
index 0000000000..9e6cca2693
--- /dev/null
+++ b/libxo/patches/patch-configure.ac
@@ -0,0 +1,96 @@
+$NetBSD$
+
+Fix gettext detection.
+
+    commit 1f32d0fbb11462376d4294bddc59c2fd9e56a57c
+    Author: Rui Chen <rui%chenrui.dev@localhost>
+    Date:   Sun Aug 16 19:06:13 2026 -0400
+    
+        configure: detect gettext in libc and make msgfmt conditional
+        
+        On glibc, gettext lives in libc with no separate libintl, so the
+        -lintl link probes failed and the msgfmt check aborted even when
+        gettext is usable. Detect whether -lintl is needed, add <stddef.h>
+        so NULL is defined, gate the msgfmt lookup on gettext being present,
+        and also search PATH for msgfmt. Overlaps Juniper/libxo#114 and
+        #115.
+        
+        Signed-off-by: Rui Chen <rui%chenrui.dev@localhost>
+
+--- configure.ac.old
++++ configure.ac
+@@ -209,11 +209,20 @@ HAVE_GETTEXT=no
+ 
+ if test "$GETTEXT_ENABLE" != "no"; then
+ 
++  dnl glibc provides gettext in libc; only link -lintl when a separate
++  dnl libintl is required (e.g. macOS, *BSD), so detection also works on glibc.
++  GETTEXT_INTL=-lintl
++  AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <libintl.h>]
++             [#include <stddef.h>]
++             [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])],
++                 [GETTEXT_INTL=])
++
+   AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}])
+ 
+   _save_cflags="$CFLAGS"
+-  CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl"
++  CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror ${GETTEXT_INTL}"
+   AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <libintl.h>]
++             [#include <stddef.h>]
+              [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])],
+              [HAVE_GETTEXT=yes],
+              [HAVE_GETTEXT=no])
+@@ -226,8 +235,9 @@ if test "$GETTEXT_ENABLE" != "no"; then
+       AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}])
+ 
+       _save_cflags="$CFLAGS"
+-      CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl"
++      CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror ${GETTEXT_INTL}"
+       AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <libintl.h>]
++             [#include <stddef.h>]
+                  [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])],
+                  [HAVE_GETTEXT=yes],
+                  [HAVE_GETTEXT=no])
+@@ -241,8 +251,9 @@ if test "$GETTEXT_ENABLE" != "no"; then
+       AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}])
+ 
+       _save_cflags="$CFLAGS"
+-      CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl"
++      CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror ${GETTEXT_INTL}"
+       AC_LINK_IFELSE([AC_LANG_SOURCE([[#include <libintl.h>]
++             [#include <stddef.h>]
+                  [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])],
+                  [HAVE_GETTEXT=yes],
+                  [HAVE_GETTEXT=no])
+@@ -255,7 +266,7 @@ fi
+ if test "$HAVE_GETTEXT" = "yes"; then
+     AC_DEFINE([HAVE_GETTEXT], [1], [gettext(3)])
+     GETTEXT_CFLAGS="-I${GETTEXT_PREFIX}/include"
+-    GETTEXT_LIBS="-L${GETTEXT_PREFIX}/lib -lintl"
++    GETTEXT_LIBS="-L${GETTEXT_PREFIX}/lib ${GETTEXT_INTL}"
+ else
+     GETTEXT_PREFIX=none
+     GETTEXT_CFLAGS=
+@@ -266,14 +277,17 @@ AC_SUBST(GETTEXT_LIBS)
+ 
+ GETTEXT_LIBDIR=${GETTEXT_PREFIX}/lib
+ AC_SUBST(GETTEXT_LIBDIR)
+-if test -x ${GETTEXT_PREFIX}/bin/msgfmt ; then
++if test "$HAVE_GETTEXT" != "yes"; then
++    GETTEXT_BINDIR=
++elif test -x ${GETTEXT_PREFIX}/bin/msgfmt ; then
+     GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
+ elif test -x ${GETTEXT_PREFIX}/local/bin/msgfmt ; then
+     GETTEXT_BINDIR=${GETTEXT_PREFIX}/local/bin
+ else
+-    AC_MSG_FAILURE("could not find msgfmt tool")
+-    # Use a (bad) fall back value
+-    GETTEXT_BINDIR=${GETTEXT_PREFIX}/bin
++    dnl gettext may live in libc (glibc); msgfmt can be elsewhere on PATH
++    AC_PATH_PROG([MSGFMT], [msgfmt])
++    AS_IF([test -n "$MSGFMT"], [GETTEXT_BINDIR=`AS_DIRNAME([$MSGFMT])`],
++          [AC_MSG_FAILURE([could not find msgfmt tool])])
+ fi
+ AC_SUBST(GETTEXT_BINDIR)
+
Prev by Date: phaethon: Compatibility with newer versions of Boost
Next by Date: tex-luaxml: added, required by print/tex-make4ht
Previous by Thread: phaethon: Compatibility with newer versions of Boost
Next by Thread: tex-luaxml: added, required by print/tex-make4ht
Indexes:
Home | Main Index | Thread Index | Old Index