4 files changed, 68 insertions, 37 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 038fc8675224..a12545102e28 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	weechat
-PORTVERSION=	0.3.7
+PORTVERSION=	0.3.8
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	jase@FreeBSD.org
 COMMENT=	A lightweight and user friendly ncurse based IRC client
 
 LICENSE=	GPLv3
@@ -24,39 +24,39 @@ 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	\
-		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
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+
+OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION
+OPTIONS_DEFAULT=CHARSET
+
+BACKTRACE_DESC=	Enable crash backtraces
+CHARSET_DESC=	Enable 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
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_CHARSET)
+.if ${PORT_OPTIONS:MCHARSET}
+PLIST_SUB+=	CHARSET=""
+.else
 CMAKE_ARGS+=	-DENABLE_CHARSET=no
 PLIST_SUB+=	CHARSET="@comment "
-.else
-PLIST_SUB+=	CHARSET=""
 .endif
 
-.if defined(WITHOUT_NLS)
-CMAKE_ARGS+=	-DENABLE_NLS=no
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DENABLE_NLS=no
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_ASPELL)
+.if ${PORT_OPTIONS:MASPELL}
 BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 PLIST_SUB+=	ASPELL=""
 .else
@@ -64,7 +64,7 @@ CMAKE_ARGS+=	-DENABLE_ASPELL=no
 PLIST_SUB+=	ASPELL="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	-2.7
 CMAKE_ARGS+=	-DBSD_PYTHON_CMD=${PYTHON_CMD} \
 		-DBSD_PYTHON_VER=${PYTHON_VERSION}
@@ -74,7 +74,7 @@ CMAKE_ARGS+=	-DENABLE_PYTHON=no
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if defined(WITH_RUBY)
+.if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=	yes
 CMAKE_ARGS+=	-DBSD_RUBY_CMD=${RUBY} \
 		-DBSD_RUBY_VER=${RUBY_NAME}
@@ -84,13 +84,13 @@ CMAKE_ARGS+=	-DENABLE_RUBY=no
 PLIST_SUB+=	RUBY="@comment "
 .endif
 
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .else
 CMAKE_ARGS+=	-DENABLE_GNUTLS=no
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 PLIST_SUB+=	PERL=""
 .else
@@ -98,7 +98,7 @@ CMAKE_ARGS+=	-DENABLE_PERL=no
 PLIST_SUB+=	PERL="@comment "
 .endif
 
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
 USE_TCL=	83+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CMAKE_ARGS+=	-DBSD_TCL_VER=${TCL_VER} \
@@ -110,7 +110,7 @@ CMAKE_ARGS+=	-DENABLE_TCL=no
 PLIST_SUB+=	TCL="@comment "
 .endif
 
-.if defined(WITH_LUA)
+.if ${PORT_OPTIONS:MLUA}
 USE_LUA=	5.0+
 CMAKE_ARGS+=	-DBSD_LUA_VER=${LUA_VER} \
 		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
@@ -121,7 +121,16 @@ CMAKE_ARGS+=	-DENABLE_LUA=no
 PLIST_SUB+=	LUA="@comment "
 .endif
 
-.if defined(WITH_DOCUMENTATION)
+.if ${PORT_OPTIONS:MGUILE}
+IGNORE=		guile support currently causes a segfault on exit. Please re-run 'make config' and disable GUILE
+LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+PLIST_SUB+=	GUILE=""
+.else
+CMAKE_ARGS+=	-DENABLE_GUILE=no
+PLIST_SUB+=	GUILE="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDOCUMENTATION}
 BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc
 BUILD_DEPENDS+=	source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
 PLIST_SUB+=	DOCUMENTATION=""
@@ -130,8 +139,8 @@ CMAKE_ARGS+=	-DENABLE_DOC=no
 PLIST_SUB+=	DOCUMENTATION="@comment "
 .endif
 
-.if defined(WITH_BACKTRACE)
-LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+.if ${PORT_OPTIONS:MBACKTRACE}
+LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
 .endif
 
 MAN1=	weechat-curses.1
@@ -142,7 +151,7 @@ post-patch:
 .for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${f}
 .endfor
-.if defined(WITHOUT_BACKTRACE)
+.if empty(PORT_OPTIONS:MBACKTRACE)
 	@${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 0a9f51028738..520499b5e832 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.3.7.tar.gz) = d4cede0aeb8e3709cc0f2c3af788381d23c365a4e40b428b7a39da5c3af4f0ae
-SIZE (weechat-0.3.7.tar.gz) = 3458650
+SHA256 (weechat-0.3.8.tar.gz) = 4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e
+SIZE (weechat-0.3.8.tar.gz) = 3517366
diff --git a/irc/weechat/files/patch-cmake-FindPython_cmake b/irc/weechat/files/patch-cmake-FindPython_cmake
new file mode 100644
index 000000000000..bf80f23b1fe0
--- /dev/null
+++ b/irc/weechat/files/patch-cmake-FindPython_cmake
@@ -0,0 +1,21 @@
+--- cmake/FindPython.cmake.orig	2010-12-20 18:43:34.102131358 +0000
++++ cmake/FindPython.cmake	2010-12-20 19:16:11.918184057 +0000
+@@ -34,8 +34,7 @@
+ ENDIF(PYTHON_FOUND)
+ 
+ FIND_PROGRAM(PYTHON_EXECUTABLE
+-  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
++  NAMES ${BSD_PYTHON_CMD}
+   )
+ 
+ IF(PYTHON_EXECUTABLE)
+@@ -65,7 +64,7 @@
+     )
+   
+   FIND_LIBRARY(PYTHON_LIBRARY
+-    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
++    NAMES ${BSD_PYTHON_VER}
+     PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+     )
+ 
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index d0f10b90aaa1..7ddb1a07c816 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -20,6 +20,7 @@ libdata/pkgconfig/weechat.pc
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.fr.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.it.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_faq.ja.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.pl.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.fr.html