6 files changed, 56 insertions, 15 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index c10a1f19d3ad..a311afa00509 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -6,32 +6,38 @@
 #
 
 PORTNAME=	weechat
-PORTVERSION=	0.3.5
+PORTVERSION=	0.3.6
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A lightweight and user friendly ncurse based IRC client
 
+LICENSE=	GPLv3
+
+CONFLICTS=	weechat-devel-0.*
+
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
+USE_NCURSES=	yes
+WITH_NCURSES_BASE=	yes
 USE_CMAKE=	yes
 CMAKE_USE_PTHREAD=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 WANT_PERL=	yes
 
-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	\
-		CHARSET		"Charset support."		On	\
-		DEBUG		"Debugging."			Off	\
-		BACKTRACE	"Backtraces."			Off	\
-		ASPELL		"Spell checking."		Off	\
-		GNUTLS		"GNU TLS."			Off	\
-		NLS		"NLS support."			On	\
-		DOCUMENTATION	"Build documentation."		Off
+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	\
+		CHARSET		"Charset support"		On	\
+		DEBUG		"Debugging"			Off	\
+		BACKTRACE	"Backtraces"			Off	\
+		ASPELL		"Spell checking"		Off	\
+		GNUTLS		"GNU TLS"			Off	\
+		NLS		"NLS support"			On	\
+		DOCUMENTATION	"Build documentation"		Off
 
 .include <bsd.port.options.mk>
 
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index bf7bdad165a3..8e3ffdfb37a0 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.3.5.tar.gz) = 32de7764ab4d19a87ca15adba246bf6a9ef626df162c205287843ec57e8e6fce
-SIZE (weechat-0.3.5.tar.gz) = 2913550
+SHA256 (weechat-0.3.6.tar.gz) = ee3401e31d38e37bd03468655de03f78e60deaf7e71f317d5fc0fba1a8020581
+SIZE (weechat-0.3.6.tar.gz) = 3101349
diff --git a/irc/weechat/files/patch-src-gui-curses-CMakeLists_txt b/irc/weechat/files/patch-src-gui-curses-CMakeLists_txt
new file mode 100644
index 000000000000..0ba9c2e07910
--- /dev/null
+++ b/irc/weechat/files/patch-src-gui-curses-CMakeLists_txt
@@ -0,0 +1,11 @@
+--- 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/files/patch-src-gui-curses-gui_curses_h b/irc/weechat/files/patch-src-gui-curses-gui_curses_h
new file mode 100644
index 000000000000..c813607047fc
--- /dev/null
+++ b/irc/weechat/files/patch-src-gui-curses-gui_curses_h
@@ -0,0 +1,12 @@
+--- 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/files/patch-src-gui-curses-gui_curses_term_c b/irc/weechat/files/patch-src-gui-curses-gui_curses_term_c
new file mode 100644
index 000000000000..1d07c9c78616
--- /dev/null
+++ b/irc/weechat/files/patch-src-gui-curses-gui_curses_term_c
@@ -0,0 +1,11 @@
+--- 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
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index b721fbe3865c..d6abd04950f0 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -34,6 +34,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.pl.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_tester.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_tester.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_tester.fr.html