Date: Sat, 19 Oct 2013 02:40:28 +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: r330833 - in head/irc/weechat-devel: . files Message-ID: <201310190240.r9J2eSCH000471@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Sat Oct 19 02:40:28 2013 New Revision: 330833 URL: http://svnweb.freebsd.org/changeset/ports/330833 Log: - Update to 20131015 (0.4.3-dev) - 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 Deleted: head/irc/weechat-devel/files/weechat.1.in head/irc/weechat-devel/pkg-install Modified: head/irc/weechat-devel/Makefile head/irc/weechat-devel/distinfo head/irc/weechat-devel/pkg-descr head/irc/weechat-devel/pkg-plist Modified: head/irc/weechat-devel/Makefile ============================================================================== --- head/irc/weechat-devel/Makefile Sat Oct 19 02:38:15 2013 (r330832) +++ head/irc/weechat-devel/Makefile Sat Oct 19 02:40:28 2013 (r330833) @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 20130921 +PORTVERSION= 20131015 CATEGORIES= irc MASTER_SITES= http://perturb.me.uk/distfiles/ \ ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= jase +MASTER_SITE_SUBDIR= jase/weechat-devel PKGNAMESUFFIX= -devel DISTNAME= weechat-devel-${GITREV} @@ -14,6 +14,8 @@ COMMENT= A lightweight and user friendly LICENSE= GPLv3 +UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} + CONFLICTS= weechat-0.3* USE_LDCONFIG= yes @@ -21,10 +23,10 @@ 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 -GITDESC= v0.4.2-rc2-1-g0249666 +GITDESC= v0.4.2-16-g88058bb GITREV!= echo "${GITDESC}" | sed -E 's/^.*-g(.{7})$$/\1/' WRKSRC= ${WRKDIR}/${PORTNAME}-${GITREV} @@ -33,8 +35,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${GITREV} # Release. OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE DEBUG ASPELL \ - GNUTLS NLS DOCUMENTATION COLOR256 ICON -OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG + GNUTLS NLS DOCUMENTATION COLOR256 ICON MANPAGES +OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG MANPAGES BACKTRACE_DESC= Provide crash backtraces CHARSET_DESC= Charset conversion support @@ -47,7 +49,6 @@ TCL_DESC= Tcl scripting support COLOR256_DESC= Use ncurses port for 256 color support ICON_DESC= Desktop icon -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCHARSET} @@ -140,6 +141,28 @@ 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-devel/:man +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ + weechat-devel-20131015-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 @@ -157,20 +180,6 @@ PLIST_SUB+= ICON="" PLIST_SUB+= ICON="@comment " .endif -.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 -.else -CMAKE_ARGS+= -DENABLE_MAN=no -.endif - -MAN1= weechat.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 @@ -196,13 +205,14 @@ pre-configure: @sleep 5 .endif -post-build: -.if defined(MAINTAINER_MODE) - ${CP} ${WRKSRC}/doc/en/weechat.1 ${FILESDIR}/weechat.1.new -.endif - post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${INSTALL_MAN} ${FILESDIR}/weechat.1.in ${MAN1PREFIX}/man/man1/weechat.1 +.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 <bsd.port.mk> Modified: head/irc/weechat-devel/distinfo ============================================================================== --- head/irc/weechat-devel/distinfo Sat Oct 19 02:38:15 2013 (r330832) +++ head/irc/weechat-devel/distinfo Sat Oct 19 02:40:28 2013 (r330833) @@ -1,2 +1,4 @@ -SHA256 (weechat-devel-0249666.tar.gz) = eba985f9068cf119984093fa57062bc43dfd4e7cb652aa4af30b2a62c7c683d2 -SIZE (weechat-devel-0249666.tar.gz) = 2727220 +SHA256 (weechat-devel-88058bb.tar.gz) = cffa6b6dff3b1bbbb7caa0c66fb4e255a3ec59f1de953eaa9acbbfad625cc00a +SIZE (weechat-devel-88058bb.tar.gz) = 2738684 +SHA256 (weechat-devel-20131015-manpages.tar.gz) = cd722835372e25b952a5819d4bd3fe2d5a019907ab1fd0bb279c6ece47115fa2 +SIZE (weechat-devel-20131015-manpages.tar.gz) = 6490 Modified: head/irc/weechat-devel/pkg-descr ============================================================================== --- head/irc/weechat-devel/pkg-descr Sat Oct 19 02:38:15 2013 (r330832) +++ head/irc/weechat-devel/pkg-descr Sat Oct 19 02:40:28 2013 (r330833) @@ -1,7 +1,6 @@ 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 ncurses GUI is -supported by this port. +and extensible with scripts. Note: This is not the official release version. This is a git snapshot, which may in some cases be unstable. Modified: head/irc/weechat-devel/pkg-plist ============================================================================== --- head/irc/weechat-devel/pkg-plist Sat Oct 19 02:38:15 2013 (r330832) +++ head/irc/weechat-devel/pkg-plist Sat Oct 19 02:40:28 2013 (r330833) @@ -10,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 @@ -67,6 +72,12 @@ libdata/pkgconfig/weechat.pc %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310190240.r9J2eSCH000471>