[153678] trunk/dports/graphics/podofo

devans at macports.org devans at macports.org
Fri Oct 7 16:11:46 CEST 2016


Revision: 153678
          https://trac.macports.org/changeset/153678
Author:   devans at macports.org
Date:     2016-10-07 07:11:46 -0700 (Fri, 07 Oct 2016)
Log Message:
-----------
podofo: update to version 0.9.4, adjust configuration to avoid having to use conflicts_build.

Modified Paths:
--------------
    trunk/dports/graphics/podofo/Portfile
    trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff

Modified: trunk/dports/graphics/podofo/Portfile
===================================================================
--- trunk/dports/graphics/podofo/Portfile	2016-10-07 14:04:59 UTC (rev 153677)
+++ trunk/dports/graphics/podofo/Portfile	2016-10-07 14:11:46 UTC (rev 153678)
@@ -3,13 +3,11 @@
 
 PortSystem          1.0
 PortGroup           cmake 1.0
-PortGroup           conflicts_build 1.0
 
 cmake.out_of_source yes
 
 name                podofo
-version             0.9.3
-revision            1
+version             0.9.4
 license             GPL-2 LGPL-2
 categories          graphics
 maintainers         devans openmaintainer
@@ -24,8 +22,8 @@
                     modify their contents into memory. The changes can be written back to disk easily. \
                     The parser can also be used to extract information from a PDF file.
 
-checksums           sha256  ec261e31e89dce45b1a31be61e9c6bb250532e631a02d68ec5bb849ef0a222d8 \
-                    rmd160  7db7f92d84913621dfa53fbecd3f394aa8105bf4
+checksums           sha256  ccdf505fcb4904617e728b15729da8700ff38442c1dd2f24fbd52934287ff859 \
+                    rmd160  431496b2e4f5d14d05d56f0a5c9bf328fbab1b7a
 
 # cppunit required as a build dependency to enable build of podofo command line tools
 
@@ -47,21 +45,16 @@
     reinplace "s|\r||g" ${worksrcpath}/cmake/modules/FindFREETYPE.cmake
 }
 
-conflicts_build     ${name}
-
 patchfiles          patch-cmake-modules-FindFREETYPE.cmake.diff
 
-use_parallel_build  no
-
-configure.cmd       cmake
-
 configure.args-append \
                     -G \"Unix Makefiles\" \
                     -DWANT_FONTCONFIG:BOOL=TRUE \
                     -DPODOFO_BUILD_SHARED:BOOL=TRUE \
                     -DPODOFO_BUILD_STATIC:BOOL=TRUE \
                     -DCMAKE_INCLUDE_PATH=${prefix}/include \
-                    -DCMAKE_LIBRARY_PATH=${prefix}/lib
+                    -DCMAKE_LIBRARY_PATH=${prefix}/lib \
+                    -DCMAKE_EXE_LINKER_FLAGS=''
 
 livecheck.type      regex
 livecheck.url       http://podofo.sourceforge.net/download.html

Modified: trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff
===================================================================
--- trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff	2016-10-07 14:04:59 UTC (rev 153677)
+++ trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff	2016-10-07 14:11:46 UTC (rev 153678)
@@ -1,5 +1,5 @@
---- cmake/modules/FindFREETYPE.cmake.orig	2014-07-10 13:49:11.000000000 -0700
-+++ cmake/modules/FindFREETYPE.cmake	2014-07-10 13:55:31.000000000 -0700
+--- cmake/modules/FindFREETYPE.cmake.orig	2016-10-07 02:16:50.000000000 -0700
++++ cmake/modules/FindFREETYPE.cmake	2016-10-07 02:18:08.000000000 -0700
 @@ -15,9 +15,7 @@
  # first we try to find ft2build.h in the new location as
  # of freetype 2.5.1
@@ -11,7 +11,16 @@
    NO_CMAKE_SYSTEM_PATH
  )
  
-@@ -34,9 +32,6 @@
+@@ -25,18 +23,12 @@
+ # we check the old location
+ IF (NOT FREETYPE_INCLUDE_DIR_FT2BUILD)
+   FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
+-    /usr/include
+-    /usr/local/include
+-    /usr/X11/include
+     NO_CMAKE_SYSTEM_PATH
+   )
+ ENDIF (NOT FREETYPE_INCLUDE_DIR_FT2BUILD)
  
  # now try to find ftheader.h in the new location first
  FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
@@ -21,7 +30,17 @@
    ${FREETYPE_INCLUDE_DIR_FT2BUILD}
    NO_CMAKE_SYSTEM_PATH
  )
-@@ -71,7 +66,7 @@
+@@ -45,9 +37,6 @@
+ # we check the old location
+ IF (NOT FREETYPE_INCLUDE_DIR_FTHEADER)
+   FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
+-    /usr/include/freetype2
+-    /usr/local/include/freetype2
+-    /usr/X11/include/freetype2
+     ${FREETYPE_INCLUDE_DIR_FT2BUILD}
+     ${FREETYPE_INCLUDE_DIR_FT2BUILD}/freetype2
+     NO_CMAKE_SYSTEM_PATH
+@@ -71,7 +60,7 @@
  SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped libfreetyped)
  SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype libfreetype)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161007/49a59d1b/attachment-0002.html>


More information about the macports-changes mailing list