CVS commit: pkgsrc/fonts/ttf2pt1

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Sun Dec 21 13:57:33 UTC 2025

Modified Files:
        pkgsrc/fonts/ttf2pt1: distinfo
Added Files:
        pkgsrc/fonts/ttf2pt1/patches: patch-ft.c patch-runt1asm.c
Removed Files:
        pkgsrc/fonts/ttf2pt1/patches: patch-ab

Log Message:
ttf2pt1: Fix build:
- freetype 2.13 constification
- implicit declaration of function 'dup', 'exit', 'close'


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/ttf2pt1/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/fonts/ttf2pt1/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/ttf2pt1/patches/patch-ft.c \
    pkgsrc/fonts/ttf2pt1/patches/patch-runt1asm.c

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

Modified files:

Index: pkgsrc/fonts/ttf2pt1/distinfo
diff -u pkgsrc/fonts/ttf2pt1/distinfo:1.10 pkgsrc/fonts/ttf2pt1/distinfo:1.11
--- pkgsrc/fonts/ttf2pt1/distinfo:1.10  Tue Oct 26 10:28:38 2021
+++ pkgsrc/fonts/ttf2pt1/distinfo       Sun Dec 21 13:57:32 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:28:38 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/12/21 13:57:32 prlw1 Exp $
 
 BLAKE2s (ttf2pt1-3.4.4.tgz) = 343ea2700b5e17807f44cf1a9b1688792de5e407455fe887e95534ad46d6a06d
 SHA512 (ttf2pt1-3.4.4.tgz) = ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014
 Size (ttf2pt1-3.4.4.tgz) = 230547 bytes
 SHA1 (patch-aa) = 7f23539c05d31b7b34da3a9a1046b86e3c0d236e
-SHA1 (patch-ab) = 3c93b8179ed3d4e354813a79f492e6ddd9bcd132
+SHA1 (patch-ft.c) = a75d220ea1c46448e4b1ba6c642260a24a3cbbca
+SHA1 (patch-runt1asm.c) = 1d3872bfe7b9b7323102375ef0b3debe1703a24c

Added files:

Index: pkgsrc/fonts/ttf2pt1/patches/patch-ft.c
diff -u /dev/null pkgsrc/fonts/ttf2pt1/patches/patch-ft.c:1.1
--- /dev/null   Sun Dec 21 13:57:33 2025
+++ pkgsrc/fonts/ttf2pt1/patches/patch-ft.c     Sun Dec 21 13:57:33 2025
@@ -0,0 +1,78 @@
+$NetBSD: patch-ft.c,v 1.1 2025/12/21 13:57:33 prlw1 Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- ft.c.orig  2003-12-31 21:30:50.000000000 +0000
++++ ft.c
+@@ -12,11 +12,12 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftsnames.h>
+-#include <freetype/ttnameid.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_SFNT_NAMES_H
++#include FT_TRUETYPE_IDS_H
++#include FT_OUTLINE_H
+ #include "pt1.h"
+ #include "global.h"
+ 
+@@ -457,7 +458,11 @@ static double lastx, lasty;
+ 
+ static int
+ outl_moveto(
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 13
++      const FT_Vector *to,
++#else
+       FT_Vector *to,
++#endif
+       void *unused
+ )
+ {
+@@ -477,7 +482,11 @@ outl_moveto(
+ 
+ static int
+ outl_lineto(
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 13
++      const FT_Vector *to,
++#else
+       FT_Vector *to,
++#endif
+       void *unused
+ )
+ {
+@@ -493,8 +502,13 @@ outl_lineto(
+ 
+ static int
+ outl_conicto(
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 13
++      const FT_Vector *control1,
++      const FT_Vector *to,
++#else
+       FT_Vector *control1,
+       FT_Vector *to,
++#endif
+       void *unused
+ )
+ {
+@@ -514,9 +528,15 @@ outl_conicto(
+ 
+ static int
+ outl_cubicto(
++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 13
++      const FT_Vector *control1,
++      const FT_Vector *control2,
++      const FT_Vector *to,
++#else
+       FT_Vector *control1,
+       FT_Vector *control2,
+       FT_Vector *to,
++#endif
+       void *unused
+ )
+ {
Index: pkgsrc/fonts/ttf2pt1/patches/patch-runt1asm.c
diff -u /dev/null pkgsrc/fonts/ttf2pt1/patches/patch-runt1asm.c:1.1
--- /dev/null   Sun Dec 21 13:57:33 2025
+++ pkgsrc/fonts/ttf2pt1/patches/patch-runt1asm.c       Sun Dec 21 13:57:33 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-runt1asm.c,v 1.1 2025/12/21 13:57:33 prlw1 Exp $
+
+Fix build: implicit declaration of function 'dup', 'exit', 'close'
+
+--- runt1asm.c.orig    2000-11-15 19:30:57.000000000 +0000
++++ runt1asm.c
+@@ -10,6 +10,8 @@
+ #ifdef EXTERNAL_T1ASM
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include <errno.h>
+ 
+ FILE *ifp;