From owner-svn-ports-all@FreeBSD.ORG Fri Oct 18 21:50:46 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ABAD45D7; Fri, 18 Oct 2013 21:50:46 +0000 (UTC) (envelope-from jase@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 828C62087; Fri, 18 Oct 2013 21:50:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ILok8n035209; Fri, 18 Oct 2013 21:50:46 GMT (envelope-from jase@svn.freebsd.org) Received: (from jase@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ILojKv035205; Fri, 18 Oct 2013 21:50:45 GMT (envelope-from jase@svn.freebsd.org) Message-Id: <201310182150.r9ILojKv035205@svn.freebsd.org> From: Jase Thew Date: Fri, 18 Oct 2013 21:50:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330776 - head/irc/weechat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 18 Oct 2013 21:50:46 -0000 Author: jase Date: Fri Oct 18 21:50:45 2013 New Revision: 330776 URL: http://svnweb.freebsd.org/changeset/ports/330776 Log: - Update to 0.4.2 - Convert to latest LIB_DEPENDS format - Add STAGE support - Fix whitespace nits - Revise pkg-descr to reflect reality - WeeChat client is ncurses only and other front-ends will connect to the ncurses client - Add MANPAGES option along with pre-built manpages for all supported languages Changes: http://www.weechat.org/files/changelog/ChangeLog-0.4.2.html Modified: head/irc/weechat/Makefile head/irc/weechat/distinfo head/irc/weechat/pkg-descr head/irc/weechat/pkg-plist Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Fri Oct 18 21:35:18 2013 (r330775) +++ head/irc/weechat/Makefile Fri Oct 18 21:50:45 2013 (r330776) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ @@ -19,12 +18,12 @@ USES= cmake iconv CMAKE_ARGS+= -DENABLE_GUILE=no CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl \ - gcrypt:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \ - GNUTLS NLS DOCUMENTATION COLOR256 ICON -OPTIONS_DEFAULT=CHARSET + GNUTLS NLS DOCUMENTATION COLOR256 ICON MANPAGES +OPTIONS_DEFAULT=CHARSET MANPAGES BACKTRACE_DESC= Provide crash backtraces CHARSET_DESC= Charset conversion support @@ -37,7 +36,6 @@ TCL_DESC= Tcl scripting support COLOR256_DESC= Use ncurses port for 256 color support ICON_DESC= Desktop icon -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCHARSET} @@ -84,7 +82,7 @@ PLIST_SUB+= RUBY="@comment " .endif .if ${PORT_OPTIONS:MGNUTLS} -USES+= pkgconfig +USES+= pkgconfig LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls .else CMAKE_ARGS+= -DENABLE_GNUTLS=no @@ -121,23 +119,46 @@ PLIST_SUB+= LUA="@comment " .endif .if ${PORT_OPTIONS:MDOCUMENTATION} -BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc -BUILD_DEPENDS+= source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight +BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc \ + source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight +CMAKE_ARGS+= -DENABLE_DOC=yes PLIST_SUB+= DOCUMENTATION="" .else CMAKE_ARGS+= -DENABLE_DOC=no PLIST_SUB+= DOCUMENTATION="@comment " .endif +.if ${PORT_OPTIONS:MMANPAGES} +.if defined(MAINTAINER_MODE) +BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ + docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl +.if empty(PORT_OPTIONS:MDOCUMENTATION) +BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc \ + source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight +.endif +CMAKE_ARGS+= -DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man +.else +MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:man/} +MASTER_SITE_SUBDIR+= jase/weechat/:man +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ + ${DISTNAME}-manpages.tar.gz:man +CMAKE_ARGS+= -DENABLE_MAN=no +.endif +PLIST_SUB+= MANPAGES="" +.else +CMAKE_ARGS+= -DENABLE_MAN=no +PLIST_SUB+= MANPAGES="@comment" +.endif + .if ${PORT_OPTIONS:MBACKTRACE} LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo .endif .if ${PORT_OPTIONS:MCOLOR256} -USES+= ncurses:port +USES+= ncurses:port CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses .else -USES+= ncurses +USES+= ncurses .endif .if ${PORT_OPTIONS:MICON} @@ -146,8 +167,6 @@ PLIST_SUB+= ICON="" PLIST_SUB+= ICON="@comment " .endif -MAN1= weechat-curses.1 - post-patch: @${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|INSTALL|#INSTALL|' ${WRKSRC}/doc/CMakeLists.txt @@ -173,6 +192,13 @@ pre-configure: .endif post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1 +.if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE) + ${INSTALL_MAN} ${WRKDIR}/manpages/weechat.1 ${STAGEDIR}${PREFIX}/man/man1 +.for f in de fr it ja + @${MKDIR} ${STAGEDIR}${PREFIX}/man/${f}/man1 + ${INSTALL_MAN} ${WRKDIR}/manpages/${f}/weechat.1 ${STAGEDIR}${PREFIX}/man/${f}/man1 +.endfor +.endif + ${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses .include Modified: head/irc/weechat/distinfo ============================================================================== --- head/irc/weechat/distinfo Fri Oct 18 21:35:18 2013 (r330775) +++ head/irc/weechat/distinfo Fri Oct 18 21:50:45 2013 (r330776) @@ -1,2 +1,4 @@ -SHA256 (weechat-0.4.1.tar.gz) = 3c110a1397ab1f1e2a7cf80b8900e2c02ea01f80e4b09ef7954706916e05563f -SIZE (weechat-0.4.1.tar.gz) = 2567828 +SHA256 (weechat-0.4.2.tar.gz) = 3bb9964ef776183adab9513b7e3662170039aaccab21eb71cfbeac494694d70f +SIZE (weechat-0.4.2.tar.gz) = 2729241 +SHA256 (weechat-0.4.2-manpages.tar.gz) = 1a52d8585e8ffabee048e4f1a0fd122d324ab1bae3d90d1ddf113828e815c7df +SIZE (weechat-0.4.2-manpages.tar.gz) = 6511 Modified: head/irc/weechat/pkg-descr ============================================================================== --- head/irc/weechat/pkg-descr Fri Oct 18 21:35:18 2013 (r330775) +++ head/irc/weechat/pkg-descr Fri Oct 18 21:50:45 2013 (r330776) @@ -1,6 +1,5 @@ -WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC -client. Everything can be done with a keyboard, and it is customizable -and extensible with scripts. For the moment, only ncurse GUI is -supported by this port. +WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC +client. Everything can be done with a keyboard, and it is customizable +and extensible with scripts. WWW: http://weechat.org Modified: head/irc/weechat/pkg-plist ============================================================================== --- head/irc/weechat/pkg-plist Fri Oct 18 21:35:18 2013 (r330775) +++ head/irc/weechat/pkg-plist Fri Oct 18 21:50:45 2013 (r330776) @@ -1,3 +1,4 @@ +bin/weechat bin/weechat-curses include/weechat/weechat-plugin.h lib/weechat/plugins/alias.so @@ -9,6 +10,11 @@ lib/weechat/plugins/rmodifier.so lib/weechat/plugins/script.so lib/weechat/plugins/xfer.so libdata/pkgconfig/weechat.pc +%%MANPAGES%%man/man1/weechat.1.gz +%%MANPAGES%%man/de/man1/weechat.1.gz +%%MANPAGES%%man/fr/man1/weechat.1.gz +%%MANPAGES%%man/it/man1/weechat.1.gz +%%MANPAGES%%man/ja/man1/weechat.1.gz %%ASPELL%%lib/weechat/plugins/aspell.so %%CHARSET%%lib/weechat/plugins/charset.so %%LUA%%lib/weechat/plugins/lua.so @@ -63,8 +69,15 @@ libdata/pkgconfig/weechat.pc %%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo +%%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo @dirrmtry lib/weechat/plugins @dirrmtry lib/weechat +%%MANPAGES%%@dirrmtry man/it/man1 +%%MANPAGES%%@dirrmtry man/it +%%MANPAGES%%@dirrmtry man/fr/man1 +%%MANPAGES%%@dirrmtry man/fr +%%MANPAGES%%@dirrmtry man/de/man1 +%%MANPAGES%%@dirrmtry man/de %%DOCUMENTATION%%@dirrmtry share/doc/weechat %%ICON%%@dirrmtry share/icons/hicolor/32x32/apps %%ICON%%@dirrmtry share/icons/hicolor/32x32