- Update to 20120918 (0.3.9-rc2)

Approved by:	flo (mentor)

4 files changed, 27 insertions, 12 deletions

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 8196d2a8c2c5..c26f6c3b4c76 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weechat
-PORTVERSION=	20120903
+PORTVERSION=	20120918
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -31,7 +31,7 @@ WANT_PERL=	yes
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-GITREV=	3635652
+GITREV=	34c9a06
 WRKSRC=	${WRKDIR}/${PORTNAME}-${GITREV}
 
 # Please note: the DEBUG option is *NOT* empty, it is utilised by
diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo
index 888edf6141f3..ed22f9322a21 100644
--- a/irc/weechat-devel/distinfo
+++ b/irc/weechat-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-devel-3635652.tar.gz) = 3b37a053e824b9539ea22fac6ee3f92e6fca767cc452690b65232b83789ca55b
-SIZE (weechat-devel-3635652.tar.gz) = 2424529
+SHA256 (weechat-devel-34c9a06.tar.gz) = 3b4ae223df063c1ca38522e58195c9f932390c49fe277481dec4345d9220e825
+SIZE (weechat-devel-34c9a06.tar.gz) = 2441631
diff --git a/irc/weechat-devel/files/patch-cmake-FindPython_cmake b/irc/weechat-devel/files/patch-cmake-FindPython_cmake
index d883e68e4072..c5a6f8cb9858 100644
--- a/irc/weechat-devel/files/patch-cmake-FindPython_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindPython_cmake
@@ -1,5 +1,5 @@
---- cmake/FindPython.cmake.orig	2012-09-03 15:43:03.205462582 +0100
-+++ cmake/FindPython.cmake	2012-09-03 15:46:06.564072755 +0100
+--- cmake/FindPython.cmake.orig	2012-09-18 20:21:00.000000000 +0100
++++ cmake/FindPython.cmake	2012-09-19 17:28:30.968900751 +0100
 @@ -34,8 +34,7 @@
  ENDIF(PYTHON_FOUND)
  
@@ -10,7 +10,7 @@
    )
  
  IF(PYTHON_EXECUTABLE)
-@@ -60,11 +59,11 @@
+@@ -60,24 +59,12 @@
      )
  
    FIND_LIBRARY(PYTHON_LIBRARY
@@ -19,8 +19,21 @@
      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
      )
  
--  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-+  IF(0)
-     EXECUTE_PROCESS(
-       COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
-       OUTPUT_VARIABLE PYTHON_VERSION
+   IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+-    EXECUTE_PROCESS(
+-      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+-      OUTPUT_VARIABLE PYTHON_VERSION
+-      )
+-    EXECUTE_PROCESS(
+-      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"
+-      OUTPUT_VARIABLE PYTHON_OLD_VERSION
+-      )
+-    IF(${PYTHON_OLD_VERSION} STREQUAL "True")
+-      MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}")
+-    ELSE()
+-      SET(PYTHON_FOUND TRUE)
+-    ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True")
++    SET(PYTHON_FOUND TRUE)
+   ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+ 
+   MARK_AS_ADVANCED(
diff --git a/irc/weechat-devel/pkg-plist b/irc/weechat-devel/pkg-plist
index fe351a8893b3..6402dae24aa4 100644
--- a/irc/weechat-devel/pkg-plist
+++ b/irc/weechat-devel/pkg-plist
@@ -11,6 +11,7 @@ lib/weechat/plugins/xfer.so
 libdata/pkgconfig/weechat.pc
 %%ASPELL%%lib/weechat/plugins/aspell.so
 %%CHARSET%%lib/weechat/plugins/charset.so
+%%GUILE%%lib/weechat/plugins/guile.so
 %%LUA%%lib/weechat/plugins/lua.so
 %%PERL%%lib/weechat/plugins/perl.so
 %%PYTHON%%lib/weechat/plugins/python.so
@@ -39,6 +40,7 @@ libdata/pkgconfig/weechat.pc
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.fr.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.it.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_scripting.ja.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.pl.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_tester.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_tester.en.html