irc/weechat: Update to v1.1.1

Changes:	https://weechat.org/files/changelog/ChangeLog-1.1.1.html

6 files changed, 50 insertions, 83 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index e9ea3e7eb711..b27ee09d4f18 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1.1
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/ \
 		http://perturb.me.uk/distfiles/weechat/:mandocs \
@@ -56,7 +55,8 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so.28:${PORTSDIR}/security/gnutls
 
 LUA_CMAKE_OFF=		-DENABLE_LUA=no
 LUA_CMAKE_ON=		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
-					-DBSD_LUA_INCDIR=${LUA_INCDIR}
+					-DBSD_LUA_INCDIR=${LUA_INCDIR} \
+					-DBSD_LUA_VER=${LUA_VER}
 LUA_USES=			lua:51
 
 NLS_CMAKE_OFF=		-DENABLE_NLS=no
@@ -127,5 +127,9 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/docs/* ${STAGEDIR}${DOCSDIR}/
 .endif
 	${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses
+# Make build fail to be able to take the generated manpages/docs from the archived wrkdir
+.if defined(MAINTAINER_MODE) && defined(MAINTAINER_BREAK_BUILD)
+	@${FALSE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 4646453cd437..73146b0ef75c 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,6 +1,6 @@
-SHA256 (weechat-1.0.1.tar.gz) = 3f53b6dd17f1e62d86b100a81f6f7c8b8e0e7eb2670b62b4640a6e7b60a4c653
-SIZE (weechat-1.0.1.tar.gz) = 3237820
-SHA256 (weechat-1.0.1-docs.txz) = e721f8a9253920efbb7faa95c609713427e340fd1ef2b94ccf9897353f55bd77
-SIZE (weechat-1.0.1-docs.txz) = 748792
-SHA256 (weechat-1.0.1-manpages.txz) = 1a3df3d71ddce57be9b222a832bf146f2ab5115ea60773408121a8286ad97cee
-SIZE (weechat-1.0.1-manpages.txz) = 13380
+SHA256 (weechat-1.1.1.tar.gz) = a32f7e57d5e834195bacaffa874419b4a9d17cd42883c80d7ecb9fadbf601349
+SIZE (weechat-1.1.1.tar.gz) = 3294132
+SHA256 (weechat-1.1.1-docs.txz) = efb8f40e7e389b80420067889062215ac0a4636f80c55d573e9f235939abaa61
+SIZE (weechat-1.1.1-docs.txz) = 726876
+SHA256 (weechat-1.1.1-manpages.txz) = efcce2d00462371a9f9a47af1b5586dcac23e79542ad8b2340677ea37c20426b
+SIZE (weechat-1.1.1-manpages.txz) = 13288
diff --git a/irc/weechat/files/patch-cmake-FindLua_cmake b/irc/weechat/files/patch-cmake-FindLua_cmake
index 96c797b980c7..c2cfc822af09 100644
--- a/irc/weechat/files/patch-cmake-FindLua_cmake
+++ b/irc/weechat/files/patch-cmake-FindLua_cmake
@@ -1,56 +1,9 @@
---- cmake/FindLua.cmake.orig	2014-09-29 21:49:22.725682010 +0100
-+++ cmake/FindLua.cmake	2014-09-29 22:06:18.215011520 +0100
-@@ -35,14 +35,12 @@
- 
- find_path(
-         LUA51_INCLUDE_PATH lua.h
--        PATHS /usr/include /usr/local/include /usr/pkg/include
--        PATH_SUFFIXES lua51 lua5.1 lua-5.1
-+		PATHS ${BSD_LUA_INCDIR}
- )
- 
- find_library(
--        LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
--        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
--        PATH_SUFFIXES lua51 lua5.1 lua-5.1
-+        LUA51_LIBRARY NAMES lua lua-5.1
-+		PATHS ${BSD_LUA_LIBDIR}
- )
- 
- if(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-@@ -50,34 +48,11 @@
-   set(LUA_LIBRARY "${LUA51_LIBRARY}")
-   set(LUA_VERSION "5.1")
-   set(LUA_FOUND TRUE)
--else()
--  find_path(
--        LUA50_INCLUDE_PATH lua.h
--        PATHS /usr/include /usr/local/include /usr/pkg/include
--        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
--  )
--  find_library(
--        LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
--        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
--        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
--  )
--  find_library(
--        LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
--        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
--        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
--  )
--  if(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
--    set(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}")
--    set(LUA_LIBRARY "${LUA50_LIBRARY}")
--    set(LUALIB_LIBRARY "${LUALIB50_LIBRARY}")
--    set(LUA_VERSION "5.0")
--    set(LUA_FOUND TRUE)
--  endif()
+--- cmake/FindLua.cmake.orig	2015-01-12 09:12:09.922611844 +0000
++++ cmake/FindLua.cmake	2015-01-12 09:23:01.083607077 +0000
+@@ -35,5 +35,5 @@
+ 
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+-  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
++  pkg_search_module(LUA lua-${BSD_LUA_VER})
  endif()
- 
- mark_as_advanced(
-   LUA_INCLUDE_PATH
-   LUA_LIBRARY
--  LUALIB_LIBRARY
-+#  LUALIB_LIBRARY
- #  LUA_VERSION
- )
diff --git a/irc/weechat/files/patch-cmake-FindPython_cmake b/irc/weechat/files/patch-cmake-FindPython_cmake
index 178d063a03d3..26198ccef360 100644
--- a/irc/weechat/files/patch-cmake-FindPython_cmake
+++ b/irc/weechat/files/patch-cmake-FindPython_cmake
@@ -1,5 +1,5 @@
---- cmake/FindPython.cmake.orig	2014-09-29 22:07:54.174485838 +0100
-+++ cmake/FindPython.cmake	2014-09-29 22:13:00.475191375 +0100
+--- cmake/FindPython.cmake.orig	2015-01-12 09:23:34.292562072 +0000
++++ cmake/FindPython.cmake	2015-01-12 09:32:04.954526522 +0000
 @@ -33,17 +33,9 @@
     set(PYTHON_FIND_QUIETLY TRUE)
  endif()
@@ -16,30 +16,42 @@
 -    )
 -endif()
 +find_program(PYTHON_EXECUTABLE
-+	NAMES ${BSD_PYTHON_CMD}
-+	)
++   NAMES ${BSD_PYTHON_CMD}
++   )
  
  if(PYTHON_EXECUTABLE)
    execute_process(
-@@ -65,32 +57,13 @@
+@@ -52,11 +44,6 @@
+     )
+ 
+   execute_process(
+-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
+-    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
+-    )
+-
+-  execute_process(
+     COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
+     OUTPUT_VARIABLE PYTHON_LFLAGS
+     )
+@@ -65,32 +52,13 @@
      NAMES Python.h
-     PATHS ${PYTHON_INC_DIR}
+     HINTS ${PYTHON_INC_DIR}
      )
 -  if(ENABLE_PYTHON3)
 -    find_library(PYTHON_LIBRARY
 -      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
--      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+-      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
 -      )
 -  else()
 -    find_library(PYTHON_LIBRARY
 -      NAMES python2.7 python2.6 python2.5 python
--      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+-      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
 -      )
 -  endif()
 +
 +  find_library(PYTHON_LIBRARY
 +    NAMES ${BSD_PYTHON_VER}
-+    )
++  	)
  
    if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
 -    execute_process(
diff --git a/irc/weechat/files/patch-cmake-FindRuby_cmake b/irc/weechat/files/patch-cmake-FindRuby_cmake
index ec6512f30d6f..7aa81a5abf3c 100644
--- a/irc/weechat/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat/files/patch-cmake-FindRuby_cmake
@@ -1,5 +1,5 @@
---- cmake/FindRuby.cmake.orig	2014-09-29 22:14:17.584653052 +0100
-+++ cmake/FindRuby.cmake	2014-09-29 22:18:39.115247583 +0100
+--- cmake/FindRuby.cmake.orig	2015-01-12 09:32:28.592525659 +0000
++++ cmake/FindRuby.cmake	2015-01-12 09:49:05.649456415 +0000
 @@ -31,22 +31,16 @@
     set(RUBY_FIND_QUIETLY TRUE)
  endif()
@@ -16,7 +16,7 @@
    find_program(RUBY_EXECUTABLE
 -    NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
 -    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-+    NAMES ${BSD_RUBY_CMD}
++	NAMES ${BSD_RUBY_CMD}
      )
    if(RUBY_EXECUTABLE)
      execute_process(
@@ -39,15 +39,13 @@
        OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
        )
      find_path(RUBY_INCLUDE_DIRS
-@@ -67,9 +61,8 @@
+@@ -67,8 +61,7 @@
        )
      set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
      find_library(RUBY_LIB
 -      NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
 -      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
--      )
-+      NAMES ${BSD_RUBY_VER}
-+	  )
++		NAMES ${BSD_RUBY_VER}
+       )
      if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
        set(RUBY_FOUND TRUE)
-     endif()
diff --git a/irc/weechat/files/patch-cmake-FindTCL_cmake b/irc/weechat/files/patch-cmake-FindTCL_cmake
index 6757226aecd4..f5091cbad70d 100644
--- a/irc/weechat/files/patch-cmake-FindTCL_cmake
+++ b/irc/weechat/files/patch-cmake-FindTCL_cmake
@@ -1,5 +1,5 @@
---- cmake/FindTCL.cmake.orig	2014-09-29 22:19:32.084542773 +0100
-+++ cmake/FindTCL.cmake	2014-09-29 22:22:19.254589245 +0100
+--- cmake/FindTCL.cmake.orig	2015-01-12 09:49:31.591454833 +0000
++++ cmake/FindTCL.cmake	2015-01-12 09:52:04.595540774 +0000
 @@ -55,97 +55,18 @@
    set(TCL_FIND_QUIETLY TRUE)
  endif()