svn commit: r523523 - in head/devel/cmake: . files

[Tobias C. Berner]

Author: tcberner
Date: Sun Jan 19 09:26:54 2020
New Revision: 523523
URL: https://svnweb.freebsd.org/changeset/ports/523523

Log:
  devel/cmake: Make Flex find module look in ${LOCALBASE}
  
  PR:		243068
  Reported by:	yuri

Added:
  head/devel/cmake/files/patch-Modules_FindFLEX.cmake   (contents, props changed)
Modified:
  head/devel/cmake/Makefile

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Sun Jan 19 09:26:33 2020	(r523522)
+++ head/devel/cmake/Makefile	Sun Jan 19 09:26:54 2020	(r523523)
@@ -4,7 +4,7 @@
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
 DISTVERSION=	3.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
 		https://www.cmake.org/files/v${PORTVERSION}/
@@ -85,6 +85,8 @@ post-patch:
 		${WRKSRC}/Modules/FindKDE4.cmake
 	@${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \
 		${WRKSRC}/Modules/FindDCMTK.cmake
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/Modules/FindFLEX.cmake
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete
 
 # cmake-gui(1) is installed by devel/cmake-gui. Remove the man page's source to

Added: head/devel/cmake/files/patch-Modules_FindFLEX.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cmake/files/patch-Modules_FindFLEX.cmake	Sun Jan 19 09:26:54 2020	(r523523)
@@ -0,0 +1,20 @@
+--- Modules/FindFLEX.cmake.orig	2020-01-19 09:02:30 UTC
++++ Modules/FindFLEX.cmake
+@@ -103,10 +103,15 @@ find_program(FLEX_EXECUTABLE NAMES flex win_flex DOC "
+ mark_as_advanced(FLEX_EXECUTABLE)
+ 
+ find_library(FL_LIBRARY NAMES fl
+-  DOC "Path to the fl library")
++  DOC "Path to the fl library"
++  PATHS %%LOCALBASE%%/lib
++  )
+ 
+ find_path(FLEX_INCLUDE_DIR FlexLexer.h
+-  DOC "Path to the flex headers")
++  DOC "Path to the flex headers"
++  PATHS %%LOCALBASE%%/include
++  PATH_SUFFIXES flex
++  )
+ 
+ mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR)
+