From owner-svn-ports-all@FreeBSD.ORG Fri Jun 5 21:10:07 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 2C451F7E; Fri, 5 Jun 2015 21:10:07 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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 01A96103F; Fri, 5 Jun 2015 21:10:07 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t55LA6aC047382; Fri, 5 Jun 2015 21:10:06 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t55LA6K1047380; Fri, 5 Jun 2015 21:10:06 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201506052110.t55LA6K1047380@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 5 Jun 2015 21:10:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388640 - head/textproc/py-xml 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: Fri, 05 Jun 2015 21:10:07 -0000 Author: amdmi3 Date: Fri Jun 5 21:10:06 2015 New Revision: 388640 URL: https://svnweb.freebsd.org/changeset/ports/388640 Log: - Fix shebangs - Simplify installation, use COPYTREE_SHARE instead of custom cpio calls MFH: 2015Q2 Modified: head/textproc/py-xml/Makefile Modified: head/textproc/py-xml/Makefile ============================================================================== --- head/textproc/py-xml/Makefile Fri Jun 5 21:09:58 2015 (r388639) +++ head/textproc/py-xml/Makefile Fri Jun 5 21:10:06 2015 (r388640) @@ -3,7 +3,7 @@ PORTNAME= xml PORTVERSION= 0.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,21 +12,22 @@ DISTNAME= PyXML-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python XML library enhancements -USES= python +USES= python shebangfix +SHEBANG_FILES= demo/dom/html2html USE_PYTHON= distutils autoplist -OPTIONS_DEFINE= DOCS XSLT XPATH -OPTIONS_DEFAULT=XPATH - -.include +DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +PLIST_SUB+= PACKAGE_DIR=_xmlplus -CPIOARGS= --quiet -pdum -R -DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} -PLIST_SUB+= PACKAGE_DIR=_xmlplus PORTEXAMPLES= * PORTDOCS= * +OPTIONS_DEFINE= DOCS EXAMPLES XSLT XPATH +OPTIONS_DEFAULT=XPATH + +.include + .if ${PORT_OPTIONS:MXSLT} PYDISTUTILS_BUILDARGS+= --with-xslt PYDISTUTILS_INSTALLARGS+= --with-xslt @@ -34,6 +35,7 @@ PYDISTUTILS_INSTALLARGS+= --with-xslt PYDISTUTILS_BUILDARGS+= --without-xslt PYDISTUTILS_INSTALLARGS+= --without-xslt .endif + .if ${PORT_OPTIONS:MXPATH} PYDISTUTILS_BUILDARGS+= --with-xpath PYDISTUTILS_INSTALLARGS+= --with-xpath @@ -46,12 +48,9 @@ post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PACKAGE_DIR} -name '*.so' | ${XARGS} ${STRIP_CMD} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ANNOUNCE CREDITS LICENCE README* TODO - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor - @cd ${WRKSRC}/doc && ${FIND} * \ - | ${CPIO} ${CPIOARGS} ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @cd ${WRKSRC} && ${FIND} demo test \ - | ${CPIO} ${CPIOARGS} ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "demo test" ${STAGEDIR}${EXAMPLESDIR} .include