head	1.2;
access;
symbols
	pkgsrc-2014Q2:1.1.0.4
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.2
	pkgsrc-2014Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2014.08.10.10.02.51;	author adam;	state dead;
branches;
next	1.1;
commitid	3k71txEkMzjsENLx;

1.1
date	2014.03.22.08.39.10;	author markd;	state Exp;
branches;
next	;
commitid	YqVhrKi2AvUDIFtx;


desc
@@


1.2
log
@Changes 3.0.1:
We are pleased to announce the release of CMake 3.0.0. In CMake 3.0, the CMake language has been extended with *Bracket Argument* and *Bracket Comment* syntax inspired by Lua long bracket, and the CMake documentation has been converted to reStructuredText.

Furthermore, new "CodeLite" and "Kate" extra generators are available for use with the Makefile or Ninja generators. In addition, the "add_library()" command learned a new "INTERFACE" library type, the "export()" command learned a new "EXPORT" mode that retrieves the list of targets to export from an export set configured by the "install(TARGETS)" command "EXPORT" option, and the "project()" command learned to set some version variables to values specified by the new "VERSION" option or to empty strings.
@
text
@$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)
@


1.1
log
@fix check for freetype-2.5.1
Julian Ospald in http://www.cmake.org/Bug/view.php?id=14601
Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@