Date: Fri, 24 May 2013 14:16:47 +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: r318973 - head/irc/weechat Message-ID: <201305241416.r4OEGl82045133@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Fri May 24 14:16:47 2013 New Revision: 318973 URL: http://svnweb.freebsd.org/changeset/ports/318973 Log: - Update to 0.4.1 - Support for guile scripting module has been disabled. WeeChat now requires guile >= 2.0 and there is currently no guile 2.x port available in the Ports Collection While I am here: - Fix whitespace nits - Fix typo in COMMENT Changes: http://www.weechat.org/files/changelog/ChangeLog-0.4.1.html Modified: head/irc/weechat/Makefile head/irc/weechat/distinfo head/irc/weechat/pkg-plist Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Fri May 24 14:15:06 2013 (r318972) +++ head/irc/weechat/Makefile Fri May 24 14:16:47 2013 (r318973) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 0.4.0 -PORTREVISION= 2 +PORTVERSION= 0.4.1 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ MAINTAINER= jase@FreeBSD.org -COMMENT= A lightweight and user friendly ncurse based IRC client +COMMENT= A lightweight and user friendly ncurses based IRC client LICENSE= GPLv3 @@ -16,25 +15,27 @@ CONFLICTS= weechat-devel-0.* USE_LDCONFIG= yes USES= cmake iconv +CMAKE_ARGS+= -DENABLE_GUILE=no CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib WANT_PERL= yes LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl \ gcrypt:${PORTSDIR}/security/libgcrypt -OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE ASPELL GNUTLS NLS DOCUMENTATION COLOR256 +OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ + GNUTLS NLS DOCUMENTATION COLOR256 ICON OPTIONS_DEFAULT=CHARSET BACKTRACE_DESC= Provide crash backtraces CHARSET_DESC= Charset conversion support DOCUMENTATION_DESC= Build and install documentation -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 COLOR256_DESC= Use ncurses port for 256 color support +ICON_DESC= Desktop icon .include <bsd.port.options.mk> @@ -62,7 +63,7 @@ PLIST_SUB+= ASPELL="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= -2.7 +USE_PYTHON= 2.6- CMAKE_ARGS+= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ -DBSD_PYTHON_VER=${PYTHON_VERSION} PLIST_SUB+= PYTHON="" @@ -82,6 +83,7 @@ PLIST_SUB+= RUBY="@comment " .endif .if ${PORT_OPTIONS:MGNUTLS} +USES+= pkgconfig LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls .else CMAKE_ARGS+= -DENABLE_GNUTLS=no @@ -117,14 +119,6 @@ CMAKE_ARGS+= -DENABLE_LUA=no PLIST_SUB+= LUA="@comment " .endif -.if ${PORT_OPTIONS:MGUILE} -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 @@ -145,6 +139,12 @@ CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LO USES+= ncurses .endif +.if ${PORT_OPTIONS:MICON} +PLIST_SUB+= ICON="" +.else +PLIST_SUB+= ICON="@comment " +.endif + MAN1= weechat-curses.1 post-patch: @@ -156,17 +156,20 @@ post-patch: .if empty(PORT_OPTIONS:MBACKTRACE) @${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt .endif +.if empty(PORT_OPTIONS:MICON) + @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt +.endif -pre-configure: -.if ${PORT_OPTIONS:MCOLOR256} +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 + @${ECHO_MSG} "==> the devel/ncurses port is built with the EXTCOLORS option enabled." + @${ECHO_MSG} "==>" + @${ECHO_MSG} "==> Press Ctrl-C now if you want to re-configure." + @${ECHO_MSG} "" + @sleep 5 +.endif post-install: ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1 Modified: head/irc/weechat/distinfo ============================================================================== --- head/irc/weechat/distinfo Fri May 24 14:15:06 2013 (r318972) +++ head/irc/weechat/distinfo Fri May 24 14:16:47 2013 (r318973) @@ -1,2 +1,2 @@ -SHA256 (weechat-0.4.0.tar.gz) = aca5ad1547653cbe5b672ffc41417a2a51c41c132b78ec5a9d6aad50959d5d9e -SIZE (weechat-0.4.0.tar.gz) = 2527783 +SHA256 (weechat-0.4.1.tar.gz) = 3c110a1397ab1f1e2a7cf80b8900e2c02ea01f80e4b09ef7954706916e05563f +SIZE (weechat-0.4.1.tar.gz) = 2567828 Modified: head/irc/weechat/pkg-plist ============================================================================== --- head/irc/weechat/pkg-plist Fri May 24 14:15:06 2013 (r318972) +++ head/irc/weechat/pkg-plist Fri May 24 14:16:47 2013 (r318973) @@ -11,7 +11,6 @@ lib/weechat/plugins/xfer.so libdata/pkgconfig/weechat.pc %%ASPELL%%lib/weechat/plugins/aspell.so %%CHARSET%%lib/weechat/plugins/charset.so -%%GUILE%%lib/weechat/plugins/guile.so %%LUA%%lib/weechat/plugins/lua.so %%PERL%%lib/weechat/plugins/perl.so %%PYTHON%%lib/weechat/plugins/python.so @@ -53,6 +52,7 @@ libdata/pkgconfig/weechat.pc %%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.ja.html +%%ICON%%share/icons/hicolor/32x32/apps/weechat.png %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo @@ -66,4 +66,8 @@ libdata/pkgconfig/weechat.pc @dirrmtry lib/weechat/plugins @dirrmtry lib/weechat %%DOCUMENTATION%%@dirrmtry share/doc/weechat +%%ICON%%@dirrmtry share/icons/hicolor/32x32/apps +%%ICON%%@dirrmtry share/icons/hicolor/32x32 +%%ICON%%@dirrmtry share/icons/hicolor +%%ICON%%@dirrmtry share/icons @dirrm include/weechat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305241416.r4OEGl82045133>