6 files changed, 55 insertions, 300 deletions

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index fd4059c92408..be65143d6015 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -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 ncurses based IRC client
 
 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>
diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo
index 3f45643f2d62..bd563dcefac9 100644
--- a/irc/weechat-devel/distinfo
+++ b/irc/weechat-devel/distinfo
@@ -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
diff --git a/irc/weechat-devel/files/weechat.1.in b/irc/weechat-devel/files/weechat.1.in
deleted file mode 100644
index b0ea1061c7be..000000000000
--- a/irc/weechat-devel/files/weechat.1.in
+++ /dev/null
@@ -1,261 +0,0 @@
-'\" t
-.\"     Title: weechat
-.\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 08/14/2013
-.\"    Manual: \ \&
-.\"    Source: \ \& WeeChat 0.4.2-dev
-.\"  Language: English
-.\"
-.TH "WEECHAT" "1" "08/14/2013" "\ \& WeeChat 0\&.4\&.2\-dev" "\ \&"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-weechat \- the extensible chat client
-.SH "SYNOPSIS"
-.sp
-.nf
-\fIweechat\fR [\-a|\-\-no\-connect] [\-d|\-\-dir <path>] [\-p|\-\-no\-plugin] [\-r|\-\-run\-command <command>] [\-s|\-\-no\-script] [\-\-upgrade] [plugin:option\&...]
-\fIweechat\fR [\-c|\-\-colors]
-\fIweechat\fR [\-h|\-\-help]
-\fIweechat\fR [\-k|\-\-keys]
-\fIweechat\fR [\-l|\-\-license]
-\fIweechat\fR [\-v|\-\-version]
-.fi
-.SH "DESCRIPTION"
-.sp
-WeeChat is a fast, light and extensible chat client\&.
-.sp
-It is modular (lightweight core with plugins), multi\-protocols (IRC and Jabber), extensible with C and scripts written in several languages\&.
-.SH "OPTIONS"
-.PP
-\fB\-a\fR, \fB\-\-no\-connect\fR
-.RS 4
-Disable auto\-connect to servers when WeeChat is starting\&.
-.RE
-.PP
-\fB\-c\fR, \fB\-\-colors\fR
-.RS 4
-Display default colors in terminal\&.
-.RE
-.PP
-\fB\-d\fR, \fB\-\-dir\fR \fI<path>\fR
-.RS 4
-Set path as home for WeeChat (used for configuration files, logs, user plugins and scripts), default value is
-\fI~/\&.weechat\fR
-(note: directory is created if not found by WeeChat)\&.
-.RE
-.PP
-\fB\-h\fR, \fB\-\-help\fR
-.RS 4
-Display help\&.
-.RE
-.PP
-\fB\-l\fR, \fB\-\-license\fR
-.RS 4
-Display WeeChat license\&.
-.RE
-.PP
-\fB\-p\fR, \fB\-\-no\-plugin\fR
-.RS 4
-Disable plugins auto\-load\&.
-.RE
-.PP
-\fB\-r\fR, \fB\-\-run\-command\fR \fI<command>\fR
-.RS 4
-Run command(s) after startup (many commands can be separated by semicolons)\&.
-.RE
-.PP
-\fB\-s\fR, \fB\-\-no\-script\fR
-.RS 4
-Disable scripts auto\-load\&.
-.RE
-.PP
-\fB\-\-upgrade\fR
-.RS 4
-Upgrade WeeChat using session files generated with command
-/upgrade \-quit\&.
-.RE
-.PP
-\fB\-v\fR, \fB\-\-version\fR
-.RS 4
-Display WeeChat version\&.
-.RE
-.PP
-\fBplugin:option\fR
-.RS 4
-Option for a plugin\&.
-.RE
-.SH "PLUGIN OPTIONS"
-.sp
-For complete doc on plugin options, please look at plugins documentation in WeeChat user\(cqs guide\&.
-.sp
-With irc plugin, you can connect to temporary server with an URL like:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2\&.\&.\&.]]
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-To join WeeChat IRC channel support with nick "mynick":
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-irc://mynick@irc\&.freenode\&.net/#weechat
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-IPv6 address can be enclosed in brackets to add a port after address, for example:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
-.fi
-.if n \{\
-.RE
-.\}
-.SH "FILES"
-.PP
-$HOME/\&.weechat/weechat\&.conf
-.RS 4
-main WeeChat configuration file
-.RE
-.PP
-$HOME/\&.weechat/plugins\&.conf
-.RS 4
-plugins configuration file
-.RE
-.PP
-$HOME/\&.weechat/alias\&.conf
-.RS 4
-configuration file for
-\fIalias\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/aspell\&.conf
-.RS 4
-configuration file for
-\fIaspell\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/charset\&.conf
-.RS 4
-configuration file for
-\fIcharset\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/irc\&.conf
-.RS 4
-configuration file for
-\fIirc\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/logger\&.conf
-.RS 4
-configuration file for
-\fIlogger\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/relay\&.conf
-.RS 4
-configuration file for
-\fIrelay\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/rmodifier\&.conf
-.RS 4
-configuration file for
-\fIrmodifier\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/script\&.conf
-.RS 4
-configuration file for
-\fIscript\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/xfer\&.conf
-.RS 4
-configuration file for
-\fIxfer\fR
-plugin
-.RE
-.PP
-$HOME/\&.weechat/weechat\&.log
-.RS 4
-WeeChat log file
-.RE
-.SH "AUTHORS"
-.sp
-WeeChat is written by Sébastien Helleu and contributors (complete list is in the AUTHORS file)\&.
-.sp
-Copyright \(co 2003\-2013 Sébastien Helleu <flashcode@flashtux\&.org>
-.sp
-WeeChat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&.
-.sp
-Please read the COPYING file for more information\&.
-.sp
-Web: http://weechat\&.org/
-.SH "REPORTING BUGS"
-.sp
-Please report bugs or feature requests at Savannah website:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-bugs:
-http://savannah\&.nongnu\&.org/bugs/?group=weechat
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-feature requests:
-http://savannah\&.nongnu\&.org/task/?group=weechat
-.RE
diff --git a/irc/weechat-devel/pkg-descr b/irc/weechat-devel/pkg-descr
index 9ad96095ab02..562e4bd950fa 100644
--- a/irc/weechat-devel/pkg-descr
+++ b/irc/weechat-devel/pkg-descr
@@ -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.
diff --git a/irc/weechat-devel/pkg-install b/irc/weechat-devel/pkg-install
deleted file mode 100644
index b27a71d1c653..000000000000
--- a/irc/weechat-devel/pkg-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "${2}" = "POST-INSTALL" ]; then
-	ln -sf ${PKG_PREFIX}/bin/weechat ${PKG_PREFIX}/bin/weechat-curses
-fi
diff --git a/irc/weechat-devel/pkg-plist b/irc/weechat-devel/pkg-plist
index c6d7e4eb45d2..2e9e152465be 100644
--- a/irc/weechat-devel/pkg-plist
+++ b/irc/weechat-devel/pkg-plist
@@ -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