CVS commit: pkgsrc/graphics

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan  6 22:28:02 UTC 2026

Modified Files:
        pkgsrc/graphics/freetype-lib: distinfo
        pkgsrc/graphics/freetype-lib/patches: patch-ab
        pkgsrc/graphics/freetype-utils: Makefile PLIST

Log Message:
freetype-utils: work around broken X detection

just build the programs independent of if X detection fails or not
to have a consistent PLIST

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/freetype-lib/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/freetype-lib/patches/patch-ab
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/freetype-utils/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/freetype-utils/PLIST

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

Modified files:

Index: pkgsrc/graphics/freetype-lib/distinfo
diff -u pkgsrc/graphics/freetype-lib/distinfo:1.16 pkgsrc/graphics/freetype-lib/distinfo:1.17
--- pkgsrc/graphics/freetype-lib/distinfo:1.16  Sun Dec 21 13:51:26 2025
+++ pkgsrc/graphics/freetype-lib/distinfo       Tue Jan  6 22:28:02 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2025/12/21 13:51:26 prlw1 Exp $
+$NetBSD: distinfo,v 1.17 2026/01/06 22:28:02 wiz Exp $
 
 BLAKE2s (freetype1_1.4pre.20030402.orig.tar.gz) = 56faba16f3a9850edd7739abbfba627725d722e6757fc3df97c7fab174598914
 SHA512 (freetype1_1.4pre.20030402.orig.tar.gz) = 8eec1102ee67f4ac63d9ed3086431d454e773f584d20630f056c299de7acf9a2942e3cceebaae7145de1fe950c31ea5cac354e667749ea1cec24d28a6a5d27da
 Size (freetype1_1.4pre.20030402.orig.tar.gz) = 1402735 bytes
 SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664
-SHA1 (patch-ab) = d15513455534873cdbccc01d011c1c82b25de2f7
+SHA1 (patch-ab) = 4b571301a723a9715f8bc0104adce9e8304f74d2
 SHA1 (patch-ac) = 0d15e23f3dbdb6d6a55f114f0b05774356e43a85
 SHA1 (patch-ae) = 62aa38ccb5498321687b81fbe0b070cc7e613736
 SHA1 (patch-configure) = 08f8432383177905ab351be979a4956671b02ec1
@@ -12,7 +12,6 @@ SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e
 SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3
 SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74
 SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae
-SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91
 SHA1 (patch-ttf2pk-af) = 17320edc3ad49f1025c0a6a635e7e66977b5e383
 SHA1 (patch-ttf2pk-ag) = 010e74ab520c804b98209e28fc633a4a7e322e12
 SHA1 (patch-ttf2pk-ah) = 1681256ca085350a2913082aba2940558f95ed8d

Index: pkgsrc/graphics/freetype-lib/patches/patch-ab
diff -u pkgsrc/graphics/freetype-lib/patches/patch-ab:1.3 pkgsrc/graphics/freetype-lib/patches/patch-ab:1.4
--- pkgsrc/graphics/freetype-lib/patches/patch-ab:1.3   Fri Mar 14 17:22:49 2008
+++ pkgsrc/graphics/freetype-lib/patches/patch-ab       Tue Jan  6 22:28:02 2026
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2008/03/14 17:22:49 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2026/01/06 22:28:02 wiz Exp $
 
---- test/arch/unix/Makefile.in.orig    2001-12-25 15:13:19.000000000 -0500
+--- test/arch/unix/Makefile.in.orig    2001-12-25 20:13:19.000000000 +0000
 +++ test/arch/unix/Makefile.in
+@@ -66,7 +66,7 @@ X_PROGRAMS = ftstring ftstrtto fttimer ftview ftzoom
+ PROGRAMS = ftdump fterror ftlint ftmetric ftsbit ftstrpnm
+ X_PROGRAMS = ftstring ftstrtto fttimer ftview ftzoom
+ 
+-ALL_PROGRAMS = $(PROGRAMS) @X_PROGRAMS@
++ALL_PROGRAMS = $(PROGRAMS) ${X_PROGRAMS}
+ 
+ # set this variable to nil if you don't need to use Electric-Fence
+ EFENCE =
 @@ -75,11 +75,12 @@ EFENCE =
  
  # variables used to compile either with libtool or not
@@ -17,7 +26,7 @@ $NetBSD: patch-ab,v 1.3 2008/03/14 17:22
  
  .c.o:
        $(CC) -c $(FT_CFLAGS) $<
-@@ -137,9 +138,9 @@ ftstrtto: ftstrtto.o $(DISPOBJS) arabic.
+@@ -137,9 +138,9 @@ install: $(ALL_PROGRAMS)
  
  
  install: $(ALL_PROGRAMS)

Index: pkgsrc/graphics/freetype-utils/Makefile
diff -u pkgsrc/graphics/freetype-utils/Makefile:1.26 pkgsrc/graphics/freetype-utils/Makefile:1.27
--- pkgsrc/graphics/freetype-utils/Makefile:1.26        Mon Dec 22 23:24:08 2025
+++ pkgsrc/graphics/freetype-utils/Makefile     Tue Jan  6 22:28:02 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2025/12/22 23:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2026/01/06 22:28:02 wiz Exp $
 
 .include "../../graphics/freetype-lib/Makefile.common"
 
 PKGNAME=       freetype-utils-${FT_VERS}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Utilities for manipulating TrueType fonts
 
 BUILDLINK_API_DEPENDS.freetype=        freetype-lib>=${FT_VERS}

Index: pkgsrc/graphics/freetype-utils/PLIST
diff -u pkgsrc/graphics/freetype-utils/PLIST:1.2 pkgsrc/graphics/freetype-utils/PLIST:1.3
--- pkgsrc/graphics/freetype-utils/PLIST:1.2    Mon Dec 22 23:24:08 2025
+++ pkgsrc/graphics/freetype-utils/PLIST        Tue Jan  6 22:28:02 2026
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2025/12/22 23:24:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/01/06 22:28:02 wiz Exp $
 bin/ftdump
 bin/fterror
 bin/ftlint
 bin/ftmetric
 bin/ftsbit
+bin/ftstring
 bin/ftstrpnm
+bin/ftstrtto
+bin/fttimer
+bin/ftview
+bin/ftzoom