Sat Mar 22 08:39:10 2014 UTC ()
fix check for freetype-2.5.1
Julian Ospald in http://www.cmake.org/Bug/view.php?id=14601
Bump PKGREVISION


(markd)
diff -r1.86 -r1.87 pkgsrc/devel/cmake/Makefile
diff -r1.55 -r1.56 pkgsrc/devel/cmake/distinfo
diff -r0 -r1.1 pkgsrc/devel/cmake/patches/patch-Modules_FindFreetype.cmake
cvs diff -r1.86 -r1.87 pkgsrc/devel/cmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cmake/Makefile 2014/03/14 22:47:44 1.86
+++ pkgsrc/devel/cmake/Makefile 2014/03/22 08:39:10 1.87
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.86 2014/03/14 22:47:44 asau Exp $ 1# $NetBSD: Makefile,v 1.87 2014/03/22 08:39:10 markd Exp $
2 2
3DISTNAME= cmake-${CMAKE_API}.12.2 3DISTNAME= cmake-${CMAKE_API}.12.2
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/ 6MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
7 7
8CMAKE_API= 2.8 8CMAKE_API= 2.8
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://www.cmake.org/ 11HOMEPAGE= http://www.cmake.org/
12COMMENT= Cross platform make 12COMMENT= Cross platform make
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_NCURSES= wsyncup 17USE_NCURSES= wsyncup
cvs diff -r1.55 -r1.56 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2014/02/01 11:14:06 1.55
+++ pkgsrc/devel/cmake/distinfo 2014/03/22 08:39:10 1.56
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.55 2014/02/01 11:14:06 adam Exp $ 1$NetBSD: distinfo,v 1.56 2014/03/22 08:39:10 markd Exp $
2 2
3SHA1 (cmake-2.8.12.2.tar.gz) = cca70b307aa32a6a32c72e01fdfcecc84c1c2690 3SHA1 (cmake-2.8.12.2.tar.gz) = cca70b307aa32a6a32c72e01fdfcecc84c1c2690
4RMD160 (cmake-2.8.12.2.tar.gz) = ee92327c3870f3ae2ea997d0258b0ef141e90525 4RMD160 (cmake-2.8.12.2.tar.gz) = ee92327c3870f3ae2ea997d0258b0ef141e90525
5Size (cmake-2.8.12.2.tar.gz) = 6068231 bytes 5Size (cmake-2.8.12.2.tar.gz) = 6068231 bytes
6SHA1 (patch-CMakeLists.txt) = a37825ad9d1704b9cb716a52148c637d26733898 6SHA1 (patch-CMakeLists.txt) = a37825ad9d1704b9cb716a52148c637d26733898
 7SHA1 (patch-Modules_FindFreetype.cmake) = 7868ab96cadc011ccb16205382a3cbfa3d159f32
7SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a 8SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
8SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 9SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
9SHA1 (patch-Source_kwsys_SystemInformation.cxx) = ee7f56c0f9c4c096e8b7488c7f34cb32ae02a047 10SHA1 (patch-Source_kwsys_SystemInformation.cxx) = ee7f56c0f9c4c096e8b7488c7f34cb32ae02a047
10SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c 11SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
11SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b 12SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
12SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502 13SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
13SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508 14SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508
File Added: pkgsrc/devel/cmake/patches/Attic/patch-Modules_FindFreetype.cmake
$NetBSD: patch-Modules_FindFreetype.cmake,v 1.1 2014/03/22 08:39:10 markd Exp $

fix check for freetype-2.5.1
Julian Ospald in http://www.cmake.org/Bug/view.php?id=14601

--- Modules/FindFreetype.cmake.orig	2013-11-05 19:07:22.000000000 +0000
+++ Modules/FindFreetype.cmake
@@ -70,6 +70,19 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
   PATH_SUFFIXES include/freetype2 include
 )
 
+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
+  find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+    HINTS
+      ENV FREETYPE_DIR
+    PATHS
+      /usr/X11R6
+      /usr/local/X11R6
+      /usr/local/X11
+      /usr/freeware
+    PATH_SUFFIXES include/freetype2 include
+  )
+endif()
+
 find_library(FREETYPE_LIBRARY
   NAMES freetype libfreetype freetype219
   HINTS
@@ -91,8 +104,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND FRE
 endif()
 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
 
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
+endif()
+
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
+    file(STRINGS "${FREETYPE_H}" freetype_version_str
          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
 
     unset(FREETYPE_VERSION_STRING)