CVS commit: pkgsrc/print/podofo

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Apr 11 10:54:00 UTC 2020

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

Log Message:
podofo: fix install_name on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/podofo/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/podofo/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/print/podofo/patches/patch-src_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.34 pkgsrc/print/podofo/Makefile:1.35
--- pkgsrc/print/podofo/Makefile:1.34   Fri Mar 20 11:58:15 2020
+++ pkgsrc/print/podofo/Makefile        Sat Apr 11 10:54:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2020/03/20 11:58:15 nia Exp $
+# $NetBSD: Makefile,v 1.35 2020/04/11 10:54:00 adam Exp $
 
 DISTNAME=      podofo-0.9.6
 PKGREVISION=   1
@@ -14,8 +14,8 @@ USE_CMAKE=    yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
-CMAKE_ARGS+=   -DPODOFO_BUILD_SHARED:BOOL=TRUE
-CMAKE_ARGS+=   -DPODOFO_BUILD_STATIC:BOOL=TRUE
+CMAKE_ARGS+=   -DPODOFO_BUILD_SHARED=ON
+CMAKE_ARGS+=   -DPODOFO_BUILD_STATIC=ON
 CMAKE_ARGS+=   -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2
 CMAKE_ARGS+=   -DFREETYPE_INCLUDE_DIR_FTHEADER:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2/config
 CMAKE_ARGS+=   -DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib

Index: pkgsrc/print/podofo/distinfo
diff -u pkgsrc/print/podofo/distinfo:1.20 pkgsrc/print/podofo/distinfo:1.21
--- pkgsrc/print/podofo/distinfo:1.20   Sat Nov  9 12:33:29 2019
+++ pkgsrc/print/podofo/distinfo        Sat Apr 11 10:54:00 2020
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.20 2019/11/09 12:33:29 nia Exp $
+$NetBSD: distinfo,v 1.21 2020/04/11 10:54:00 adam Exp $
 
 SHA1 (podofo-0.9.6.tar.gz) = 54275025b1049e40177e35c7003e87ea092f277c
 RMD160 (podofo-0.9.6.tar.gz) = 71764cd85c7e443654689f84dd8c68fccb24e442
 SHA512 (podofo-0.9.6.tar.gz) = 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130
 Size (podofo-0.9.6.tar.gz) = 995898 bytes
-SHA1 (patch-CMakeLists.txt) = c92ea81cde1af07ac3464d1a6a8df1f36f81a833
+SHA1 (patch-CMakeLists.txt) = cb576aaf2e6ebe875818aefbba8d83c4ddbae7e4
 SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795
+SHA1 (patch-src_CMakeLists.txt) = eb44b1ba06a850340a7fb2de42ac982336cb04cd
 SHA1 (patch-src_base_PdfMemoryManagement.cpp) = 9303daf1e471106d9d22e42230db650dba5f1006
 SHA1 (patch-src_doc_PdfImage.cpp) = 844250a772d40ba3ea2322ea623990b87b27c664
 SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f

Index: pkgsrc/print/podofo/patches/patch-CMakeLists.txt
diff -u pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.4 pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.4        Sat Nov  9 12:33:29 2019
+++ pkgsrc/print/podofo/patches/patch-CMakeLists.txt    Sat Apr 11 10:54:00 2020
@@ -1,9 +1,29 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2019/11/09 12:33:29 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2020/04/11 10:54:00 adam 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
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+ 
+ #*****************  IMPORTANT  ************* IMPORTANT **********************
+ # Look at http://www.vtk.org/Wiki/CMake_HowToDoPlatformChecks
+@@ -516,9 +516,9 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
+   INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
+ ENDIF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
+ 
+-IF(WIN32 OR PODOFO_BUILD_STATIC)
++IF(PODOFO_BUILD_SHARED)
+   SET(PODOFO_LIB
+-      podofo
++      podofo_shared
+       ${PODOFO_LIB_DEPENDS}
+       )
+ ELSE(WIN32 OR PODOFO_BUILD_STATIC)
 @@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
  #
  # Setup directories we will need

Added files:

Index: pkgsrc/print/podofo/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/print/podofo/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Sat Apr 11 10:54:00 2020
+++ pkgsrc/print/podofo/patches/patch-src_CMakeLists.txt        Sat Apr 11 10:54:00 2020
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2020/04/11 10:54:00 adam Exp $
+
+Inherit CMake requirement from the main CMakeLists.txt.
+
+--- src/CMakeLists.txt.orig    2018-03-11 11:42:20.000000000 +0000
++++ src/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+ 
+ IF(NOT PODOFO_MAIN_CMAKELISTS_READ)
+   MESSAGE(FATAL_ERROR "Run cmake on the CMakeLists.txt in the project root, not the one in the 'src' directory. You will need to delete CMakeCache.txt from the current directory.")