podofo: fix install_name on Darwindiff -r1.34 -r1.35 pkgsrc/print/podofo/Makefile
(adam)
| @@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.34 2020/03/20 11:58:15 nia Exp $ | 1 | # $NetBSD: Makefile,v 1.35 2020/04/11 10:54:00 adam Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= podofo-0.9.6 | 3 | DISTNAME= podofo-0.9.6 | |
| 4 | PKGREVISION= 1 | 4 | PKGREVISION= 1 | |
| 5 | CATEGORIES= print | 5 | CATEGORIES= print | |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=podofo/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=podofo/} | |
| 7 | 7 | |||
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
| 9 | HOMEPAGE= http://podofo.sourceforge.net/ | 9 | HOMEPAGE= http://podofo.sourceforge.net/ | |
| 10 | COMMENT= Library to work with the PDF file format | 10 | COMMENT= Library to work with the PDF file format | |
| 11 | LICENSE= gnu-lgpl-v2 AND gnu-gpl-v2 | 11 | LICENSE= gnu-lgpl-v2 AND gnu-gpl-v2 | |
| 12 | 12 | |||
| 13 | USE_CMAKE= yes | 13 | USE_CMAKE= yes | |
| 14 | USE_LANGUAGES= c c++ | 14 | USE_LANGUAGES= c c++ | |
| 15 | USE_TOOLS+= pkg-config | 15 | USE_TOOLS+= pkg-config | |
| 16 | 16 | |||
| 17 | CMAKE_ARGS+= -DPODOFO_BUILD_SHARED:BOOL=TRUE | 17 | CMAKE_ARGS+= -DPODOFO_BUILD_SHARED=ON | |
| 18 | CMAKE_ARGS+= -DPODOFO_BUILD_STATIC:BOOL=TRUE | 18 | CMAKE_ARGS+= -DPODOFO_BUILD_STATIC=ON | |
| 19 | CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2 | 19 | CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2 | |
| 20 | CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR_FTHEADER:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2/config | 20 | CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR_FTHEADER:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2/config | |
| 21 | CMAKE_ARGS+= -DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib | 21 | CMAKE_ARGS+= -DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib | |
| 22 | 22 | |||
| 23 | # Avoid building unit tests. | 23 | # Avoid building unit tests. | |
| 24 | CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=TRUE | 24 | CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=TRUE | |
| 25 | CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LUA=TRUE | 25 | CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LUA=TRUE | |
| 26 | 26 | |||
| 27 | .include "options.mk" | 27 | .include "options.mk" | |
| 28 | 28 | |||
| 29 | # tests-depend on cppunit (for unit tests) | 29 | # tests-depend on cppunit (for unit tests) | |
| 30 | .include "../../devel/libidn/buildlink3.mk" | 30 | .include "../../devel/libidn/buildlink3.mk" | |
| 31 | .include "../../devel/zlib/buildlink3.mk" | 31 | .include "../../devel/zlib/buildlink3.mk" |
| @@ -1,12 +1,13 @@ | @@ -1,12 +1,13 @@ | |||
| 1 | $NetBSD: distinfo,v 1.20 2019/11/09 12:33:29 nia Exp $ | 1 | $NetBSD: distinfo,v 1.21 2020/04/11 10:54:00 adam Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (podofo-0.9.6.tar.gz) = 54275025b1049e40177e35c7003e87ea092f277c | 3 | SHA1 (podofo-0.9.6.tar.gz) = 54275025b1049e40177e35c7003e87ea092f277c | |
| 4 | RMD160 (podofo-0.9.6.tar.gz) = 71764cd85c7e443654689f84dd8c68fccb24e442 | 4 | RMD160 (podofo-0.9.6.tar.gz) = 71764cd85c7e443654689f84dd8c68fccb24e442 | |
| 5 | SHA512 (podofo-0.9.6.tar.gz) = 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130 | 5 | SHA512 (podofo-0.9.6.tar.gz) = 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130 | |
| 6 | Size (podofo-0.9.6.tar.gz) = 995898 bytes | 6 | Size (podofo-0.9.6.tar.gz) = 995898 bytes | |
| 7 | SHA1 (patch-CMakeLists.txt) = c92ea81cde1af07ac3464d1a6a8df1f36f81a833 | 7 | SHA1 (patch-CMakeLists.txt) = cb576aaf2e6ebe875818aefbba8d83c4ddbae7e4 | |
| 8 | SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795 | 8 | SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795 | |
| 9 | SHA1 (patch-src_CMakeLists.txt) = eb44b1ba06a850340a7fb2de42ac982336cb04cd | |||
| 9 | SHA1 (patch-src_base_PdfMemoryManagement.cpp) = 9303daf1e471106d9d22e42230db650dba5f1006 | 10 | SHA1 (patch-src_base_PdfMemoryManagement.cpp) = 9303daf1e471106d9d22e42230db650dba5f1006 | |
| 10 | SHA1 (patch-src_doc_PdfImage.cpp) = 844250a772d40ba3ea2322ea623990b87b27c664 | 11 | SHA1 (patch-src_doc_PdfImage.cpp) = 844250a772d40ba3ea2322ea623990b87b27c664 | |
| 11 | SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f | 12 | SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f | |
| 12 | SHA1 (patch-test_TokenizerTest_CMakeLists.txt) = 588f0f26aa5c8d6a1d1e6119680b9ee7416781d6 | 13 | SHA1 (patch-test_TokenizerTest_CMakeLists.txt) = 588f0f26aa5c8d6a1d1e6119680b9ee7416781d6 |
| @@ -1,15 +1,35 @@ | @@ -1,15 +1,35 @@ | |||
| 1 | $NetBSD: patch-CMakeLists.txt,v 1.4 2019/11/09 12:33:29 nia Exp $ | 1 | $NetBSD: patch-CMakeLists.txt,v 1.5 2020/04/11 10:54:00 adam Exp $ | |
| 2 | 2 | |||
| 3 | Require newer CMake to fix install_name on Darwin. | |||
| 4 | Set correct shared library target. | |||
| 3 | Install man pages to correct directory. | 5 | Install man pages to correct directory. | |
| 4 | 6 | |||
| 5 | --- CMakeLists.txt.orig 2018-07-08 10:33:27.000000000 +0000 | 7 | --- CMakeLists.txt.orig 2018-07-08 10:33:27.000000000 +0000 | |
| 6 | +++ CMakeLists.txt | 8 | +++ CMakeLists.txt | |
| 9 | @@ -1,4 +1,4 @@ | |||
| 10 | -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) | |||
| 11 | +CMAKE_MINIMUM_REQUIRED(VERSION 3.1) | |||
| 12 | ||||
| 13 | #***************** IMPORTANT ************* IMPORTANT ********************** | |||
| 14 | # Look at http://www.vtk.org/Wiki/CMake_HowToDoPlatformChecks | |||
| 15 | @@ -516,9 +516,9 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG) | |||
| 16 | INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR}) | |||
| 17 | ENDIF(FONTCONFIG_FOUND AND WANT_FONTCONFIG) | |||
| 18 | ||||
| 19 | -IF(WIN32 OR PODOFO_BUILD_STATIC) | |||
| 20 | +IF(PODOFO_BUILD_SHARED) | |||
| 21 | SET(PODOFO_LIB | |||
| 22 | - podofo | |||
| 23 | + podofo_shared | |||
| 24 | ${PODOFO_LIB_DEPENDS} | |||
| 25 | ) | |||
| 26 | ELSE(WIN32 OR PODOFO_BUILD_STATIC) | |||
| 7 | @@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC) | 27 | @@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC) | |
| 8 | # | 28 | # | |
| 9 | # Setup directories we will need | 29 | # Setup directories we will need | |
| 10 | # | 30 | # | |
| 11 | -SET(MANDIR "share/man/") | 31 | -SET(MANDIR "share/man/") | |
| 12 | +SET(MANDIR "${CMAKE_INSTALL_MANDIR}/") | 32 | +SET(MANDIR "${CMAKE_INSTALL_MANDIR}/") | |
| 13 | 33 | |||
| 14 | # Create the config file. It'll be appended to as the subdirs run though | 34 | # Create the config file. It'll be appended to as the subdirs run though | |
| 15 | # then dependency information will be written to it at the end of the | 35 | # then dependency information will be written to it at the end of the |
$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.")