CVS commit: pkgsrc/print/ja-vflib-lib

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print/ja-vflib-lib
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Mon, 22 Dec 2025 23:27:52 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec 22 23:27:52 UTC 2025

Modified Files:
        pkgsrc/print/ja-vflib-lib: distinfo
        pkgsrc/print/ja-vflib-lib/patches: patch-aa patch-ab patch-ac patch-af

Log Message:
ja-vflib-lib: fix build on NetBSD 11


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/ja-vflib-lib/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/ja-vflib-lib/patches/patch-aa \
    pkgsrc/print/ja-vflib-lib/patches/patch-ab \
    pkgsrc/print/ja-vflib-lib/patches/patch-af
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/ja-vflib-lib/patches/patch-ac

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

Modified files:

Index: pkgsrc/print/ja-vflib-lib/distinfo
diff -u pkgsrc/print/ja-vflib-lib/distinfo:1.9 pkgsrc/print/ja-vflib-lib/distinfo:1.10
--- pkgsrc/print/ja-vflib-lib/distinfo:1.9      Tue Oct 26 11:12:08 2021
+++ pkgsrc/print/ja-vflib-lib/distinfo  Mon Dec 22 23:27:52 2025
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:12:08 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/12/22 23:27:52 wiz Exp $
 
 BLAKE2s (VFlib2-2.24.2.tar.gz) = 483f5a7d922af0e67bcee14f7e26a150c0f40b312a3991c5739733b7e8d914d7
 SHA512 (VFlib2-2.24.2.tar.gz) = 49618f3b8dd9cd3b9e99a3b293b1b8317c2c24511a8d5943e2aa1fb11baf8e0b202c5923c5d953da1e9a355ae07085da595df4e79e0faead73572ca1a2aeb9f5
 Size (VFlib2-2.24.2.tar.gz) = 540093 bytes
-SHA1 (patch-aa) = c78284c8126b8a2f1ccf43360b9f2e0f0468c2e1
-SHA1 (patch-ab) = 1654d8a602097eed3a8fb4c146287eadbae0c3be
-SHA1 (patch-ac) = bf68e3561599c0e1840333fa719e88e0960ecbb9
+SHA1 (patch-aa) = d461cfa8d5908e4d2d9e778e4913dd2d2cc1ab6b
+SHA1 (patch-ab) = bd9f3909d2a80bdf167474f5ed7d1b7e6d860984
+SHA1 (patch-ac) = cbdc5d630d75314860a5fdd13b7c401a90d8baf6
 SHA1 (patch-ad) = e17a354d1fe1a999fd732779ded419f350ac7aab
 SHA1 (patch-ae) = 6b2512548bc122b915c15067791aeecfcb2ef8a6
-SHA1 (patch-af) = daae96f7c5218eb9fd22d297121a93f5bd266bed
+SHA1 (patch-af) = 0b77b8b28302985b5d67a77fc6a5820b4d7f191f
 SHA1 (patch-ag) = 909528fb09ac340f4b26b9a76d098ce185fd74a1
 SHA1 (patch-ah) = 594a4916c1a0d2c0292e702a7e11ac11cd1bcbba
 SHA1 (patch-ai) = cc7043ee2b807bed57c6ef6649af80a53736e57a

Index: pkgsrc/print/ja-vflib-lib/patches/patch-aa
diff -u pkgsrc/print/ja-vflib-lib/patches/patch-aa:1.2 pkgsrc/print/ja-vflib-lib/patches/patch-aa:1.3
--- pkgsrc/print/ja-vflib-lib/patches/patch-aa:1.2      Sun Aug 25 18:39:45 2002
+++ pkgsrc/print/ja-vflib-lib/patches/patch-aa  Mon Dec 22 23:27:52 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 18:39:45 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2025/12/22 23:27:52 wiz Exp $
 
---- Makefile.in.orig   Mon Sep 14 01:25:04 1998
-+++ Makefile.in        Mon May  1 04:37:47 2000
-@@ -10,17 +10,22 @@
+--- Makefile.in.orig   1998-09-14 05:25:04.000000000 +0000
++++ Makefile.in
+@@ -10,17 +10,22 @@ include make-sub
  
  LIBTOOL=./libtool
  
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2002/08/25 18:39
        @if [ ! -d $(bindir) ] ; then \
            ./recmkdir $(bindir); fi
        @if [ ! -d $(libdir) ] ; then \
-@@ -29,10 +34,12 @@
+@@ -29,11 +34,13 @@ install: 
            ./recmkdir $(includedir); fi
        @if [ ! -d $(runtimedir) ] ; then \
            ./recmkdir $(runtimedir); fi
@@ -39,9 +39,10 @@ $NetBSD: patch-aa,v 1.2 2002/08/25 18:39
 +      (cd src;   $(MAKE) install)
        $(CP) vfontcap* $(runtimedir)
        $(CP) doc/*.dvi doc/*.ps doc/QA* $(runtimedir)
-+
+ 
 +install-tools:
 +      (cd tools; $(MAKE) install)
- 
++
  uninstall:
        -(cd src;   $(MAKE) $@)
+       -(cd tools; $(MAKE) $@)
Index: pkgsrc/print/ja-vflib-lib/patches/patch-ab
diff -u pkgsrc/print/ja-vflib-lib/patches/patch-ab:1.2 pkgsrc/print/ja-vflib-lib/patches/patch-ab:1.3
--- pkgsrc/print/ja-vflib-lib/patches/patch-ab:1.2      Sun Aug 25 18:39:45 2002
+++ pkgsrc/print/ja-vflib-lib/patches/patch-ab  Mon Dec 22 23:27:52 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 18:39:45 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2025/12/22 23:27:52 wiz Exp $
 
---- configure.in.orig  Wed Feb 17 23:58:02 1999
-+++ configure.in       Wed Jul 19 17:36:22 2000
-@@ -54,6 +54,11 @@
+--- configure.in.orig  1999-02-18 04:58:02.000000000 +0000
++++ configure.in
+@@ -54,6 +54,11 @@ else
  fi
  AC_SUBST(XX_CFLAGS)
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 18:39
  
  AC_SUBST(freetype_includedir)
  AC_SUBST(freetype_libdir)
-@@ -117,6 +122,7 @@
+@@ -117,6 +122,7 @@ AC_FUNC_VPRINTF
  AC_CONFIG_HEADER(src/with.h src/config.h)
  AC_OUTPUT(Makefile make-sub src/Makefile tools/Imakefile)
  
@@ -22,11 +22,10 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 18:39
  if test -d /usr/openwin ; then \
        (cd tools; \
         OPENWINHOME=/usr/openwin; \
-@@ -124,6 +130,7 @@
-        xmkmf;)  \
+@@ -125,5 +131,6 @@ if test -d /usr/openwin ; then \
  else \
        (cd tools; xmkmf -a) \
-+fi
  fi
++fi
  
  dnl EOF
Index: pkgsrc/print/ja-vflib-lib/patches/patch-af
diff -u pkgsrc/print/ja-vflib-lib/patches/patch-af:1.2 pkgsrc/print/ja-vflib-lib/patches/patch-af:1.3
--- pkgsrc/print/ja-vflib-lib/patches/patch-af:1.2      Sun Aug 25 18:39:46 2002
+++ pkgsrc/print/ja-vflib-lib/patches/patch-af  Mon Dec 22 23:27:52 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2002/08/25 18:39:46 jlam Exp $
+$NetBSD: patch-af,v 1.3 2025/12/22 23:27:52 wiz Exp $
 
---- configure.orig     Wed Feb 17 23:58:33 1999
-+++ configure  Sun May 27 18:43:19 2001
-@@ -78,6 +78,8 @@
+--- configure.orig     1999-02-18 04:58:33.000000000 +0000
++++ configure
+@@ -78,6 +78,8 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
  ac_help="$ac_help
@@ -11,7 +11,25 @@ $NetBSD: patch-af,v 1.2 2002/08/25 18:39
    --with-freetype[=LIB]            Link FreeType library LIB [LIB=ttf]"
  ac_help="$ac_help
    --with-freetype-includedir=DIR   FreeType include files are in DIR"
-@@ -1480,6 +1614,14 @@
+@@ -825,7 +827,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 827 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -1196,7 +1198,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 1198 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -1480,6 +1482,14 @@ else
  fi
  
  
@@ -26,7 +44,16 @@ $NetBSD: patch-af,v 1.2 2002/08/25 18:39
  
  
  
-@@ -2616,6 +2761,7 @@
+@@ -2110,7 +2120,7 @@ else
+ #line 2111 "configure"
+ #include "confdefs.h"
+ 
+-main()
++int main()
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+@@ -2616,6 +2628,7 @@ rm -fr confdefs* $ac_clean_files
  test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
  
  
@@ -34,10 +61,9 @@ $NetBSD: patch-af,v 1.2 2002/08/25 18:39
  if test -d /usr/openwin ; then \
        (cd tools; \
         OPENWINHOME=/usr/openwin; \
-@@ -2623,5 +2769,6 @@
-        xmkmf;)  \
+@@ -2624,4 +2637,5 @@ if test -d /usr/openwin ; then \
  else \
        (cd tools; xmkmf -a) \
-+fi
  fi
++fi
  

Index: pkgsrc/print/ja-vflib-lib/patches/patch-ac
diff -u pkgsrc/print/ja-vflib-lib/patches/patch-ac:1.3 pkgsrc/print/ja-vflib-lib/patches/patch-ac:1.4
--- pkgsrc/print/ja-vflib-lib/patches/patch-ac:1.3      Wed Sep  9 17:21:52 2009
+++ pkgsrc/print/ja-vflib-lib/patches/patch-ac  Mon Dec 22 23:27:52 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2009/09/09 17:21:52 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2025/12/22 23:27:52 wiz Exp $
 
---- src/Makefile.in.orig       Tue Oct 27 02:33:17 1998
+--- src/Makefile.in.orig       1998-10-27 07:33:17.000000000 +0000
 +++ src/Makefile.in
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ DRV_OBJ=  VF_Sony.lo VF_Zeit.lo VF_Jg.lo
  # VFlib
  $(VFLIB):  $(CORE_OBJ) $(DRV_OBJ)
        $(LIBTOOL) --mode=link \
@@ -11,19 +11,19 @@ $NetBSD: patch-ac,v 1.3 2009/09/09 17:21
                  -version-info @version_info@ -rpath $(libdir) \
                  $(EXT_LIBRARY) 
  
-@@ -183,13 +183,13 @@
+@@ -183,13 +183,13 @@ fwindex.lo:        fwindex.c fwindex.h
  
  # Installing
  install:
 -      $(LIBTOOL) $(CP) $(VFLIB) $(libdir)/$(VFLIB)
-+      $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(VFLIB) $(libdir)/$(VFLIB)
 -      $(LIBTOOL) -n --finish $(libdir)
-+      $(LIBTOOL) -n --mode=finish $(libdir)
 -      $(CP) VF.h     $(includedir)/VF.h
 -      $(CP) VF.h     $(runtimedir)/VF.h
 -      $(LIBTOOL) $(CP) ttindex  $(bindir)/ttindex
 -      $(LIBTOOL) $(CP) bdfindex $(bindir)/bdfindex
 -      $(LIBTOOL) $(CP) bdfindex $(bindir)/fwindex
++      $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(VFLIB) $(libdir)/$(VFLIB)
++      $(LIBTOOL) -n --mode=finish $(libdir)
 +      $(BSD_INSTALL_DATA) VF.h     $(includedir)/VF.h
 +      $(BSD_INSTALL_DATA) VF.h     $(runtimedir)/VF.h
 +      $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) ttindex  $(bindir)/ttindex

Prev by Date: CVS commit: pkgsrc/print/bg5ps
Next by Date: CVS commit: pkgsrc/textproc/py-xapian
Previous by Thread: CVS commit: pkgsrc/print/bg5ps
Next by Thread: CVS commit: pkgsrc/textproc/py-xapian
Indexes:

Home | Main Index | Thread Index | Old Index