rc/weechat: Update to 2.5

 - Add Guile support [1]

PR:		236152 [1]
Submitted by:	Jeremy "Vrakfall" Lecoc<jeremy artphotolaurent be> [1]

4 files changed, 35 insertions, 35 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 12868fc987c1..983008a4b785 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	irc
 MASTER_SITES=	https://weechat.org/files/src/
 
@@ -32,34 +32,35 @@ OPTIONS_SUB=		yes
 OPTIONS_EXCLUDE_powerpc64=	RUBY
 
 OPTIONS_GROUP=		PLUGINS
-OPTIONS_GROUP_PLUGINS=	ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON PHP RUBY TCL
+OPTIONS_GROUP_PLUGINS=	ASPELL CHARSET GUILE JAVASCRIPT LUA PERL PHP PYTHON RUBY TCL
 
 BACKTRACE_DESC=		Provide crash backtraces
 CA_BUNDLE_DESC=		Include CA bundle for certificate verification
 CHARSET_DESC=		Charset plugin (implies ICONV)
-ICON_DESC=		Desktop icon
+GUILE_DESC=		Guile script support
 HEADLESS_DESC=		Build headless weechat as well
+ICON_DESC=		Desktop icon
 JAVASCRIPT_DESC=	Javascript script support
 PLUGINS_DESC=		Weechat Plugins
 PYTHON_DESC=		Python script support
 RUBY_DESC=		Ruby script support
 
-.for _opt in ASPELL CHARSET ICONV JAVASCRIPT GNUTLS LUA NLS PERL PHP PYTHON RUBY TCL
+.for _opt in ${OPTIONS_GROUP_PLUGINS} BACKTRACE HEADLESS ICONV GNUTLS NLS
 ${_opt}_CMAKE_BOOL=	ENABLE_${_opt}
 .endfor
 
+ASPELL_CMAKE_BOOL=	ENABLE_SPELL
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
-BACKTRACE_CMAKE_BOOL=	ENABLE_BACKTRACE
 CA_BUNDLE_CMAKE_ON=	-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CHARSET_IMPLIES=	ICONV
 DOCS_CMAKE_BOOL=	ENABLE_DOC
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
-HEADLESS_CMAKE_BOOL=	ENABLE_HEADLESS
-ICONV_USES=		iconv
-JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=		pkgconfig
+GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
+ICONV_USES=		iconv
+JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
 LUA_USES=		lua pkgconfig
 MANPAGES_CMAKE_BOOL=	ENABLE_MAN
 MANPAGES_CMAKE_ON=	-DMANDIR=${MANPREFIX}/man
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index c50ac8d8ce5e..b9b681d7d423 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550403590
-SHA256 (weechat-2.4.tar.xz) = 86d626c58d666ca58ef4762ff60c24c89f4632d95ed401773d5584043d865c73
-SIZE (weechat-2.4.tar.xz) = 2044448
+TIMESTAMP = 1559903689
+SHA256 (weechat-2.5.tar.xz) = 52c87775c3ff9714a62cfa5b7e13e2fa59bf32829fe083781c1d9c7f1c2d4c27
+SIZE (weechat-2.5.tar.xz) = 2067180
diff --git a/irc/weechat/files/patch-CMakeLists.txt b/irc/weechat/files/patch-CMakeLists.txt
index 08267f59814b..f6977d4bc78e 100644
--- a/irc/weechat/files/patch-CMakeLists.txt
+++ b/irc/weechat/files/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
---- CMakeLists.txt.orig	2017-12-03 10:55:08 UTC
+--- CMakeLists.txt.orig	2019-06-06 18:43:20 UTC
 +++ CMakeLists.txt
-@@ -64,6 +64,10 @@ else()
-   set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+@@ -66,6 +66,10 @@ if(NOT DEFINED WEECHAT_LIBDIR)
+   set(WEECHAT_LIBDIR ${LIBDIR}/${PROJECT_NAME})
  endif()
  
 +if(NOT DEFINED LIBDATADIR)
@@ -11,22 +11,21 @@
  if(NOT DEFINED SHAREDIR)
    set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
  endif()
-@@ -88,12 +92,14 @@ option(ENABLE_GNUTLS     "Enable SSLv3/T
- option(ENABLE_LARGEFILE  "Enable Large File Support"                 ON)
- option(ENABLE_ALIAS      "Enable Alias plugin"                       ON)
- option(ENABLE_ASPELL     "Enable Aspell plugin"                      ON)
-+option(ENABLE_BACKTRACE  "Enable backtraces (via libexecinfo)"       ON)
- option(ENABLE_ENCHANT    "Enable Enchant lib for Aspell plugin"      OFF)
- option(ENABLE_BUFLIST    "Enable Buflist plugin"                     ON)
- option(ENABLE_CHARSET    "Enable Charset plugin"                     ON)
- option(ENABLE_EXEC       "Enable Exec plugin"                        ON)
- option(ENABLE_FIFO       "Enable FIFO plugin"                        ON)
- option(ENABLE_FSET       "Enable Fast Set plugin"                    ON)
-+option(ENABLE_ICONV      "Enable character conversion support"       ON)
- option(ENABLE_IRC        "Enable IRC plugin"                         ON)
- option(ENABLE_LOGGER     "Enable Logger plugin"                      ON)
- option(ENABLE_RELAY      "Enable Relay plugin"                       ON)
-@@ -170,6 +176,7 @@ endif()
+@@ -90,11 +94,13 @@ option(ENABLE_NLS           "Enable Native Language Su
+ option(ENABLE_GNUTLS        "Enable SSLv3/TLS support"                    ON)
+ option(ENABLE_LARGEFILE     "Enable Large File Support"                   ON)
+ option(ENABLE_ALIAS         "Enable Alias plugin"                         ON)
++option(ENABLE_BACKTRACE     "Enable backtraces (via libexecinfo)"         ON)
+ option(ENABLE_BUFLIST       "Enable Buflist plugin"                       ON)
+ option(ENABLE_CHARSET       "Enable Charset plugin"                       ON)
+ option(ENABLE_EXEC          "Enable Exec plugin"                          ON)
+ option(ENABLE_FIFO          "Enable FIFO plugin"                          ON)
+ option(ENABLE_FSET          "Enable Fast Set plugin"                      ON)
++option(ENABLE_ICONV         "Enable character conversion support"         ON)
+ option(ENABLE_IRC           "Enable IRC plugin"                           ON)
+ option(ENABLE_LOGGER        "Enable Logger plugin"                        ON)
+ option(ENABLE_RELAY         "Enable Relay plugin"                         ON)
+@@ -186,6 +192,7 @@ endif()
  # Check for libgcrypt
  find_package(GCRYPT REQUIRED)
  add_definitions(-DHAVE_GCRYPT)
@@ -34,7 +33,7 @@
  list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
  
  # Check for GnuTLS
-@@ -188,10 +195,12 @@ endif()
+@@ -204,10 +211,12 @@ endif()
  find_package(ZLIB REQUIRED)
  add_definitions(-DHAVE_ZLIB)
  
@@ -51,11 +50,11 @@
  endif()
  
  # Check for CURL
-@@ -250,7 +259,7 @@ set(exec_prefix "\${prefix}")
- set(libdir "\${exec_prefix}/lib")
+@@ -266,7 +275,7 @@ set(exec_prefix "\${prefix}")
+ string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
  set(includedir "\${prefix}/include")
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/pkgconfig)
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDATADIR}/pkgconfig)
  
  # cygport file (used to build Cygwin packages)
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index a393e1d2606b..02ba7870b707 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -30,7 +30,7 @@ libdata/pkgconfig/weechat.pc
 %%MANPAGES%%man/pl/man1/weechat-headless.1.gz
 %%MANPAGES%%man/ru/man1/weechat.1.gz
 %%MANPAGES%%man/ru/man1/weechat-headless.1.gz
-%%ASPELL%%lib/weechat/plugins/aspell.so
+%%ASPELL%%lib/weechat/plugins/spell.so
 %%CHARSET%%lib/weechat/plugins/charset.so
 %%JAVASCRIPT%%lib/weechat/plugins/javascript.so
 %%LUA%%lib/weechat/plugins/lua.so