Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Feb 2018 05:32:24 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r462910 - head/science/py-scipy
Message-ID:  <201802250532.w1P5WOP5064084@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Feb 25 05:32:24 2018
New Revision: 462910
URL: https://svnweb.freebsd.org/changeset/ports/462910

Log:
  Simplify Makefile
  
  - Use post-patch: instead of post-extract:
  - Silence patch messages
  - Install scipy-ref-PORTVERSION.pdf from DISTDIR directly

Modified:
  head/science/py-scipy/Makefile

Modified: head/science/py-scipy/Makefile
==============================================================================
--- head/science/py-scipy/Makefile	Sun Feb 25 05:32:19 2018	(r462909)
+++ head/science/py-scipy/Makefile	Sun Feb 25 05:32:24 2018	(r462910)
@@ -5,7 +5,7 @@ PORTNAME=	scipy
 PORTVERSION=	0.19.0
 PORTREVISION=	4
 CATEGORIES=	science python
-MASTER_SITES=	http://docs.scipy.org/doc/${DISTNAME}/:doc \
+MASTER_SITES=	http://docs.scipy.org/doc/scipy/:doc \
 		CHEESESHOP:source \
 		SF:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,19 +32,17 @@ OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	scipy-ref-${PORTVERSION}.pdf
 
-post-extract:
-	@${CP} ${DISTDIR}/scipy-ref-${PORTVERSION}.pdf ${WRKDIR}
-	# Syntax error with GCC5.
-	${REINPLACE_CMD} -e "s|) IF(| .AND. |" ${WRKSRC}/scipy/odr/odrpack/d_lpkbls.f
-
+post-patch:
+# Syntax error with GCC 5
+	@${REINPLACE_CMD} -e "s|) IF(| .AND. |" ${WRKSRC}/scipy/odr/odrpack/d_lpkbls.f
 # This line help fix the plist error because autoplist list it as a file but it is a directory
-	@cd ${WRKSRC}/scipy/stats/tests/data && ${TOUCH} tmp
+	@${TOUCH} ${WRKSRC}/scipy/stats/tests/data/tmp
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/scipy/ -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/scipy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/scipy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802250532.w1P5WOP5064084>