svn commit: r388640 - head/textproc/py-xml

[Dmitry Marakasov]

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 at 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 <bsd.port.pre.mk>
+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 <bsd.port.pre.mk>
+
 .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 <bsd.port.post.mk>