3 files changed, 42 insertions, 20 deletions

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index fa8badc78136..f59ffb8a98e8 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	20121226
+PORTVERSION=	20130110
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -26,9 +26,9 @@ WANT_PERL=	yes
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-GITDESC=	v0.4.0-rc1
-#GITREV!=	echo "${GITDESC}" | sed -E 's/^.*-g(.{7})$$/\1/'
-GITREV=	01a1316
+GITDESC=	v0.4.0-rc2-18-g8b61a55
+GITREV!=	echo "${GITDESC}" | sed -E 's/^.*-g(.{7})$$/\1/'
+#GITREV=	01a1316
 WRKSRC=	${WRKDIR}/${PORTNAME}-${GITREV}
 
 # Please note: the DEBUG option is *NOT* empty, it is utilised by
@@ -75,7 +75,7 @@ PLIST_SUB+=	ASPELL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	-2.7
+USE_PYTHON=	2.6-
 CMAKE_ARGS+=	-DBSD_PYTHON_CMD=${PYTHON_CMD} \
 		-DBSD_PYTHON_VER=${PYTHON_VERSION}
 PLIST_SUB+=	PYTHON=""
diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo
index 6cda5318c4a4..cd2d2c47dc77 100644
--- a/irc/weechat-devel/distinfo
+++ b/irc/weechat-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-devel-01a1316.tar.gz) = 099a4b60c76208557e52ae4ab28ff00bba0b9ba5737aa3650cd02ed08d53e8bf
-SIZE (weechat-devel-01a1316.tar.gz) = 2515079
+SHA256 (weechat-devel-8b61a55.tar.gz) = 118cbcafda8e86f9b85c3fef6093baa621c3a91029a204df58d06317e3fe41bb
+SIZE (weechat-devel-8b61a55.tar.gz) = 2521452
diff --git a/irc/weechat-devel/files/patch-cmake-FindPython_cmake b/irc/weechat-devel/files/patch-cmake-FindPython_cmake
index c5a6f8cb9858..af4844d5c914 100644
--- a/irc/weechat-devel/files/patch-cmake-FindPython_cmake
+++ b/irc/weechat-devel/files/patch-cmake-FindPython_cmake
@@ -1,23 +1,45 @@
---- 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 @@
+--- cmake/FindPython.cmake.orig	2013-01-11 00:10:37.730703018 +0000
++++ cmake/FindPython.cmake	2013-01-11 00:21:33.725664455 +0000
+@@ -33,17 +33,9 @@
+    SET(PYTHON_FIND_QUIETLY TRUE)
  ENDIF(PYTHON_FOUND)
  
- FIND_PROGRAM(PYTHON_EXECUTABLE
--  NAMES python2.7 python2.6 python2.5 python
--  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+-IF(ENABLE_PYTHON3)
+-  FIND_PROGRAM(PYTHON_EXECUTABLE
+-    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+-    )
+-ELSE(ENABLE_PYTHON3)
+-  FIND_PROGRAM(PYTHON_EXECUTABLE
+-    NAMES python2.7 python2.6 python2.5 python
+-    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+-    )
+-ENDIF(ENABLE_PYTHON3)
++FIND_PROGRAM(PYTHON_EXECUTABLE
 +  NAMES ${BSD_PYTHON_CMD}
-   )
++  )
  
  IF(PYTHON_EXECUTABLE)
-@@ -60,24 +59,12 @@
+   EXECUTE_PROCESS(
+@@ -65,32 +57,13 @@
+     NAMES Python.h
+     PATHS ${PYTHON_INC_DIR}
      )
- 
-   FIND_LIBRARY(PYTHON_LIBRARY
--    NAMES python2.7 python2.6 python2.5 python
+-  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}
+-      )
+-  ELSE(ENABLE_PYTHON3)
+-    FIND_LIBRARY(PYTHON_LIBRARY
+-      NAMES python2.7 python2.6 python2.5 python
+-      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+-      )
+-  ENDIF(ENABLE_PYTHON3)
++
++  FIND_LIBRARY(PYTHON_LIBRARY
 +    NAMES ${BSD_PYTHON_VER}
-     PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-     )
++    )
  
    IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
 -    EXECUTE_PROCESS(