From owner-svn-ports-head@FreeBSD.ORG Thu Feb 13 13:23:06 2014 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id A15753CB; Thu, 13 Feb 2014 13:23:06 +0000 (UTC) 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 720A81330; Thu, 13 Feb 2014 13:23:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DDN6No075838; Thu, 13 Feb 2014 13:23:06 GMT (envelope-from jase@svn.freebsd.org) Received: (from jase@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DDN6Qm075837; Thu, 13 Feb 2014 13:23:06 GMT (envelope-from jase@svn.freebsd.org) Message-Id: <201402131323.s1DDN6Qm075837@svn.freebsd.org> From: Jase Thew Date: Thu, 13 Feb 2014 13:23:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344099 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2014 13:23:06 -0000 Author: jase Date: Thu Feb 13 13:23:05 2014 New Revision: 344099 URL: http://svnweb.freebsd.org/changeset/ports/344099 QAT: https://qat.redports.org/buildarchive/r344099/ Log: - Add additional primary MASTER_SITES for docs and manpages distfiles to workaround ftp mirroring delay [1] - Consolidate all MASTER_SITES and MASTER_SITE_SUBDIR assignments Reported by: David Cecchin (via email) [1] Modified: head/irc/weechat/Makefile Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Thu Feb 13 13:20:31 2014 (r344098) +++ head/irc/weechat/Makefile Thu Feb 13 13:23:05 2014 (r344099) @@ -3,8 +3,12 @@ PORTNAME= weechat PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= irc -MASTER_SITES= http://weechat.org/files/src/ +MASTER_SITES= http://weechat.org/files/src/ \ + http://perturb.me.uk/distfiles/weechat/:mandocs \ + ${MASTER_SITE_LOCAL:S/$/:mandocs/} +MASTER_SITE_SUBDIR= jase/weechat/:mandocs DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jase@FreeBSD.org @@ -118,12 +122,20 @@ CMAKE_ARGS+= -DENABLE_LUA=no PLIST_SUB+= LUA="@comment " .endif +.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 + .if ${PORT_OPTIONS:MDOCS} PLIST_SUB+= DOCS="" .if !defined(MAINTAINER_MODE) -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:doc/} -MASTER_SITE_SUBDIR+= jase/weechat/:doc -DISTFILES+= ${DISTNAME}-docs.txz:doc +DISTFILES+= ${DISTNAME}-docs.txz:mandocs .endif .else PLIST_SUB+= DOCS="@comment " @@ -132,9 +144,7 @@ PLIST_SUB+= DOCS="@comment " .if ${PORT_OPTIONS:MMANPAGES} PLIST_SUB+= MANPAGES="" .if !defined(MAINTAINER_MODE) -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:man/} -MASTER_SITE_SUBDIR+= jase/weechat/:man -DISTFILES+= ${DISTNAME}-manpages.txz:man +DISTFILES+= ${DISTNAME}-manpages.txz:mandocs .endif .else PLIST_SUB+= MANPAGES="@comment " @@ -150,16 +160,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 \ - 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 - 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