From owner-svn-ports-all@FreeBSD.ORG Sun May 17 16:31:52 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54737DFB; Sun, 17 May 2015 16:31:52 +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 298E71242; Sun, 17 May 2015 16:31:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HGVqCL076853; Sun, 17 May 2015 16:31:52 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4HGVp8D076851; Sun, 17 May 2015 16:31:51 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201505171631.t4HGVp8D076851@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 17 May 2015 16:31:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386630 - head/textproc/dblatex 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.20 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: Sun, 17 May 2015 16:31:52 -0000 Author: marino Date: Sun May 17 16:31:51 2015 New Revision: 386630 URL: https://svnweb.freebsd.org/changeset/ports/386630 Log: textproc/dblatex: Fix failure to invoke, reset maintainer The shebang "env python" won't work. Normally shebangfix would be used to fix this, but dblatex is actually built so we need to use sed in the post-install target to adjust it. While here, reset the maintainer. This PR is the fourth consecutive timeout. Also clean up the port. PR: 196617 Submitted by: holger (freyther.de) Modified: head/textproc/dblatex/Makefile head/textproc/dblatex/pkg-descr Modified: head/textproc/dblatex/Makefile ============================================================================== --- head/textproc/dblatex/Makefile Sun May 17 16:28:09 2015 (r386629) +++ head/textproc/dblatex/Makefile Sun May 17 16:31:51 2015 (r386630) @@ -3,11 +3,11 @@ PORTNAME= dblatex PORTVERSION= 0.3.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= johnson.peter@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= DocBook to LaTeX/ConTeXt Publishing BUILD_DEPENDS= ${LOCALBASE}/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty:${PORTSDIR}/print/texlive-texmf @@ -18,19 +18,21 @@ USES= tar:bzip2 python:2 USE_PYTHON= distutils autoplist USE_TEX= tex +PYDISTUTILS_INSTALLARGS+= --catalogs=${LOCALBASE}/share/xml/catalog.ports + OPTIONS_DEFINE= DOCS .include post-patch: .if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/pdfdocs),/d' ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e '/htmldoc)/d' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e '/pdfdocs),/d ; /htmldoc)/d' ${WRKSRC}/setup.py .endif @${REINPLACE_CMD} -e "s,share/man/man1,man/man1,g" ${WRKSRC}/setup.py -.include - -PYDISTUTILS_INSTALLARGS+= --catalogs=${PREFIX}/share/xml/catalog.ports +post-install: + # shebangfix can't be used because dblatex is built from scratch + ${REINPLACE_CMD} -e 's|/usr/bin/env python|${PREFIX}/bin/python2|' \ + ${STAGEDIR}${PREFIX}/bin/dblatex -.include +.include Modified: head/textproc/dblatex/pkg-descr ============================================================================== --- head/textproc/dblatex/pkg-descr Sun May 17 16:28:09 2015 (r386629) +++ head/textproc/dblatex/pkg-descr Sun May 17 16:31:51 2015 (r386630) @@ -13,4 +13,4 @@ stylesheets. (3) Post-processing is done by Python, to make publication faster, convert the images if needed, and do the whole compilation. -WWW: http://dblatex.sourceforge.net/ +WWW: http://dblatex.sourceforge.net/