8 files changed, 48 insertions, 74 deletions

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 077a51ebf9ca..005a2df6dcba 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -2,13 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	irc
-MASTER_SITES=	http://weechat.org/files/src/ \
-		http://perturb.me.uk/distfiles/weechat/:mandocs \
-		LOCAL/jase/weechat/:mandocs
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://weechat.org/files/src/
 
 MAINTAINER=	jase@FreeBSD.org
 COMMENT=	Lightweight and user friendly ncurses based IRC client
@@ -18,119 +14,100 @@ LICENSE=	GPLv3
 CONFLICTS=	weechat-devel-[0-9]*
 
 USE_LDCONFIG=	yes
-USES=			cmake iconv ncurses
+USES=		cmake iconv ncurses tar:bzip2
 CMAKE_ARGS+=	-DENABLE_GUILE=no \
 		-DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH}
-CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
-				libgcrypt.so:${PORTSDIR}/security/libgcrypt
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \
-				GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
+		GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
 OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \
-				GNUTLS CA_BUNDLE ICON MANPAGES
+		GNUTLS CA_BUNDLE ICON MANPAGES
 
 OPTIONS_SUB=	yes
 
 BACKTRACE_DESC=	Provide crash backtraces
 CA_BUNDLE_DESC=	Include CA bundle for certificate verification
 CHARSET_DESC=	Charset conversion support
-ICON_DESC=		Desktop icon
+ICON_DESC=	Desktop icon
 PYTHON_DESC=	Python scripting language support
-RUBY_DESC=		Ruby scripting language support
+RUBY_DESC=	Ruby scripting language support
 
 ASPELL_CMAKE_OFF=	-DENABLE_ASPELL=no
 ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
 
 BACKTRACE_LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
-CA_BUNDLE_CMAKE_ON=		-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
+CA_BUNDLE_CMAKE_ON=	-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CHARSET_CMAKE_OFF=	-DENABLE_CHARSET=no
 
+DOCS_CMAKE_ON=		-DENABLE_DOC=yes
+
 GNUTLS_CMAKE_OFF=	-DENABLE_GNUTLS=no
 GNUTLS_USES=		pkgconfig
 GNUTLS_LIB_DEPENDS=	libgnutls.so.28:${PORTSDIR}/security/gnutls
 
 LUA_CMAKE_OFF=		-DENABLE_LUA=no
 LUA_CMAKE_ON=		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
-					-DBSD_LUA_INCDIR=${LUA_INCDIR} \
-					-DBSD_LUA_VER=${LUA_VER}
-LUA_USES=			lua:51
+			-DBSD_LUA_INCDIR=${LUA_INCDIR} \
+			-DBSD_LUA_VER=${LUA_VER}
+LUA_USES=		lua:51
+
+MANPAGES_CMAKE_ON=	-DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man
 
 NLS_CMAKE_OFF=		-DENABLE_NLS=no
-NLS_USES=			gettext
+NLS_USES=		gettext
 
 PERL_CMAKE_OFF=		-DENABLE_PERL=no
-PERL_USES=			perl5
+PERL_USES=		perl5
 
 PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=no
 PYTHON_CMAKE_ON=	-DBSD_PYTHON_CMD=${PYTHON_CMD} \
-					-DBSD_PYTHON_VER=${PYTHON_VERSION}
+			-DBSD_PYTHON_VER=${PYTHON_VERSION}
 PYTHON_USES=		python
 
 RUBY_CMAKE_OFF=		-DENABLE_RUBY=no
 RUBY_CMAKE_ON=		-DBSD_RUBY_CMD=${RUBY} \
-					-DBSD_RUBY_VER=${RUBY_NAME}
-RUBY_USE=			ruby=yes
+			-DBSD_RUBY_VER=${RUBY_NAME}
+RUBY_USE=		ruby=yes
 
 TCL_CMAKE_OFF=		-DENABLE_TCL=no
 TCL_CMAKE_ON=		-DBSD_TCL_VER=${TCL_VER} \
-					-DBSD_TCL_LIBDIR=${LOCALBASE}/lib \
-					-DBSD_TCL_INCDIR=${TCL_INCLUDEDIR}
-TCL_USES=			tcl:85+
-
-.if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
-				docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-				asciidoc:${PORTSDIR}/textproc/asciidoc \
-				source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
-CMAKE_ARGS+=	-DENABLE_MAN=yes -DMANDIR=${MANPREFIX}/man -DENABLE_DOC=yes
-.else
-CMAKE_ARGS+=	-DENABLE_MAN=no -DENABLE_DOC=no
-.endif
+			-DBSD_TCL_LIBDIR=${LOCALBASE}/lib \
+			-DBSD_TCL_INCDIR=${TCL_INCLUDEDIR}
+TCL_USES=		tcl:85+
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS} && !defined(MAINTAINER_MODE)
-DISTFILES+=	${DISTNAME}-docs.txz:mandocs
-.endif
-
-.if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE)
-DISTFILES+=	${DISTNAME}-manpages.txz:mandocs
+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
+		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
+		asciidoc:${PORTSDIR}/textproc/asciidoc \
+		source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
 .endif
 
 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
+	@${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/CMakeLists.txt
 .for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+		${WRKSRC}/${f}
 .endfor
 .if empty(PORT_OPTIONS:MBACKTRACE)
-	@${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt
+	@${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
+	@${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' \
+		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MMANPAGES} && !defined(MAINTAINER_MODE)
-	${INSTALL_MAN} ${WRKDIR}/manpages/man1/weechat.1.gz ${STAGEDIR}${PREFIX}/man/man1
-.for f in de fr it ja pl
-	@${MKDIR} ${STAGEDIR}${PREFIX}/man/${f}/man1
-	${INSTALL_MAN} ${WRKDIR}/manpages/${f}/man1/weechat.1.gz ${STAGEDIR}${PREFIX}/man/${f}/man1
-.endfor
-.endif
-.if ${PORT_OPTIONS:MDOCS} && !defined(MAINTAINER_MODE)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/docs/* ${STAGEDIR}${DOCSDIR}/
-.endif
 	${LN} -sf ${PREFIX}/bin/weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses
-# Make build fail to be able to take the generated manpages/docs from the archived wrkdir
-.if defined(MAINTAINER_MODE) && defined(MAINTAINER_BREAK_BUILD)
-	@${FALSE}
-.endif
 
 .include <bsd.port.mk>
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 73146b0ef75c..eee0dae46319 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,6 +1,2 @@
-SHA256 (weechat-1.1.1.tar.gz) = a32f7e57d5e834195bacaffa874419b4a9d17cd42883c80d7ecb9fadbf601349
-SIZE (weechat-1.1.1.tar.gz) = 3294132
-SHA256 (weechat-1.1.1-docs.txz) = efb8f40e7e389b80420067889062215ac0a4636f80c55d573e9f235939abaa61
-SIZE (weechat-1.1.1-docs.txz) = 726876
-SHA256 (weechat-1.1.1-manpages.txz) = efcce2d00462371a9f9a47af1b5586dcac23e79542ad8b2340677ea37c20426b
-SIZE (weechat-1.1.1-manpages.txz) = 13288
+SHA256 (weechat-1.3.tar.bz2) = 703dd771f74a2391bab656992712331d9151a227ac3210393a4ecf6458605148
+SIZE (weechat-1.3.tar.bz2) = 2402422
diff --git a/irc/weechat/files/patch-cmake-FindIconv.cmake b/irc/weechat/files/patch-cmake_FindIconv.cmake
index d2f1e366d2a8..d2f1e366d2a8 100644
--- a/irc/weechat/files/patch-cmake-FindIconv.cmake
+++ b/irc/weechat/files/patch-cmake_FindIconv.cmake
diff --git a/irc/weechat/files/patch-cmake-FindLua_cmake b/irc/weechat/files/patch-cmake_FindLua.cmake
index c2cfc822af09..c2cfc822af09 100644
--- a/irc/weechat/files/patch-cmake-FindLua_cmake
+++ b/irc/weechat/files/patch-cmake_FindLua.cmake
diff --git a/irc/weechat/files/patch-cmake-FindPython_cmake b/irc/weechat/files/patch-cmake_FindPython.cmake
index 26198ccef360..26198ccef360 100644
--- a/irc/weechat/files/patch-cmake-FindPython_cmake
+++ b/irc/weechat/files/patch-cmake_FindPython.cmake
diff --git a/irc/weechat/files/patch-cmake-FindRuby_cmake b/irc/weechat/files/patch-cmake_FindRuby.cmake
index 7aa81a5abf3c..75b9fd8da50b 100644
--- a/irc/weechat/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat/files/patch-cmake_FindRuby.cmake
@@ -1,12 +1,12 @@
---- cmake/FindRuby.cmake.orig	2015-01-12 09:32:28.592525659 +0000
-+++ cmake/FindRuby.cmake	2015-01-12 09:49:05.649456415 +0000
-@@ -31,22 +31,16 @@
+--- cmake/FindRuby.cmake.orig	2015-08-16 06:27:07 UTC
++++ cmake/FindRuby.cmake
+@@ -31,22 +31,16 @@ if(RUBY_FOUND)
     set(RUBY_FIND_QUIETLY TRUE)
  endif()
  
 -find_package(PkgConfig)
 -if(PKG_CONFIG_FOUND)
--  pkg_search_module(RUBY ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
+-  pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
 -endif()
 -
  if(RUBY_FOUND)
@@ -16,7 +16,7 @@
    find_program(RUBY_EXECUTABLE
 -    NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
 -    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-+	NAMES ${BSD_RUBY_CMD}
++    NAMES ${BSD_RUBY_CMD}
      )
    if(RUBY_EXECUTABLE)
      execute_process(
@@ -25,7 +25,7 @@
        OUTPUT_VARIABLE RUBY_ARCH_DIR
        )
      execute_process(
-@@ -54,11 +48,11 @@
+@@ -54,11 +48,11 @@ else()
        OUTPUT_VARIABLE RUBY_ARCH
        )
      execute_process(
@@ -39,7 +39,7 @@
        OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
        )
      find_path(RUBY_INCLUDE_DIRS
-@@ -67,8 +61,7 @@
+@@ -67,8 +61,7 @@ else()
        )
      set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
      find_library(RUBY_LIB
diff --git a/irc/weechat/files/patch-cmake-FindTCL_cmake b/irc/weechat/files/patch-cmake_FindTCL.cmake
index f5091cbad70d..f5091cbad70d 100644
--- a/irc/weechat/files/patch-cmake-FindTCL_cmake
+++ b/irc/weechat/files/patch-cmake_FindTCL.cmake
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index 07857cb8e5ff..060e9b655628 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -17,6 +17,7 @@ libdata/pkgconfig/weechat.pc
 %%MANPAGES%%man/it/man1/weechat.1.gz
 %%MANPAGES%%man/ja/man1/weechat.1.gz
 %%MANPAGES%%man/pl/man1/weechat.1.gz
+%%MANPAGES%%man/ru/man1/weechat.1.gz
 %%ASPELL%%lib/weechat/plugins/aspell.so
 %%CHARSET%%lib/weechat/plugins/charset.so
 %%LUA%%lib/weechat/plugins/lua.so