CVS commit: pkgsrc/print/podofo

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Aug 14 16:03:58 UTC 2025

Modified Files:
        pkgsrc/print/podofo: Makefile distinfo
        pkgsrc/print/podofo/patches: patch-CMakeLists.txt

Log Message:
print/podofo: Apply duct tape to cmake stuff, for 4.x

Fix two reasons why this package failed to build With cmake 4:
  - Instead of patching cmake min from 2.6 to 3.1, choose 3.22.
  - A makefile was created twice.  cmake 4 objects, seeming likely to
    be catching a real error.  Add APPEND to the second export, hoping
    that's ok.

In both cases, don't worry about the details because this package
needs updating anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/podofo/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/podofo/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/print/podofo/Makefile
diff -u pkgsrc/print/podofo/Makefile:1.50 pkgsrc/print/podofo/Makefile:1.51
--- pkgsrc/print/podofo/Makefile:1.50   Thu Aug 14 12:12:29 2025
+++ pkgsrc/print/podofo/Makefile        Thu Aug 14 16:03:57 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2025/08/14 12:12:29 gdt Exp $
+# $NetBSD: Makefile,v 1.51 2025/08/14 16:03:57 gdt Exp $
 
 # \todo Update to 1.0.1, from github, and needing c++17.
 DISTNAME=      podofo-0.9.8
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=podofo/}
 

Index: pkgsrc/print/podofo/distinfo
diff -u pkgsrc/print/podofo/distinfo:1.24 pkgsrc/print/podofo/distinfo:1.25
--- pkgsrc/print/podofo/distinfo:1.24   Tue Jan 17 14:01:57 2023
+++ pkgsrc/print/podofo/distinfo        Thu Aug 14 16:03:58 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2023/01/17 14:01:57 spz Exp $
+$NetBSD: distinfo,v 1.25 2025/08/14 16:03:58 gdt Exp $
 
 BLAKE2s (podofo-0.9.8.tar.gz) = 16c57b22a80fa29abbd4cf34895efc9cd4e549ac4590234363652a60d48ec50c
 SHA512 (podofo-0.9.8.tar.gz) = b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
 Size (podofo-0.9.8.tar.gz) = 1012918 bytes
-SHA1 (patch-CMakeLists.txt) = cb576aaf2e6ebe875818aefbba8d83c4ddbae7e4
+SHA1 (patch-CMakeLists.txt) = 2b5f1dbe9c2447b2726597deb860613c77cf1afc
 SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795
 SHA1 (patch-src_podofo_CMakeLists.txt) = 9a75d0ce18f331b02bcd74a2935d36e0de701266
 SHA1 (patch-src_podofo_base_PdfMemoryManagement.cpp) = ad5772c41f401b1a31caa37c4f05209f31899c87

Index: pkgsrc/print/podofo/patches/patch-CMakeLists.txt
diff -u pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.5 pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.5        Sat Apr 11 10:54:00 2020
+++ pkgsrc/print/podofo/patches/patch-CMakeLists.txt    Thu Aug 14 16:03:58 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2020/04/11 10:54:00 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2025/08/14 16:03:58 gdt Exp $
 
 Require newer CMake to fix install_name on Darwin.
 Set correct shared library target.
 Install man pages to correct directory.
 
---- CMakeLists.txt.orig        2018-07-08 10:33:27.000000000 +0000
+--- CMakeLists.txt.orig        2022-05-03 12:18:23.000000000 +0000
 +++ CMakeLists.txt
 @@ -1,4 +1,4 @@
 -CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.22)
  
  #*****************  IMPORTANT  ************* IMPORTANT **********************
  # Look at http://www.vtk.org/Wiki/CMake_HowToDoPlatformChecks
-@@ -516,9 +516,9 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
+@@ -525,9 +525,9 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
    INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
  ENDIF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
  
@@ -24,7 +24,7 @@ Install man pages to correct directory.
        ${PODOFO_LIB_DEPENDS}
        )
  ELSE(WIN32 OR PODOFO_BUILD_STATIC)
-@@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
+@@ -539,7 +539,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
  #
  # Setup directories we will need
  #
@@ -33,3 +33,11 @@ Install man pages to correct directory.
  
  # Create the config file. It'll be appended to as the subdirs run though
  # then dependency information will be written to it at the end of the
+@@ -574,6 +574,6 @@ IF(PODOFO_BUILD_SHARED)
+   EXPORT(TARGETS podofo_shared FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
+ ENDIF(PODOFO_BUILD_SHARED)
+ IF(PODOFO_BUILD_STATIC)
+-  EXPORT(TARGETS podofo_static FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
++  EXPORT(TARGETS podofo_static APPEND FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
+ ENDIF(PODOFO_BUILD_STATIC)
+