- Update to 20120205 (0.3.7-rc1)

PR:		164807
Submitted by:	Jase Thew <freebsd@beardz.net> (maintainer)

4 files changed, 30 insertions, 15 deletions

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 64f668edb1fa..cb07d72777c6 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	weechat
-PORTVERSION=	20111023
+PORTVERSION=	20120205
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	weechat-devel-71bef80ce2c6dfc944972fcc93b3db46fcffb283
+DISTNAME=	weechat-devel-a2002f6
 
 MAINTAINER=	freebsd@beardz.net
 COMMENT=	A lightweight and user friendly ncurse based IRC client
@@ -27,11 +27,14 @@ USE_CMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 WANT_PERL=	yes
 
+LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+
 OPTIONS=	RUBY		"Ruby scripting support"	Off	\
 		PYTHON		"Python scripting support"	Off	\
 		PERL		"Perl scripting support"	Off	\
 		TCL		"TCL scripting support"		Off	\
 		LUA		"Lua scripting support"		Off	\
+		GUILE		"Guile scripting support"	Off	\
 		CHARSET		"Charset support"		On	\
 		BACKTRACE	"Backtraces"			On	\
 		DEBUG		"Debugging"			On	\
@@ -40,7 +43,7 @@ OPTIONS=	RUBY		"Ruby scripting support"	Off	\
 		NLS		"NLS support"			On	\
 		DOCUMENTATION	"Build documentation"		Off
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-71bef80
+WRKSRC=	${WRKDIR}/${PORTNAME}-a2002f6
 
 .include <bsd.port.options.mk>
 
@@ -124,9 +127,18 @@ CMAKE_ARGS+=	-DENABLE_LUA=no
 PLIST_SUB+=	LUA="@comment "
 .endif
 
+.if defined(WITH_GUILE)
+IGNORE=		guile support currently causes a segfault on exit. Please re-run 'make config' and disable GUILE
+LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
+PLIST_SUB+=	GUILE=""
+.else
+CMAKE_ARGS+=	-DENABLE_GUILE=no
+PLIST_SUB+=	GUILE="@comment "
+.endif
+
 .if defined(WITH_DOCUMENTATION)
 BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc
-BUILD_DEPENDS+=	source-highlight:${PORTSDIR}/textproc/source-highlight
+BUILD_DEPENDS+=	source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
 PLIST_SUB+=	DOCUMENTATION=""
 .else
 CMAKE_ARGS+=	-DENABLE_DOC=no
diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo
index b6851b0e1ff6..3d60519e242e 100644
--- a/irc/weechat-devel/distinfo
+++ b/irc/weechat-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-devel-71bef80ce2c6dfc944972fcc93b3db46fcffb283.tar.gz) = e9ab15b75d4c7c94c310bfed1671bbc082f4095949144c70d5509848c7709f03
-SIZE (weechat-devel-71bef80ce2c6dfc944972fcc93b3db46fcffb283.tar.gz) = 1951214
\ No newline at end of file
+SHA256 (weechat-devel-a2002f6.tar.gz) = ffadabd7c48da0a3d152e50d3534838935b5d19d4fbc1f3e7d605deea7983a50
+SIZE (weechat-devel-a2002f6.tar.gz) = 2085747
diff --git a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
index 05a378acb002..46ea01f4c0c3 100644
--- a/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindRuby_cmake
@@ -1,5 +1,5 @@
---- cmake/FindRuby.cmake.orig	2011-01-18 19:54:43.825973597 +0000
-+++ cmake/FindRuby.cmake	2011-01-18 19:57:33.943672013 +0000
+--- cmake/FindRuby.cmake.orig	2011-11-21 17:12:47.000000000 +0000
++++ cmake/FindRuby.cmake	2011-11-22 21:04:12.114830585 +0000
 @@ -32,13 +32,12 @@
  ENDIF(RUBY_FOUND)
  
@@ -11,8 +11,8 @@
  
  IF(RUBY_EXECUTABLE)
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['topdir']"
+-    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']"
      OUTPUT_VARIABLE RUBY_ARCH_DIR
      )
  
@@ -20,14 +20,14 @@
      )
  
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::TOPDIR + '/lib'"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib'"
      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
      )
-   
+ 
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::TOPDIR + '/lib/ruby/' + Config::CONFIG['ruby_version']"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']"
      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
      )
  
diff --git a/irc/weechat-devel/pkg-plist b/irc/weechat-devel/pkg-plist
index d6abd04950f0..18b4fe083a25 100644
--- a/irc/weechat-devel/pkg-plist
+++ b/irc/weechat-devel/pkg-plist
@@ -15,6 +15,7 @@ libdata/pkgconfig/weechat.pc
 %%PYTHON%%lib/weechat/plugins/python.so
 %%RUBY%%lib/weechat/plugins/ruby.so
 %%TCL%%lib/weechat/plugins/tcl.so
+%%DOCUMENTATION%%share/doc/weechat/weechat_dev.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.fr.html
@@ -25,11 +26,13 @@ libdata/pkgconfig/weechat.pc
 %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.it.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.en.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.es.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.fr.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.ja.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.it.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.pl.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.ru.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_relay_protocol.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.fr.html