CVS commit: pkgsrc/graphics/jbigkit

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Thu Sep 17 22:28:48 UTC 2026

Modified Files:
        pkgsrc/graphics/jbigkit: distinfo
        pkgsrc/graphics/jbigkit/patches: patch-aa patch-ab

Log Message:
graphics/jbigkit: fix build

Provide a libtool tag so that libtool doesn't have to infer a source language


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/jbigkit/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/jbigkit/patches/patch-aa
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/jbigkit/patches/patch-ab

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

Modified files:

Index: pkgsrc/graphics/jbigkit/distinfo
diff -u pkgsrc/graphics/jbigkit/distinfo:1.11 pkgsrc/graphics/jbigkit/distinfo:1.12
--- pkgsrc/graphics/jbigkit/distinfo:1.11       Thu Nov  9 17:55:32 2023
+++ pkgsrc/graphics/jbigkit/distinfo    Thu Sep 17 22:28:48 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2023/11/09 17:55:32 nia Exp $
+$NetBSD: distinfo,v 1.12 2026/09/17 22:28:48 agc Exp $
 
 BLAKE2s (jbigkit-2.1.tar.gz) = 89a8bd02633f134248d80250f92dda1099cf8d0f0dc1487ead4848cfd2c9d379
 SHA512 (jbigkit-2.1.tar.gz) = c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
 Size (jbigkit-2.1.tar.gz) = 438710 bytes
 SHA1 (patch-Makefile) = 3b5e5814be3f361b1ce5ffdd483e4078b94c4bf6
-SHA1 (patch-aa) = 7786ab0be7e718549da37378588a8ba55ef8f187
-SHA1 (patch-ab) = 3f9c2016a696ba61943518fb7ab94b95c047d633
+SHA1 (patch-aa) = e94d3871be849c7505a87bbb16e94db0a3020198
+SHA1 (patch-ab) = 67cb3399c1ac148e53fe990936712be5ae9b7a54
 SHA1 (patch-libjbig_jbig.c) = 398c5e8b34f651be1d374dd7641526303231ea3a
 SHA1 (patch-libjbig_jbig.h) = c073578e4da787f51adf9214b31b6ac45734951f

Index: pkgsrc/graphics/jbigkit/patches/patch-aa
diff -u pkgsrc/graphics/jbigkit/patches/patch-aa:1.5 pkgsrc/graphics/jbigkit/patches/patch-aa:1.6
--- pkgsrc/graphics/jbigkit/patches/patch-aa:1.5        Thu Jul  6 13:13:30 2017
+++ pkgsrc/graphics/jbigkit/patches/patch-aa    Thu Sep 17 22:28:48 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2017/07/06 13:13:30 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2026/09/17 22:28:48 agc Exp $
 
 * prevent to overwrite our CC/CFLAGS settings
 * libtoolize
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.5 2017/07/06 13:13
 -all: libjbig.a libjbig85.a tstcodec tstcodec85
 +.SUFFIXES: .lo
 +.c.lo:
-+      ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
++      ${LIBTOOL} --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<
  
 -tstcodec: tstcodec.o jbig.o jbig_ar.o
 -      $(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
@@ -45,16 +45,16 @@ $NetBSD: patch-aa,v 1.5 2017/07/06 13:13
 -tstcodec.o: tstcodec.c jbig.h
 -tstcodec85.o: tstcodec85.c jbig85.h
 +tstcodec: tstcodec.lo jbig.lo jbig_ar.lo
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec tstcodec.lo jbig.lo jbig_ar.lo
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec tstcodec.lo jbig.lo jbig_ar.lo
 +
 +tstcodec85: tstcodec85.lo jbig85.lo jbig_ar.lo
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec85 tstcodec85.lo jbig85.lo jbig_ar.lo
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec85 tstcodec85.lo jbig85.lo jbig_ar.lo
 +
 +libjbig.la: jbig.lo jbig_ar.lo
-+      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjbig.la jbig.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o libjbig.la jbig.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
 +
 +libjbig85.la: jbig85.lo jbig_ar.lo
-+      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjbig85.la jbig85.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o libjbig85.la jbig85.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
 +
 +jbig.lo: jbig.c jbig.h jbig_ar.h
 +jbig85.lo: jbig85.c jbig85.h jbig_ar.h

Index: pkgsrc/graphics/jbigkit/patches/patch-ab
diff -u pkgsrc/graphics/jbigkit/patches/patch-ab:1.7 pkgsrc/graphics/jbigkit/patches/patch-ab:1.8
--- pkgsrc/graphics/jbigkit/patches/patch-ab:1.7        Thu Nov  9 17:55:32 2023
+++ pkgsrc/graphics/jbigkit/patches/patch-ab    Thu Sep 17 22:28:48 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2023/11/09 17:55:32 nia Exp $
+$NetBSD: patch-ab,v 1.8 2026/09/17 22:28:48 agc Exp $
 
 * prevent to overwrite our CC/CFLAGS settings
 * libtoolize
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.7 2023/11/09 17:55
  .PHONY: txt test test82 test85 clean
  
 +.c.lo:
-+      ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I../libjbig -o $@ -c $<
++      ${LIBTOOL} --mode=compile --tag=CC $(CC) $(CFLAGS) -I../libjbig -o $@ -c $<
 +
  all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt
  
@@ -32,22 +32,22 @@ $NetBSD: patch-ab,v 1.7 2023/11/09 17:55
 -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 -      $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 +pbmtojbg: pbmtojbg.lo ../libjbig/libjbig.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib
++      ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib
  
 -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
 -      $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
 +jbgtopbm: jbgtopbm.lo ../libjbig/libjbig.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib
++      ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib
  
 -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
 -      $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
 +pbmtojbg85: pbmtojbg85.lo ../libjbig/libjbig85.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib
++      ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib
  
 -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
 -      $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
 +jbgtopbm85: jbgtopbm85.lo ../libjbig/libjbig85.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib
++      ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib
  
 -jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
 -pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h