1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

- Add SASL option to enable SASL authentication support

- Use devel/ncurses as it provides ability for 256 color support for
  ncursesw
- Fix Lua support when used with devel/lua50
- Remove 'Enable' from option descriptions

Approved by:	flo (mentor)
This commit is contained in:
Jase Thew 2012-07-11 12:05:12 +00:00
parent 058e28006d
commit b82d10cf68
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=300767
5 changed files with 31 additions and 54 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= weechat
PORTVERSION= 0.3.8
PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://weechat.org/files/src/
@ -20,24 +21,26 @@ CONFLICTS= weechat-devel-0.*
USE_ICONV= yes
USE_LDCONFIG= yes
USE_NCURSES= yes
WITH_NCURSES_PORT= yes
USE_CMAKE= yes
CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
WANT_PERL= yes
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION
OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION SASL
OPTIONS_DEFAULT=CHARSET
BACKTRACE_DESC= Enable crash backtraces
CHARSET_DESC= Enable charset conversion support
BACKTRACE_DESC= Provide crash backtraces
CHARSET_DESC= 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
GUILE_DESC= Guile scripting support
LUA_DESC= Lua scripting support
PERL_DESC= Perl scripting support
PYTHON_DESC= Python scripting support
RUBY_DESC= Ruby scripting support
TCL_DESC= Tcl scripting support
.include <bsd.port.options.mk>
@ -143,6 +146,14 @@ PLIST_SUB+= DOCUMENTATION="@comment "
LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
.endif
.if ${PORT_OPTIONS:MSASL}
LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt
PLIST_SUB+= SASL=""
.else
CMAKE_ARGS+= -DENABLE_SASL=no
PLIST_SUB+= SASL="@comment "
.endif
MAN1= weechat-curses.1
post-patch:

View File

@ -1,6 +1,6 @@
--- cmake/FindLua.cmake.orig 2010-12-10 15:13:27.000000000 +0000
+++ cmake/FindLua.cmake 2010-12-12 04:00:45.000000000 +0000
@@ -33,51 +33,24 @@
--- cmake/FindLua.cmake.orig 2012-07-06 10:35:11.000000000 +0000
+++ cmake/FindLua.cmake 2012-07-07 23:45:24.258581623 +0000
@@ -33,51 +33,25 @@
SET(LUA_FIND_QUIETLY TRUE)
ENDIF(LUA_FOUND)
@ -37,8 +37,13 @@
- LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
- PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
- )
-
+IF(BSD_LUA_VER VERSION_EQUAL "5.0")
+ FIND_LIBRARY(LUALIB_LIBRARY
+ NAMES lualib
+ PATHS ${BSD_LUA_LIBDIR}
)
+ENDIF(BSD_LUA_VER VERSION_EQUAL "5.0")
- FIND_LIBRARY(
- LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
@ -53,12 +58,7 @@
- SET(LUA_FOUND TRUE)
- ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
-ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
+SET(LUA_VERSION ${BSD_LUA_VER})
+
+IF(LUA_VERSION STREQUAL "5.0")
+ SET(LUALIB_LIBRARY ${LUA_LIBRARY})
+ENDIF(LUA_VERSION STREQUAL "5.0")
-
+IF(LUA_INCLUDE_PATH AND LUA_LIBRARY)
+ SET(LUA_FOUND TRUE)
+ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY)

View File

@ -1,11 +0,0 @@
--- 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)

View File

@ -1,12 +0,0 @@
--- 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

View File

@ -1,11 +0,0 @@
--- 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