Date: Wed, 15 Aug 2012 15:22:04 +0000 (UTC) From: Jase Thew <jase@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302582 - in head/irc/weechat-devel: . files Message-ID: <201208151522.q7FFM43a072354@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Wed Aug 15 15:22:04 2012 New Revision: 302582 URL: http://svn.freebsd.org/changeset/ports/302582 Log: - Update to 20120808 - Make dependency on devel/ncurses optional [1] - Fix SASL option and its description - Add secondary master site Requested by: Peter Jeremy <peter@rulingia.com> [1] Approved by: flo (mentor) Modified: head/irc/weechat-devel/Makefile (contents, props changed) head/irc/weechat-devel/distinfo (contents, props changed) head/irc/weechat-devel/files/patch-cmake-FindPython_cmake (contents, props changed) head/irc/weechat-devel/pkg-plist (contents, props changed) Modified: head/irc/weechat-devel/Makefile ============================================================================== --- head/irc/weechat-devel/Makefile Wed Aug 15 15:19:33 2012 (r302581) +++ head/irc/weechat-devel/Makefile Wed Aug 15 15:22:04 2012 (r302582) @@ -6,9 +6,11 @@ # PORTNAME= weechat -PORTVERSION= 20120707 +PORTVERSION= 20120808 CATEGORIES= irc -MASTER_SITES= http://perturb.me.uk/distfiles/ +MASTER_SITES= http://perturb.me.uk/distfiles/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= jase PKGNAMESUFFIX= -devel DISTNAME= weechat-devel-${GITREV} @@ -22,22 +24,20 @@ CONFLICTS= weechat-0.3* 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 -GITREV= 92aa9bf +GITREV= 3c615a9 WRKSRC= ${WRKDIR}/${PORTNAME}-${GITREV} # Please note: the DEBUG option is *NOT* empty, it is utilised by # bsd.cmake.mk to set the cmake build type to Debug instead of # Release. -OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL +OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL COLOR256 OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG BACKTRACE_DESC= Provide crash backtraces @@ -49,6 +49,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 <bsd.port.options.mk> @@ -157,10 +159,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: @@ -173,6 +180,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} "==> Ctrl-C now if you'd like to reconfigure." + @${ECHO_MSG} "" + @sleep 5 +.endif + post-install: ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1 Modified: head/irc/weechat-devel/distinfo ============================================================================== --- head/irc/weechat-devel/distinfo Wed Aug 15 15:19:33 2012 (r302581) +++ head/irc/weechat-devel/distinfo Wed Aug 15 15:22:04 2012 (r302582) @@ -1,2 +1,2 @@ -SHA256 (weechat-devel-92aa9bf.tar.gz) = accf76561ea0192c968d3094ad6ebdf35d1e72caeb9b374ccd1529b13ca18adf -SIZE (weechat-devel-92aa9bf.tar.gz) = 2229030 +SHA256 (weechat-devel-3c615a9.tar.gz) = f0ef85a540e887819d58649008d68ae42f10b20d57a61138a2a37a0d8d4b0095 +SIZE (weechat-devel-3c615a9.tar.gz) = 2340064 Modified: head/irc/weechat-devel/files/patch-cmake-FindPython_cmake ============================================================================== --- head/irc/weechat-devel/files/patch-cmake-FindPython_cmake Wed Aug 15 15:19:33 2012 (r302581) +++ head/irc/weechat-devel/files/patch-cmake-FindPython_cmake Wed Aug 15 15:22:04 2012 (r302582) @@ -1,10 +1,10 @@ ---- cmake/FindPython.cmake.orig 2010-12-20 18:43:34.102131358 +0000 -+++ cmake/FindPython.cmake 2010-12-20 19:16:11.918184057 +0000 +--- cmake/FindPython.cmake.orig 2012-08-11 14:06:55.086663842 +0100 ++++ cmake/FindPython.cmake 2012-08-11 14:23:55.301504695 +0100 @@ -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 +- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin + NAMES ${BSD_PYTHON_CMD} ) @@ -12,9 +12,9 @@ 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 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python + NAMES ${BSD_PYTHON_VER} PATHS ${PYTHON_POSSIBLE_LIB_PATH} ) Modified: head/irc/weechat-devel/pkg-plist ============================================================================== --- head/irc/weechat-devel/pkg-plist Wed Aug 15 15:19:33 2012 (r302581) +++ head/irc/weechat-devel/pkg-plist Wed Aug 15 15:22:04 2012 (r302582) @@ -48,6 +48,7 @@ libdata/pkgconfig/weechat.pc %%DOCUMENTATION%%share/doc/weechat/weechat_user.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html +%%DOCUMENTATION%%share/doc/weechat/weechat_user.ja.html %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208151522.q7FFM43a072354>