Attachment 206691 Details for Bug 236507 – py-mcstas-tools-revised.patch

[patch] py-mcstas-tools-revised.patch

py-mcstas-tools-revised.patch (text/plain), 10.89 KB, created by Kai Knoblich on 2019-08-19 09:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-08-19 09:19:06 UTC

Size: 10.89 KB

patch

obsolete

>Index: science/py-mcstas-tools/Makefile
>===================================================================
>--- science/py-mcstas-tools/Makefile	(nonexistent)
>+++ science/py-mcstas-tools/Makefile	(working copy)
>@@ -0,0 +1,76 @@
>+# $FreeBSD$
>+
>+PORTNAME=	mcstas-tools
>+PORTVERSION=	2.5
>+CATEGORIES=	science python
>+MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+DISTFILES=	${PORTNAME}-python-mccodelib-${PORTVERSION}-src.tar.gz \
>+		${PORTNAME}-python-mcdisplay-pyqtgraph-${PORTVERSION}-src.tar.gz \
>+		${PORTNAME}-python-mcdoc-${PORTVERSION}-src.tar.gz \
>+		${PORTNAME}-python-mcgui-${PORTVERSION}-src.tar.gz \
>+		${PORTNAME}-python-mcplot-pyqtgraph-${PORTVERSION}-src.tar.gz \
>+		${PORTNAME}-python-mcrun-${PORTVERSION}-src.tar.gz
>+
>+MAINTAINER=	erkn@fysik.dtu.dk
>+COMMENT=	Python based tools for the McStas neutron ray tracing package
>+
>+LICENSE=	GPLv2
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0:graphics/py-pyqtgraph@${PY_FLAVOR} \
>+		mcstas:science/mcstas \
>+		mcpl2ssw:science/mcstas-comps
>+
>+USES=		cmake python:3.6+ pyqt:5 shebangfix
>+USE_PYQT=	core sip widgets gui printsupport qscintilla2
>+
>+SHEBANG_GLOB=	*.py
>+
>+CMAKE_ARGS=	-Denable_mcstas=1
>+
>+MANDIRS=	${PREFIX}/mcstas/${PORTVERSION}/doc/man/man1
>+NO_ARCH=	yes
>+NO_WRKSUBDIR=	yes
>+
>+PLIST_SUB=	PORTVERSION=${PORTVERSION}
>+
>+_EXECS=			mcrun mcdoc mcdisplay mcdisplay-pyqtgraph mcgui mcplot mcplot-pyqtgraph
>+_WRKSRC_SUBDIRS=	${DISTFILES:S/.tar.gz$//}
>+
>+# Patch the shell script wrappers so that they'll use the actual Python binary.
>+# Also add the '-f' flag to the invocations of readlink(1) otherwise it will fail.
>+post-patch:
>+	@${REINPLACE_CMD} -Ee 's|python3|${PYTHON_CMD}|; \
>+				s|(readlink)|\1 -f|' \
>+		${WRKSRC}/mcstas-tools-python-mcdisplay-pyqtgraph-${PORTVERSION}-src/mcdisplay.in \
>+		${WRKSRC}/mcstas-tools-python-mcdoc-${PORTVERSION}-src/mcdoc.in \
>+		${WRKSRC}/mcstas-tools-python-mcgui-${PORTVERSION}-src/mcgui.in \
>+		${WRKSRC}/mcstas-tools-python-mcplot-pyqtgraph-${PORTVERSION}-src/mcplot.in \
>+		${WRKSRC}/mcstas-tools-python-mcrun-${PORTVERSION}-src/mcrun.in
>+
>+do-configure:
>+.for f in ${_WRKSRC_SUBDIRS}
>+	 @${ECHO_MSG} ${_CMAKE_MSG}
>+	 @${MKDIR} ${WRKSRC}/${f}/.build
>+	 @cd ${WRKSRC}/${f}/.build; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ..
>+.endfor
>+
>+do-build:
>+.for f in ${_WRKSRC_SUBDIRS}
>+	 @cd ${WRKSRC}/${f}/.build; ${DO_MAKE_BUILD} ${ALL_TARGET}
>+.endfor
>+
>+do-install:
>+.for f in ${_WRKSRC_SUBDIRS}
>+	cd ${WRKSRC}/${f}/.build && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
>+.endfor
>+
>+# Link the executable files
>+.for e in ${_EXECS}
>+	${RLN} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
>+.endfor
>+
>+.include <bsd.port.mk>
>
>Property changes on: science/py-mcstas-tools/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/py-mcstas-tools/distinfo
>===================================================================
>--- science/py-mcstas-tools/distinfo	(nonexistent)
>+++ science/py-mcstas-tools/distinfo	(working copy)
>@@ -0,0 +1,13 @@
>+TIMESTAMP = 1551866209
>+SHA256 (mcstas-tools-python-mccodelib-2.5-src.tar.gz) = 63c199fc8c5b0826b3c9f2caeb7a56d8a49f9d3b0fb953f14cef8d1e8f61edf2
>+SIZE (mcstas-tools-python-mccodelib-2.5-src.tar.gz) = 73691
>+SHA256 (mcstas-tools-python-mcdisplay-pyqtgraph-2.5-src.tar.gz) = fb57d5e0cc40ba78166fb21b77f6d972ca01cc668e9ce5e1c48c49945d50cd3d
>+SIZE (mcstas-tools-python-mcdisplay-pyqtgraph-2.5-src.tar.gz) = 42178
>+SHA256 (mcstas-tools-python-mcdoc-2.5-src.tar.gz) = c9101ef64bb7aa3cef935a90bc28add439e2bab58460831f1ed566d7840b1c7e
>+SIZE (mcstas-tools-python-mcdoc-2.5-src.tar.gz) = 42959
>+SHA256 (mcstas-tools-python-mcgui-2.5-src.tar.gz) = 20818b7614d0668190191ecd995edcd3ed1399ab25fa88093d339f551340e9e9
>+SIZE (mcstas-tools-python-mcgui-2.5-src.tar.gz) = 110347
>+SHA256 (mcstas-tools-python-mcplot-pyqtgraph-2.5-src.tar.gz) = d4f119bb39371d8b38f303ee97f16b25b7f65db107d174807d95afd42c5c6790
>+SIZE (mcstas-tools-python-mcplot-pyqtgraph-2.5-src.tar.gz) = 46910
>+SHA256 (mcstas-tools-python-mcrun-2.5-src.tar.gz) = 91997c3f4843431bbfe3c14c6b34bd97b3f37d3a50d1e734650bf1e7284cea83
>+SIZE (mcstas-tools-python-mcrun-2.5-src.tar.gz) = 45362
>
>Property changes on: science/py-mcstas-tools/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/py-mcstas-tools/files/patch-mcstas-tools-python-mcdoc-2.5-src_CMakeLists.txt
>===================================================================
>--- science/py-mcstas-tools/files/patch-mcstas-tools-python-mcdoc-2.5-src_CMakeLists.txt	(nonexistent)
>+++ science/py-mcstas-tools/files/patch-mcstas-tools-python-mcdoc-2.5-src_CMakeLists.txt	(working copy)
>@@ -0,0 +1,18 @@
>+--- mcstas-tools-python-mcdoc-2.5-src/CMakeLists.txt.orig	2018-12-12 15:57:17 UTC
>++++ mcstas-tools-python-mcdoc-2.5-src/CMakeLists.txt
>+@@ -106,15 +106,6 @@ if(NOT WINDOWS)
>+     WORLD_READ WORLD_EXECUTE
>+   )
>+ 
>+-  # Symlink to main
>+-  add_custom_command(
>+-    OUTPUT "${WORK}/${P}doc"
>+-    COMMAND "${CMAKE_COMMAND}" -E make_directory "${WORK}"
>+-    COMMAND "${CMAKE_COMMAND}" -E remove "${WORK}/${P}doc"
>+-    COMMAND "${CMAKE_COMMAND}" -E create_symlink
>+-    "${TOOLS_LIB}/mcdoc" "${WORK}/${P}doc"
>+-    )
>+-
>+   add_custom_target(
>+     "CREATE_SYMLINK" ALL DEPENDS "${WORK}/${P}doc"
>+     )
>
>Property changes on: science/py-mcstas-tools/files/patch-mcstas-tools-python-mcdoc-2.5-src_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/py-mcstas-tools/pkg-descr
>===================================================================
>--- science/py-mcstas-tools/pkg-descr	(nonexistent)
>+++ science/py-mcstas-tools/pkg-descr	(working copy)
>@@ -0,0 +1,18 @@
>+McStas perl tools to aid in running neutron ray tracing simulations.
>+
>+McStas is a tool for simulating neutron instrumentation and experiments using
>+a ray-tracing formalism. Currently the main use of McStas is in the field of
>+instrumentation design.
>+
>+This port contains a few python-based helper tools (including a GUI) to aid the
>+user in setting up and running simulations. The tools are:
>+mcgui: A python qt5 based GUI.
>+mcrun: A script that makes it easy to run sims and perform
>+  point scans and simple optimizations.
>+mcdoc: Script for viewing inline component documentation.
>+mcplot: Tool for plotting McStas-generated results (wrapper script).
>+mcplot-pyqtgraph: The underlying plotting tool based on the pyqtgraph library.
>+mcdisplay: Visual ray-tracing displaying neutron trajectories (wrapper script).
>+mcdisplay-pyqtgraph: the underlying pyqtgraph based back-end of mcdisplay.
>+
>+WWW: http://www.mcstas.org
>
>Property changes on: science/py-mcstas-tools/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/py-mcstas-tools/pkg-plist
>===================================================================
>--- science/py-mcstas-tools/pkg-plist	(nonexistent)
>+++ science/py-mcstas-tools/pkg-plist	(working copy)
>@@ -0,0 +1,52 @@
>+mcstas/%%PORTVERSION%%/bin/mcdisplay
>+mcstas/%%PORTVERSION%%/bin/mcdisplay-pyqtgraph
>+mcstas/%%PORTVERSION%%/bin/mcdoc
>+mcstas/%%PORTVERSION%%/bin/mcgui
>+mcstas/%%PORTVERSION%%/bin/mcplot
>+mcstas/%%PORTVERSION%%/bin/mcplot-pyqtgraph
>+mcstas/%%PORTVERSION%%/bin/mcrun
>+mcstas/%%PORTVERSION%%/launchers/McStas-py.desktop
>+mcstas/%%PORTVERSION%%/launchers/mcstas-py.png
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/__init__.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/fcparticleparser.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/flowchart.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/instrgeom.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/instrparser.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/mccode_config.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/mcdisplayutils.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/mcplotloader.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/nodetree.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/particleparser.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/pipetools.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/plotgraph.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/pqtgfrontend.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/test.py
>+mcstas/%%PORTVERSION%%/tools/Python/mccodelib/utils.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcdisplay/pyqtgraph/mcdisplay.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcdoc/mcdoc
>+mcstas/%%PORTVERSION%%/tools/Python/mcdoc/mcdoc.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/compile-icon.png
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/mcgui
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/mcgui.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/mcstas-py.png
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/run-icon.png
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/viewclasses.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcgui/widgets.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcplot/pyqtgraph/mcdataclient.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcplot/pyqtgraph/mcdataserver.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcplot/pyqtgraph/mcdataservice.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcplot/pyqtgraph/mcplot.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcplot/pyqtgraph/plotfuncs.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcrun/__init__.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcrun/log.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcrun/mccode.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcrun/mcrun
>+mcstas/%%PORTVERSION%%/tools/Python/mcrun/mcrun.py
>+mcstas/%%PORTVERSION%%/tools/Python/mcrun/optimisation.py
>+bin/mcdisplay
>+bin/mcdisplay-pyqtgraph
>+bin/mcdoc
>+bin/mcgui
>+bin/mcplot
>+bin/mcplot-pyqtgraph
>+bin/mcrun
>
>Property changes on: science/py-mcstas-tools/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 236507: 202841 | 202851 | 203578 | 206691