CVS commit: pkgsrc/converters/bib2xml

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 26 08:30:25 UTC 2025

Modified Files:
        pkgsrc/converters/bib2xml: Makefile distinfo
        pkgsrc/converters/bib2xml/patches: patch-aa
Added Files:
        pkgsrc/converters/bib2xml/patches: patch-configure
            patch-progs_dumpnames.c patch-progs_getopt.c

Log Message:
bib2xml: switch to p5-Text-BibTeX, fix build with gcc 14

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/converters/bib2xml/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/converters/bib2xml/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/converters/bib2xml/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/converters/bib2xml/patches/patch-configure \
    pkgsrc/converters/bib2xml/patches/patch-progs_dumpnames.c \
    pkgsrc/converters/bib2xml/patches/patch-progs_getopt.c

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

Modified files:

Index: pkgsrc/converters/bib2xml/Makefile
diff -u pkgsrc/converters/bib2xml/Makefile:1.18 pkgsrc/converters/bib2xml/Makefile:1.19
--- pkgsrc/converters/bib2xml/Makefile:1.18     Tue Jun 28 11:31:08 2022
+++ pkgsrc/converters/bib2xml/Makefile  Wed Nov 26 08:30:25 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/06/28 11:31:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.19 2025/11/26 08:30:25 wiz Exp $
 
 DISTNAME=      bib2xml-10062002
 PKGNAME=       ${DISTNAME:C/-(....)(....)/-\2\1/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    converters textproc
 #MASTER_SITES= http://www-plan.cs.colorado.edu/henkel/stuff/bib2xml/
 
@@ -18,8 +17,10 @@ TOOLS_BROKEN+=       perl
 
 INSTALLATION_DIRS=     bin
 
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/perl5/vendor_perl/lib64 -L${PREFIX}/lib/perl5/vendor_perl/lib64
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/progs/bib2xml ${DESTDIR}${PREFIX}/bin
 
-.include "../../textproc/btparse/buildlink3.mk"
+.include "../../textproc/p5-Text-BibTeX/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/bib2xml/distinfo
diff -u pkgsrc/converters/bib2xml/distinfo:1.6 pkgsrc/converters/bib2xml/distinfo:1.7
--- pkgsrc/converters/bib2xml/distinfo:1.6      Tue Oct 26 10:06:38 2021
+++ pkgsrc/converters/bib2xml/distinfo  Wed Nov 26 08:30:25 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:06:38 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/11/26 08:30:25 wiz Exp $
 
 BLAKE2s (bib2xml-10062002.tar.gz) = f3fd35176776f9ee36ad8e1e41aa557296e58203c0038277b3100594595a8377
 SHA512 (bib2xml-10062002.tar.gz) = 194d23f1cdb7949a122ddc15a923d065383356c882c1400e1f0c7939efbedc811ac06a8f33a8daf7659df7b288a5c54b39d33ff65ec484d1804a2f46d3fe0a74
 Size (bib2xml-10062002.tar.gz) = 302900 bytes
-SHA1 (patch-aa) = e7a4266d7320b6654d3efeccdf9e31b5ec0340e6
+SHA1 (patch-aa) = d70a7fd9fd63026cb5a239ec9fd0d398465d3a33
+SHA1 (patch-configure) = 54c914412fde36a2be742475166153ae4d58065c
+SHA1 (patch-progs_dumpnames.c) = 9e535b04a5ed89fb92028cea5a81c8f5f67e7fc0
+SHA1 (patch-progs_getopt.c) = f52fdb4677e4b356726bf60bf3c38817a584be0e

Index: pkgsrc/converters/bib2xml/patches/patch-aa
diff -u pkgsrc/converters/bib2xml/patches/patch-aa:1.2 pkgsrc/converters/bib2xml/patches/patch-aa:1.3
--- pkgsrc/converters/bib2xml/patches/patch-aa:1.2      Tue Sep 27 12:25:35 2005
+++ pkgsrc/converters/bib2xml/patches/patch-aa  Wed Nov 26 08:30:25 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2005/09/27 12:25:35 tonio Exp $
+$NetBSD: patch-aa,v 1.3 2025/11/26 08:30:25 wiz Exp $
 
---- progs/Makefile.in.orig     2002-09-24 06:26:50.000000000 +0200
+--- progs/Makefile.in.orig     2002-09-24 04:26:50.000000000 +0000
 +++ progs/Makefile.in
 @@ -12,12 +12,12 @@ include ../Makefile.defs   # for CC, CFLAG
  # into the guts of the lexical scanner in order to ferret out the
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.2 2005/09/27 12:25
  LIBDIRS = -L$(LIBDIR) $(OTHERLIBDIRS)
  LIBS    = -lbtparse $(OTHERLIBS)
 -LDFLAGS = $(LIBDIRS) $(LIBS)
-+LDFLAGS = $(LIBDIRS) $(LIBS) -Wl,-R$(LIBDIR)
++LDFLAGS += $(LIBDIRS) $(LIBS) -Wl,-R$(LIBDIR)
  
  BPSRC   = bibparse.c args.c @GETOPT_SRC@
  BPOBJ   = $(BPSRC:.c=.o)

Added files:

Index: pkgsrc/converters/bib2xml/patches/patch-configure
diff -u /dev/null pkgsrc/converters/bib2xml/patches/patch-configure:1.1
--- /dev/null   Wed Nov 26 08:30:25 2025
+++ pkgsrc/converters/bib2xml/patches/patch-configure   Wed Nov 26 08:30:25 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2025/11/26 08:30:25 wiz Exp $
+
+Add return value so gcc 14 is happy.
+
+--- configure.orig     2002-09-24 04:26:50.000000000 +0000
++++ configure
+@@ -785,7 +785,7 @@ cat > conftest.$ac_ext << EOF
+ #line 786 "configure"
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
Index: pkgsrc/converters/bib2xml/patches/patch-progs_dumpnames.c
diff -u /dev/null pkgsrc/converters/bib2xml/patches/patch-progs_dumpnames.c:1.1
--- /dev/null   Wed Nov 26 08:30:25 2025
+++ pkgsrc/converters/bib2xml/patches/patch-progs_dumpnames.c   Wed Nov 26 08:30:25 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-progs_dumpnames.c,v 1.1 2025/11/26 08:30:25 wiz Exp $
+
+Add missing headers.
+
+--- progs/dumpnames.c.orig     2025-11-26 08:26:21.079765277 +0000
++++ progs/dumpnames.c
+@@ -15,6 +15,8 @@
+ -------------------------------------------------------------------------- */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "btparse.h"
+ 
+ char *Usage = "usage: dumpnames file\n";
Index: pkgsrc/converters/bib2xml/patches/patch-progs_getopt.c
diff -u /dev/null pkgsrc/converters/bib2xml/patches/patch-progs_getopt.c:1.1
--- /dev/null   Wed Nov 26 08:30:25 2025
+++ pkgsrc/converters/bib2xml/patches/patch-progs_getopt.c      Wed Nov 26 08:30:25 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-progs_getopt.c,v 1.1 2025/11/26 08:30:25 wiz Exp $
+
+Add missing headers.
+
+--- progs/getopt.c.orig        2025-11-26 08:26:29.963735320 +0000
++++ progs/getopt.c
+@@ -46,6 +46,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C