From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 31 17:21:22 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@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 2FB58795;
 Fri, 31 Jan 2014 17:21:22 +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 1B83715B5;
 Fri, 31 Jan 2014 17:21:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0VHLLNT015324;
 Fri, 31 Jan 2014 17:21:21 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0VHLLhY015323;
 Fri, 31 Jan 2014 17:21:21 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401311721.s0VHLLhY015323@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 31 Jan 2014 17:21:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r342047 - branches/2014Q1/textproc/dblatex
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Jan 2014 17:21:22 -0000

Author: antoine
Date: Fri Jan 31 17:21:21 2014
New Revision: 342047
URL: http://svnweb.freebsd.org/changeset/ports/342047
QAT: https://qat.redports.org/buildarchive/r342047/

Log:
  MFH: r337966
  
  - Fix packaging after switch to setuptools (egginfo in plist)
  - Stage support
  - Use PYDISTUTILS_AUTOPLIST
  
  Approved by:	portmgr (implicit)

Deleted:
  branches/2014Q1/textproc/dblatex/pkg-plist
Modified:
  branches/2014Q1/textproc/dblatex/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/dblatex/Makefile
==============================================================================
--- branches/2014Q1/textproc/dblatex/Makefile	Fri Jan 31 17:13:46 2014	(r342046)
+++ branches/2014Q1/textproc/dblatex/Makefile	Fri Jan 31 17:21:21 2014	(r342047)
@@ -16,23 +16,23 @@ RUN_DEPENDS=	xsltproc:${PORTSDIR}/textpr
 
 USE_BZIP2=	yes
 USE_TEX=	tex
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
-				--catalogs=${PREFIX}/share/xml/catalog.ports
+PYDISTUTILS_AUTOPLIST=yes
 
-PYDISTUTILS_NOEGGINFO=	yes
-PLIST_SUB+=	PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
+OPTIONS_DEFINE=	DOCS
 
-MAN1=		dblatex.1
-MANCOMPRESSED=	yes
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/pdfdocs),/d' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e '/htmldoc)/d' ${WRKSRC}/setup.py
 .endif
 	@${REINPLACE_CMD} -e "s,share/man/man1,man/man1,g" ${WRKSRC}/setup.py
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PYDISTUTILS_INSTALLARGS+=	--catalogs=${PREFIX}/share/xml/catalog.ports
+
+.include <bsd.port.post.mk>