Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Jul 2018 11:27:25 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474852 - in head/irc/weechat: . files
Message-ID:  <201807181127.w6IBRPHd023144@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Wed Jul 18 11:27:24 2018
New Revision: 474852
URL: https://svnweb.freebsd.org/changeset/ports/474852

Log:
  irc/weechat: Fix build errors
  
   - doesn't know about TCL 8.7 yet
   - requires PHP installed during configure
  
  Submitted by:	fluffy

Added:
  head/irc/weechat/files/patch-cmake_FindTCL.cmake   (contents, props changed)
Modified:
  head/irc/weechat/Makefile

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Wed Jul 18 11:15:31 2018	(r474851)
+++ head/irc/weechat/Makefile	Wed Jul 18 11:27:24 2018	(r474852)
@@ -66,9 +66,11 @@ MANPAGES_CMAKE_ON=	-DMANDIR=${MANPREFIX}/man
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
 NLS_USES=		gettext
 PERL_USES=		perl5
-PHP_USES=		php:embed
+PHP_USES=		php:build,embed
 PYTHON_USES=		python
 RUBY_USE=		ruby=yes
+TCL_CMAKE_ON=		-DTCL_VERSION:STRING="${TCL_VER}" \
+			-DTCL_TCLSH:PATH="${TCLSH}"
 TCL_USES=		tcl:85+
 
 .include <bsd.port.pre.mk>

Added: head/irc/weechat/files/patch-cmake_FindTCL.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/weechat/files/patch-cmake_FindTCL.cmake	Wed Jul 18 11:27:24 2018	(r474852)
@@ -0,0 +1,18 @@
+--- cmake/FindTCL.cmake.orig	2018-07-14 10:35:10 UTC
++++ cmake/FindTCL.cmake
+@@ -99,6 +99,7 @@ endif()
+ 
+ find_library(TCL_LIBRARY
+   NAMES
++  tcl87 tcl8.7
+   tcl86 tcl8.6
+   tcl85 tcl8.5
+   tcl
+@@ -128,6 +129,7 @@ set(TCL_POSSIBLE_INCLUDE_PATHS
+   /usr/local/include
+   /usr/include/tcl${TCL_VERSION}
+   /usr/local/include/tcl${TCL_VERSION}
++  /usr/local/include/tcl8.7
+   /usr/local/include/tcl8.6
+   /usr/local/include/tcl8.5
+   )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807181127.w6IBRPHd023144>