From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 14:39:20 2014 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 ESMTPS id 47D66754; Sat, 5 Jul 2014 14:39:20 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 338A72FAC; Sat, 5 Jul 2014 14:39:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65EdK0q081021; Sat, 5 Jul 2014 14:39:20 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65EdJNj081016; Sat, 5 Jul 2014 14:39:19 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201407051439.s65EdJNj081016@svn.freebsd.org> From: Vsevolod Stakhov Date: Sat, 5 Jul 2014 14:39:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360749 - in head/mail: exim-doc-html exim-doc-info exim-doc-pdf exim-doc-postscript 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.18 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: Sat, 05 Jul 2014 14:39:20 -0000 Author: vsevolod Date: Sat Jul 5 14:39:18 2014 New Revision: 360749 URL: http://svnweb.freebsd.org/changeset/ports/360749 QAT: https://qat.redports.org/buildarchive/r360749/ Log: - Support stage - Update to the recent 4.82.1 version - Set expiration for texinfo documentation since exim no longer provides it - Take maintainership Deleted: head/mail/exim-doc-html/pkg-plist_info Modified: head/mail/exim-doc-html/Makefile head/mail/exim-doc-html/distinfo head/mail/exim-doc-info/Makefile head/mail/exim-doc-pdf/Makefile head/mail/exim-doc-postscript/Makefile Modified: head/mail/exim-doc-html/Makefile ============================================================================== --- head/mail/exim-doc-html/Makefile Sat Jul 5 14:31:19 2014 (r360748) +++ head/mail/exim-doc-html/Makefile Sat Jul 5 14:39:18 2014 (r360749) @@ -2,32 +2,39 @@ # $FreeBSD$ PORTNAME= exim -PORTVERSION= 4.71 +PORTVERSION= 4.82.1 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} \ - http://dryice.name/computer/FreeBSD/distfiles/ -MASTER_SITE_SUBDIR= exim4/:exim dryice/:local +MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} +MASTER_SITE_SUBDIR= exim4/:exim PKGNAMESUFFIX= -doc-${DOCFORMAT} DISTNAME= exim-${DISTDOCFORMAT}-${PORTVERSION} -DISTFILES= ${DISTNAME}.tar.bz2:exim,local +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim DIST_SUBDIR= exim -MAINTAINER= ports@FreeBSD.org +MAINTAINER= vsevolod@FreeBSD.org COMMENT= Documentation for the Exim MTA in multiple formats -USES= makeinfo tar:bzip2 -NO_STAGE= yes +USES= tar:bzip2 DOCFORMAT?= html DISTDOCFORMAT?= ${DOCFORMAT} +AVAILABLE_FORMATS= html \ + pdf \ + postscript +NO_BUILD= yes + +.if make(makesum) && !defined(FETCH_ALL) +.error "You forgot to define FETCH_ALL to create the sane distinfo" +.endif -.if ${DOCFORMAT} == "info" -BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo -MAKEINFO= ${LOCALBASE}/bin/makeinfo +.if defined(FETCH_ALL) +. for _df in ${AVAILABLE_FORMATS} +. if ${_df} != ${DOCFORMAT} +DISTFILES+= exim-${_df}-${PORTVERSION}${EXTRACT_SUFX}:exim +. endif +. endfor .endif -.if !defined(NOPORTDOCS) .if ${DOCFORMAT} == "html" PORTDOCS= html .elif ${DOCFORMAT} == "pdf" @@ -35,46 +42,25 @@ PORTDOCS= *.pdf .elif ${DOCFORMAT} == "postscript" PORTDOCS= *.ps .elif ${DOCFORMAT} == "info" -PLIST= ${PKGDIR}/pkg-plist_${DOCFORMAT} +IGNORE= exim no longer provides documentation in info format .else pre-everything:: @ ${ECHO} 'ERROR: invalid value for DOCFORMAT: "${DOCFORMAT}"' - @ ${ECHO} 'Possible values are "html", "pdf", "postscript" and "info".' + @ ${ECHO} 'Possible values are "html", "pdf", and "postscript".' @ ${FALSE} .endif -.endif - -do-build: -.if ${DOCFORMAT} == "info" - @ cd ${WRKSRC}/doc; \ - ${MAKEINFO} --no-split --output exim.info spec.texinfo; \ - ${MAKEINFO} --no-split --output exim_filter.info filter.texinfo -.else - @ ${DO_NADA} -.endif do-install: -.if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} + @ ${MKDIR} ${STAGEDIR}${DOCSDIR} .if ${DOCFORMAT} == "html" ${TAR} -C ${WRKSRC}/doc -cf - html | \ - ${TAR} --unlink -C ${DOCSDIR} -xf - + ${TAR} --unlink -C ${STAGEDIR}${DOCSDIR} -xf - .elif ${DOCFORMAT} == "pdf" - @ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR} + @ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR} .elif ${DOCFORMAT} == "postscript" - @ ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR} -.elif ${DOCFORMAT} == "info" - @ ${INSTALL_DATA} ${WRKSRC}/doc/exim.info ${PREFIX}/info - @ install-info --section="Exim" \ - --entry "* User guide: (exim). Exim manual" \ - ${PREFIX}/info/exim.info ${PREFIX}/info/dir - @ ${INSTALL_DATA} ${WRKSRC}/doc/exim_filter.info ${PREFIX}/info - @ install-info --section="Exim" \ - --entry "* Filtering: (exim_filter). Filtering mail with Exim" \ - ${PREFIX}/info/exim_filter.info ${PREFIX}/info/dir + @ ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${STAGEDIR}${DOCSDIR} .else @${FALSE} .endif -.endif .include Modified: head/mail/exim-doc-html/distinfo ============================================================================== --- head/mail/exim-doc-html/distinfo Sat Jul 5 14:31:19 2014 (r360748) +++ head/mail/exim-doc-html/distinfo Sat Jul 5 14:39:18 2014 (r360749) @@ -1,8 +1,6 @@ -SHA256 (exim/exim-html-4.71.tar.bz2) = 55175071a651441f8baed45438fc40fc3e45681a6c700348c38af28991dedfb0 -SIZE (exim/exim-html-4.71.tar.bz2) = 796004 -SHA256 (exim/exim-texinfo-4.71.tar.bz2) = b39f051babc853f1e4a788521b71489627853bd314c34204de358e890bc315b0 -SIZE (exim/exim-texinfo-4.71.tar.bz2) = 364841 -SHA256 (exim/exim-pdf-4.71.tar.bz2) = c437d7dae147d6095bcd3316b79d74aa90e30b5a6627924a125a834761eb8158 -SIZE (exim/exim-pdf-4.71.tar.bz2) = 1661652 -SHA256 (exim/exim-postscript-4.71.tar.bz2) = 7385546a39136c3f82c2c5fa43fcef41adf6054824c327ca4019b83dab0eff0d -SIZE (exim/exim-postscript-4.71.tar.bz2) = 897250 +SHA256 (exim/exim-html-4.82.1.tar.bz2) = 81d0237cff64b259d47c758d5c82da93bd2e7b8ce048974d53d90e597eee122e +SIZE (exim/exim-html-4.82.1.tar.bz2) = 458569 +SHA256 (exim/exim-pdf-4.82.1.tar.bz2) = 2e3705504f22633a14d417ffcb72c6beddc2f142e38ff4f01394b83ae583ff42 +SIZE (exim/exim-pdf-4.82.1.tar.bz2) = 1835284 +SHA256 (exim/exim-postscript-4.82.1.tar.bz2) = f9c69153b1da3ef854c73ac98ec5bcef842438c5630819bc2287dec869bd039d +SIZE (exim/exim-postscript-4.82.1.tar.bz2) = 1008574 Modified: head/mail/exim-doc-info/Makefile ============================================================================== --- head/mail/exim-doc-info/Makefile Sat Jul 5 14:31:19 2014 (r360748) +++ head/mail/exim-doc-info/Makefile Sat Jul 5 14:39:18 2014 (r360749) @@ -1,8 +1,9 @@ # Created by: Oliver Eikemeier # $FreeBSD$ -DOCFORMAT= info -DISTDOCFORMAT= texinfo -MASTERDIR= ${.CURDIR}/../exim-doc-html -.include "${MASTERDIR}/Makefile" +IGNORE= exim no is no longer provided with documentation in info format +DEPRECATED= yes +EXPIRATION_DATE= 2014-07-30 + +.include Modified: head/mail/exim-doc-pdf/Makefile ============================================================================== --- head/mail/exim-doc-pdf/Makefile Sat Jul 5 14:31:19 2014 (r360748) +++ head/mail/exim-doc-pdf/Makefile Sat Jul 5 14:39:18 2014 (r360749) @@ -4,5 +4,4 @@ DOCFORMAT= pdf MASTERDIR= ${.CURDIR}/../exim-doc-html -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/mail/exim-doc-postscript/Makefile ============================================================================== --- head/mail/exim-doc-postscript/Makefile Sat Jul 5 14:31:19 2014 (r360748) +++ head/mail/exim-doc-postscript/Makefile Sat Jul 5 14:39:18 2014 (r360749) @@ -4,5 +4,4 @@ DOCFORMAT= postscript MASTERDIR= ${.CURDIR}/../exim-doc-html -NO_STAGE= yes .include "${MASTERDIR}/Makefile"