CVS commit: pkgsrc/graphics/fbm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 09:48:56 UTC 2026

Modified Files:
        pkgsrc/graphics/fbm: Makefile distinfo
        pkgsrc/graphics/fbm/patches: patch-aa

Log Message:
fbm: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/fbm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/fbm/distinfo
cvs rdiff -u -r1.1.1.2 -r1.2 pkgsrc/graphics/fbm/patches/patch-aa

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

Modified files:

Index: pkgsrc/graphics/fbm/Makefile
diff -u pkgsrc/graphics/fbm/Makefile:1.13 pkgsrc/graphics/fbm/Makefile:1.14
--- pkgsrc/graphics/fbm/Makefile:1.13   Sat Nov  2 22:37:56 2019
+++ pkgsrc/graphics/fbm/Makefile        Sun Jan  4 09:48:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/11/02 22:37:56 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2026/01/04 09:48:56 wiz Exp $
 
 DISTNAME=      fbm-1.2
 CATEGORIES=    graphics converters
@@ -13,4 +13,7 @@ INSTALL_MAKE_FLAGS+=  BIN=${DESTDIR}${PRE
                        MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}/manl/
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/manl
 
+CFLAGS+=       -Wno-implicit-function-declaration
+CFLAGS+=       -Wno-implicit-int
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/fbm/distinfo
diff -u pkgsrc/graphics/fbm/distinfo:1.7 pkgsrc/graphics/fbm/distinfo:1.8
--- pkgsrc/graphics/fbm/distinfo:1.7    Tue Oct 26 10:46:07 2021
+++ pkgsrc/graphics/fbm/distinfo        Sun Jan  4 09:48:56 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:46:07 nia Exp $
+$NetBSD: distinfo,v 1.8 2026/01/04 09:48:56 wiz Exp $
 
 BLAKE2s (fbm-1.2.tgz) = f6ff86574f2af98989452db9553eb292667fb58292304681c92a353e0046ad4a
 SHA512 (fbm-1.2.tgz) = b06fc4283364753afdcbe639a6a76213357dfcce456649566ca0e7c53d48df007836c5a2c7ee07c902fdb0dbfdc8a335d25781321e3668ec6cae2cbd3c2a12df
 Size (fbm-1.2.tgz) = 214909 bytes
-SHA1 (patch-aa) = c6d838a7f9f818921c15074edf075325a02a320f
+SHA1 (patch-aa) = 45f01127ee7b3e0ab1a4d8bbdaf92c31f8560236
 SHA1 (patch-fbquant.c) = 4f9b5e56eb2b0005c24ab90cf732af972438db0f
 SHA1 (patch-flgifc.c) = 53f811e26ebd25237e5a528bf607b2be21262125
 SHA1 (patch-flgife.c) = 5b36aeec8f6e2e2f0594640b8b41c66111feb0d0

Index: pkgsrc/graphics/fbm/patches/patch-aa
diff -u pkgsrc/graphics/fbm/patches/patch-aa:1.1.1.2 pkgsrc/graphics/fbm/patches/patch-aa:1.2
--- pkgsrc/graphics/fbm/patches/patch-aa:1.1.1.2        Thu Aug  3 19:20:45 2000
+++ pkgsrc/graphics/fbm/patches/patch-aa        Sun Jan  4 09:48:56 2026
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.2 2000/08/03 19:20:45 rh Exp $
+$NetBSD: patch-aa,v 1.2 2026/01/04 09:48:56 wiz Exp $
 
---- Makefile.orig      Fri Jun  4 01:30:50 1993
-+++ Makefile   Thu Apr 27 03:27:43 2000
+--- Makefile.orig      1993-06-03 16:30:50.000000000 +0000
++++ Makefile
 @@ -63,32 +63,33 @@
  #
  ################################################################
@@ -49,7 +49,16 @@ $NetBSD: patch-aa,v 1.1.1.2 2000/08/03 1
  
  LIB= -L. -lfbm $(JLIB) $(RLIB)
  
-@@ -309,12 +310,12 @@
+@@ -171,7 +172,7 @@ uninstall: clean
+ 
+ libfbm.a: $(LIBO)
+       rm -f $@
+-      ar clq $@ $(LIBO)
++      ar cq $@ $(LIBO)
+       ranlib $@
+ 
+ # Library routines
+@@ -309,12 +310,12 @@ fndseg: fndseg.c fbm.h libfbm.a flsign.c
        fltiff.o -L$(TIFLIB) $(LIB) -ltiff -lm
  unmap: gray2clr
        rm -rf unmap
@@ -64,7 +73,7 @@ $NetBSD: patch-aa,v 1.1.1.2 2000/08/03 1
  pbm2face: pbm2face.c fbm.h libfbm.a
        $(CC) $(DBG) -o pbm2face pbm2face.c $(LIB) -lm
  pbm2ps: pbm2ps.c
-@@ -341,211 +342,211 @@
+@@ -341,211 +342,211 @@ fbpalet: fbpalet.c fbm.h libfbm.a
        $(CC) $(DBG) -o fbpalet fbpalet.c $(LIB) -lm
  $(BIN)fbext: fbext
        rm -f $(BIN)fbext