From owner-svn-ports-all@FreeBSD.ORG Wed Aug 15 15:19:34 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BBF31065676; Wed, 15 Aug 2012 15:19:34 +0000 (UTC) (envelope-from jase@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 86AA78FC1F; Wed, 15 Aug 2012 15:19:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7FFJYOT072021; Wed, 15 Aug 2012 15:19:34 GMT (envelope-from jase@svn.freebsd.org) Received: (from jase@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FFJYY9072019; Wed, 15 Aug 2012 15:19:34 GMT (envelope-from jase@svn.freebsd.org) Message-Id: <201208151519.q7FFJYY9072019@svn.freebsd.org> From: Jase Thew Date: Wed, 15 Aug 2012 15:19:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302581 - head/irc/weechat X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 15:19:34 -0000 Author: jase Date: Wed Aug 15 15:19:33 2012 New Revision: 302581 URL: http://svn.freebsd.org/changeset/ports/302581 Log: - Make dependency on devel/ncurses optional [1] - Fix SASL option and its description Requested by: Peter Jeremy [1] Approved by: flo (mentor) Modified: head/irc/weechat/Makefile (contents, props changed) Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Wed Aug 15 14:28:31 2012 (r302580) +++ head/irc/weechat/Makefile Wed Aug 15 15:19:33 2012 (r302581) @@ -7,7 +7,7 @@ PORTNAME= weechat PORTVERSION= 0.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ @@ -21,15 +21,13 @@ 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 SASL +OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION SASL COLOR256 OPTIONS_DEFAULT=CHARSET BACKTRACE_DESC= Provide crash backtraces @@ -41,6 +39,8 @@ PERL_DESC= Perl scripting support PYTHON_DESC= Python scripting support RUBY_DESC= Ruby scripting support TCL_DESC= Tcl scripting support +SASL_DESC= SASL with DH-Blowfish support +COLOR256_DESC= Use ncurses port for 256 color support .include @@ -150,10 +150,15 @@ LIB_DEPENDS+= execinfo:${PORTSDIR}/devel LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt PLIST_SUB+= SASL="" .else -CMAKE_ARGS+= -DENABLE_SASL=no +CMAKE_ARGS+= -DENABLE_GCRYPT=no PLIST_SUB+= SASL="@comment " .endif +.if ${PORT_OPTIONS:MCOLOR256} +WITH_NCURSES_PORT= yes +CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses +.endif + MAN1= weechat-curses.1 post-patch: @@ -166,6 +171,17 @@ post-patch: @${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt .endif +pre-configure: +.if ${PORT_OPTIONS:MCOLOR256} + @${ECHO_MSG} "" + @${ECHO_MSG} "==> You have selected the ncurses 256 color option. Please ensure that" + @${ECHO_MSG} "==> the devel/ncurses port is built with the EXTCOLORS option enabled." + @${ECHO_MSG} "==>" + @${ECHO_MSG} "==> Press CTRL-C now if you would like to re-configure." + @${ECHO_MSG} "" + @sleep 5 +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1