[114178] trunk/dports/graphics/podofo
ryandesign at macports.org
ryandesign at macports.org
Sat Nov 30 19:54:46 PST 2013
Revision: 114178
https://trac.macports.org/changeset/114178
Author: ryandesign at macports.org
Date: 2013-11-30 19:54:46 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
podofo: fix line endings of FindFREETYPE.cmake; never look for freetype in system directories
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 2013-12-01 03:30:28 UTC (rev 114177)
+++ trunk/dports/graphics/podofo/Portfile 2013-12-01 03:54:46 UTC (rev 114178)
@@ -38,6 +38,11 @@
port:cppunit \
port:lua
+post-extract {
+ # DOS to UNIX line endings so we can patch
+ reinplace "s|\r||g" ${worksrcpath}/cmake/modules/FindFREETYPE.cmake
+}
+
conflicts_build ${name}
patchfiles patch-src-base-PdfEncrypt.cpp.diff \
Modified: trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff
===================================================================
--- trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff 2013-12-01 03:30:28 UTC (rev 114177)
+++ trunk/dports/graphics/podofo/files/patch-cmake-modules-FindFREETYPE.cmake.diff 2013-12-01 03:54:46 UTC (rev 114178)
@@ -1,19 +1,31 @@
---- cmake/modules/FindFREETYPE.cmake.orig 2013-11-28 08:32:33.000000000 +0100
-+++ cmake/modules/FindFREETYPE.cmake 2013-11-28 08:32:56.000000000 +0100
-@@ -13,13 +13,15 @@
- SET(FREETYPE_FIND_QUIETLY 1)
-
- FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
+--- cmake/modules/FindFREETYPE.cmake.orig 2013-11-30 21:40:32.000000000 -0600
++++ cmake/modules/FindFREETYPE.cmake 2013-11-30 21:40:27.000000000 -0600
+@@ -13,16 +13,12 @@
+ SET(FREETYPE_FIND_QUIETLY 1)
+
+ FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
+- /usr/include/
+- /usr/local/include/
+- /usr/X11/include/
+ ${CMAKE_INCLUDE_PATH}/freetype2
- /usr/include/
- /usr/local/include/
- /usr/X11/include/
- NO_CMAKE_SYSTEM_PATH
- )
-
--FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
-+FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+ NO_CMAKE_SYSTEM_PATH
+ )
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
+- /usr/include/freetype2
+- /usr/local/include/freetype2
+- /usr/X11/include/freetype2
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+ ${CMAKE_INCLUDE_PATH}/freetype2
- /usr/include/freetype2
- /usr/local/include/freetype2
- /usr/X11/include/freetype2
+ ${FREETYPE_INCLUDE_DIR_FT2BUILD}
+ ${FREETYPE_INCLUDE_DIR_FT2BUILD}/freetype2
+ NO_CMAKE_SYSTEM_PATH
+@@ -43,7 +39,7 @@
+ SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped libfreetyped)
+ SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype libfreetype)
+
+-SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib /usr/X11/lib)
++SET(FREETYPE_LIB_PATHS)
+
+ FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE
+ ${FREETYPE_LIBRARY_NAMES_RELEASE}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131130/74c0cb84/attachment-0001.html>
More information about the macports-changes
mailing list