- Update to 20120707

- Add SASL option to enable SASL authentication support
- Use devel/ncurses as it provides ability for 256 color support for
  ncursesw
- Remove support for devel/lua50 (upstream removing it shortly)
- Remove 'Enable' from option descriptions

Approved by:	flo (mentor)

7 files changed, 43 insertions, 74 deletions

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 21177f27c89c..1b21c4261e8f 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weechat
-PORTVERSION=	20120610
+PORTVERSION=	20120707
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -22,32 +22,33 @@ CONFLICTS=	weechat-0.3*
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
-WITH_NCURSES_BASE=	yes
+WITH_NCURSES_PORT=	yes
 USE_CMAKE=	yes
+CMAKE_ARGS+=	-DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 WANT_PERL=	yes
 
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 
-GITREV=	9c5116b
+GITREV=	92aa9bf
 WRKSRC=	${WRKDIR}/${PORTNAME}-${GITREV}
 
 # Please note: the DEBUG option is *NOT* empty, it is utilised by
 # bsd.cmake.mk to set the cmake build type to Debug instead of
 # Release.
 
-OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION
+OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL
 OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG
 
-BACKTRACE_DESC=	Enable crash backtraces
-CHARSET_DESC=	Enable charset conversion support
+BACKTRACE_DESC=	Provide crash backtraces
+CHARSET_DESC=	Charset conversion support
 DOCUMENTATION_DESC=	Build and install documentation
-GUILE_DESC=	Enable Guile scripting support
-LUA_DESC=	Enable Lua scripting support
-PERL_DESC=	Enable Perl scripting support
-PYTHON_DESC=	Enable Python scripting support
-RUBY_DESC=	Enable Ruby scripting support
-TCL_DESC=	Enable Tcl scripting support
+GUILE_DESC=	Guile scripting support
+LUA_DESC=	Lua scripting support
+PERL_DESC=	Perl scripting support
+PYTHON_DESC=	Python scripting support
+RUBY_DESC=	Ruby scripting support
+TCL_DESC=	Tcl scripting support
 
 .include <bsd.port.options.mk>
 
@@ -121,9 +122,8 @@ PLIST_SUB+=	TCL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-USE_LUA=	5.0+
-CMAKE_ARGS+=	-DBSD_LUA_VER=${LUA_VER} \
-		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
+USE_LUA=	5.1+
+CMAKE_ARGS+=	-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
 		-DBSD_LUA_INCDIR=${LUA_INCDIR}
 PLIST_SUB+=	LUA=""
 .else
@@ -153,6 +153,14 @@ PLIST_SUB+=	DOCUMENTATION="@comment "
 LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
 .endif
 
+.if ${PORT_OPTIONS:MSASL}
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
+PLIST_SUB+=	SASL=""
+.else
+CMAKE_ARGS+=	-DENABLE_SASL=no
+PLIST_SUB+=	SASL="@comment "
+.endif
+
 MAN1=	weechat-curses.1
 
 post-patch:
diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo
index 8fe4f376fc38..29d132cba9f8 100644
--- a/irc/weechat-devel/distinfo
+++ b/irc/weechat-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-devel-9c5116b.tar.gz) = 7367e72ab1134f8651ca0200791291ae47e9366d39ac93536f211eafabfe62d9
-SIZE (weechat-devel-9c5116b.tar.gz) = 2213501
+SHA256 (weechat-devel-92aa9bf.tar.gz) = accf76561ea0192c968d3094ad6ebdf35d1e72caeb9b374ccd1529b13ca18adf
+SIZE (weechat-devel-92aa9bf.tar.gz) = 2229030
diff --git a/irc/weechat-devel/files/patch-cmake-FindLua_cmake b/irc/weechat-devel/files/patch-cmake-FindLua_cmake
index 820b311b2195..a0adcb5157d3 100644
--- a/irc/weechat-devel/files/patch-cmake-FindLua_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindLua_cmake
@@ -1,6 +1,6 @@
---- cmake/FindLua.cmake.orig	2010-12-10 15:13:27.000000000 +0000
-+++ cmake/FindLua.cmake	2010-12-12 04:00:45.000000000 +0000
-@@ -33,51 +33,24 @@
+--- cmake/FindLua.cmake.orig	2012-07-07 11:41:16.000000000 +0000
++++ cmake/FindLua.cmake	2012-07-08 09:00:30.126123501 +0000
+@@ -33,51 +33,18 @@
     SET(LUA_FIND_QUIETLY TRUE)
  ENDIF(LUA_FOUND)
  
@@ -25,7 +25,8 @@
 -  SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}")
 -  SET(LUA_LIBRARY "${LUA51_LIBRARY}")
 -  SET(LUA_VERSION "5.1")
--  SET(LUA_FOUND TRUE)
++IF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
+   SET(LUA_FOUND TRUE)
 -ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
 -  FIND_PATH(
 -        LUA50_INCLUDE_PATH lua.h
@@ -53,14 +54,7 @@
 -    SET(LUA_FOUND TRUE)
 -  ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
 -ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-+SET(LUA_VERSION ${BSD_LUA_VER})
-+
-+IF(LUA_VERSION STREQUAL "5.0")
-+  SET(LUALIB_LIBRARY ${LUA_LIBRARY})
-+ENDIF(LUA_VERSION STREQUAL "5.0")
- 
-+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
-+  SET(LUA_FOUND TRUE)
+-
 +ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
  
  MARK_AS_ADVANCED(
diff --git a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
index 46ea01f4c0c3..8488e3070cda 100644
--- a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
@@ -1,18 +1,18 @@
---- cmake/FindRuby.cmake.orig	2011-11-21 17:12:47.000000000 +0000
-+++ cmake/FindRuby.cmake	2011-11-22 21:04:12.114830585 +0000
+--- cmake/FindRuby.cmake.orig	2012-07-06 10:35:11.000000000 +0000
++++ cmake/FindRuby.cmake	2012-07-07 04:50:51.807510722 +0000
 @@ -32,13 +32,12 @@
  ENDIF(RUBY_FOUND)
  
  FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+-  NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
 -  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
 +  NAMES ${BSD_RUBY_CMD}
    )
  
  IF(RUBY_EXECUTABLE)
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']"
      OUTPUT_VARIABLE RUBY_ARCH_DIR
      )
  
@@ -20,23 +20,24 @@
      )
  
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib'"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::TOPDIR + '/lib'"
      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
      )
  
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
 +    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']"
      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
      )
  
-@@ -78,7 +77,7 @@
+@@ -71,8 +70,7 @@
      "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
  
    FIND_LIBRARY(RUBY_LIBRARY
--    NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+-    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 ruby1.6 ruby16 ruby
+-    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
 +    NAMES ${BSD_RUBY_VER}
-     PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
      )
  
+   IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
diff --git a/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt b/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt
deleted file mode 100644
index 0ba9c2e07910..000000000000
--- a/irc/weechat-devel/files/patch-src-gui-curses-CMakeLists_txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/curses/CMakeLists.txt.orig	2011-08-18 04:19:10.997333389 +0100
-+++ src/gui/curses/CMakeLists.txt	2011-08-18 04:19:56.348074585 +0100
-@@ -38,7 +38,7 @@
- 
- FIND_PACKAGE(Ncurses)
- IF(NCURSES_FOUND)
--  CHECK_INCLUDE_FILES(ncursesw/ncurses.h NCURSESW_HEADERS)
-+  CHECK_INCLUDE_FILES(ncurses.h NCURSESW_HEADERS)
-   IF(NCURSESW_HEADERS)
-     ADD_DEFINITIONS(-DHAVE_NCURSESW_CURSES_H)
-   ELSE(NCURSESW_HEADERS)
diff --git a/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h b/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h
deleted file mode 100644
index c813607047fc..000000000000
--- a/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gui/curses/gui-curses.h.orig	2011-08-17 14:08:18.000000000 +0100
-+++ src/gui/curses/gui-curses.h	2011-08-18 05:02:47.647960373 +0100
-@@ -23,7 +23,8 @@
- #include <time.h>
- 
- #ifdef HAVE_NCURSESW_CURSES_H
--#include <ncursesw/ncurses.h>
-+#define _XOPEN_SOURCE_EXTENDED 1
-+#include <ncurses.h>
- #elif HAVE_NCURSES_H
- #include <ncurses.h>
- #else
diff --git a/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c b/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c
deleted file mode 100644
index 1d07c9c78616..000000000000
--- a/irc/weechat-devel/files/patch-src-gui-curses-gui_curses_term_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/curses/gui-curses-term.c.orig	2011-08-18 04:25:40.510233646 +0100
-+++ src/gui/curses/gui-curses-term.c	2011-08-18 04:25:55.436405801 +0100
-@@ -26,7 +26,7 @@
- #endif
- 
- #ifdef HAVE_NCURSESW_CURSES_H
--#include <ncursesw/term.h>
-+#include <term.h>
- #else
- #include <term.h>
- #endif