Attachment 162705 Details for Bug 204223 – science/mcstas new organization of ports and version upgrade diff

[patch] science/mcstas new organization of ports and version upgrade diff

mcstas-2.2a.diff (text/plain), 8.90 KB, created by Erik B Knudsen on 2015-11-02 13:31:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erik B Knudsen

Created: 2015-11-02 13:31:37 UTC

Size: 8.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 400651)
>+++ Makefile	(working copy)
>@@ -2,39 +2,18 @@
> # $FreeBSD$
> 
> PORTNAME=	mcstas
>-PORTVERSION=	2.1
>+PORTVERSION=	2.2a
> CATEGORIES=	science
>-MASTER_SITES=	http://download.mcstas.org/${PORTNAME}-${PORTVERSION}/unix/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
>-DISTFILES=	McStas-${PORTVERSION}-UNIX-src.tar.gz
>-DIST_SUBDIR=	${PORTNAME}
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>+MASTER_SITES=	http://download.mcstas.org/${PORTNAME}-${PORTVERSION}/unix/McStas-${PORTVERSION}-UNIX-src/
>+DISTNAME=	mcstas-${PORTVERSION}-src
> 
>-MAINTAINER=	erkn@fysik.dtu.dk
>-COMMENT=	Monte Carlo neutron ray tracing package
>+MAINTAINER= 	erkn@fysik.dtu.dk
>+COMMENT= 	Monte Carlo neutron ray tracing package
> 
>-LICENSE=	GPLv2
>+LICENSE= 	GPLv2
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
>-
>-USES=		cmake gmake bison:build
>-#should perhaps use the toolchain file - but remember the arch
>-CMAKE_ARGS=	"-Denable_mcstas=1"
>+USES= 		bison:build cmake gmake
>+CMAKE_ARGS= 	"-Denable_mcstas=1"
> GNU_CONFIGURE=	yes
> 
>-.include <bsd.port.pre.mk>
>-
>-# this is necessary since mcxtrace and mcstas are packaged in a
>-# single tarball in which the kernel, component library, manual,
>-# and tool tarballs reside
>-post-fetch:
>-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
>-	cd ${DISTDIR}/${DIST_SUBDIR};\
>-	${TAR} --strip-components 1 -xzf ${DISTFILES} McStas-2.1-UNIX-src/${DISTNAME}.tar.gz;
>-.endif
>-
>-post-stage:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/2.1/bin/mcstas
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/2.1/bin/mcformat
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 400651)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mcstas/McStas-2.1-UNIX-src.tar.gz) = 70d5b33d67ea9b8e4c276b4e8c7ece907ac28ec63f523d7e0cbcc9e425b4aaf4
>-SIZE (mcstas/McStas-2.1-UNIX-src.tar.gz) = 27807879
>+SHA256 (mcstas-2.2a-src.tar.gz) = 7f8cca7ceea87e4b99c17ee16e4f1e6fd89712d2de1ba61ab97a2cd7ea0f8b9d
>+SIZE (mcstas-2.2a-src.tar.gz) = 347943
>Index: pkg-deinstall
>===================================================================
>--- pkg-deinstall	(revision 400651)
>+++ pkg-deinstall	(working copy)
>@@ -7,12 +7,6 @@
>     exit 1
> fi
> 
>-pname=${1%-*}
>-pversion=${1##*-}
>-
>-#echo the extracted port name is $pname
>-#echo the extracted port version is $pversion
>-
> execs="mcstas mcformat"
> 
> case $2 in
>@@ -19,7 +13,7 @@
>      DEINSTALL)
> 
> 		if [ ! -f "${PKG_PREFIX}/bin" ]; then
>-			echo "Deinstalling links to ${1} executables in ${PKG_PREFIX}/bin.";
>+			echo "Deinstalling links to executables in ${PKG_PREFIX}/bin.";
>                         for target in ${execs}; do
> 				rm ${PKG_PREFIX}/bin/${target};
> 			done                
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 400651)
>+++ pkg-descr	(working copy)
>@@ -1,7 +1,7 @@
>-Monte Carlo ray tracing simulations of neutron experiments.
>+McStas - Monte Carlo ray tracing simulations of neutron experiments.
> 
>-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 instrument design.
>+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 
>+instrument design. 
> 
> WWW: http://www.mcstas.org
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 400651)
>+++ pkg-plist	(working copy)
>@@ -1,84 +1,72 @@
>-mcstas/2.1/LGPL
>-mcstas/2.1/LICENSE.LIB
>-mcstas/2.1/NOMENCLATURE
>-mcstas/2.1/README
>-mcstas/2.1/bin/mcformat
>-mcstas/2.1/bin/mcstas
>-mcstas/2.1/data/Al.nxs
>-mcstas/2.1/data/Cu.nxs
>-mcstas/2.1/doc/man/man1/mcformat-2.1.1
>-mcstas/2.1/doc/man/man1/mcstas-2.1.1
>-mcstas/2.1/environment
>-mcstas/2.1/module
>-mcstas/2.1/share/adapt_tree-lib.c
>-mcstas/2.1/share/adapt_tree-lib.h
>-mcstas/2.1/share/general.c
>-mcstas/2.1/share/general.h
>-mcstas/2.1/share/interoff-lib.c
>-mcstas/2.1/share/interoff-lib.h
>-mcstas/2.1/share/interpolation/array-utils.c
>-mcstas/2.1/share/interpolation/array-utils.h
>-mcstas/2.1/share/interpolation/natural/README
>-mcstas/2.1/share/interpolation/natural/delaunay.c
>-mcstas/2.1/share/interpolation/natural/delaunay.h
>-mcstas/2.1/share/interpolation/natural/example.c
>-mcstas/2.1/share/interpolation/natural/natural.c
>-mcstas/2.1/share/interpolation/natural/natural.h
>-mcstas/2.1/share/interpolation/natural/predicates.c
>-mcstas/2.1/share/interpolation/natural/utils-extra.c
>-mcstas/2.1/share/interpolation/natural/utils-extra.h
>-mcstas/2.1/share/interpolation/natural/vertex.h
>-mcstas/2.1/share/interpolation/nearest/README
>-mcstas/2.1/share/interpolation/nearest/example.c
>-mcstas/2.1/share/interpolation/nearest/kdtree.c
>-mcstas/2.1/share/interpolation/nearest/kdtree.h
>-mcstas/2.1/share/interpolation/nearest/vertex.h
>-mcstas/2.1/share/interpolation/resample.c
>-mcstas/2.1/share/interpolation/resample.h
>-mcstas/2.1/share/intersection.c
>-mcstas/2.1/share/intersection.h
>-mcstas/2.1/share/mccode-r.c
>-mcstas/2.1/share/mccode-r.h
>-mcstas/2.1/share/mcstas-r.c
>-mcstas/2.1/share/mcstas-r.h
>-mcstas/2.1/share/nxslib/README.TXT
>-mcstas/2.1/share/nxslib/nxs.c
>-mcstas/2.1/share/nxslib/nxs.h
>-mcstas/2.1/share/nxslib/sgclib.c
>-mcstas/2.1/share/nxslib/sgfind.c
>-mcstas/2.1/share/nxslib/sghkl.c
>-mcstas/2.1/share/nxslib/sginfo.h
>-mcstas/2.1/share/nxslib/sgio.c
>-mcstas/2.1/share/nxslib/sgsi.c
>-mcstas/2.1/share/pol-lib.c
>-mcstas/2.1/share/pol-lib.h
>-mcstas/2.1/share/read_table-lib.c
>-mcstas/2.1/share/read_table-lib.h
>-mcstas/2.1/share/ref-lib.c
>-mcstas/2.1/share/ref-lib.h
>-mcstas/2.1/share/vitess-lib.c
>-mcstas/2.1/share/vitess-lib.h
>-@dir mcstas/2.1/bin
>-@dir mcstas/2.1/contrib/Gas_tables
>-@dir mcstas/2.1/contrib/ISIS_tables
>-@dir mcstas/2.1/contrib/Neutronics
>-@dir mcstas/2.1/contrib/doc
>-@dir mcstas/2.1/contrib
>-@dir mcstas/2.1/data
>-@dir mcstas/2.1/doc/man/man1
>-@dir mcstas/2.1/doc/man
>-@dir mcstas/2.1/doc
>-@dir mcstas/2.1/examples
>-@dir mcstas/2.1/misc
>-@dir mcstas/2.1/monitors
>-@dir mcstas/2.1/obsolete
>-@dir mcstas/2.1/optics
>-@dir mcstas/2.1/samples
>-@dir mcstas/2.1/share/interpolation/natural
>-@dir mcstas/2.1/share/interpolation/nearest
>-@dir mcstas/2.1/share/interpolation
>-@dir mcstas/2.1/share/nxslib
>-@dir mcstas/2.1/share
>-@dir mcstas/2.1/sources
>-@dir mcstas/2.1
>-@dir mcstas
>+mcstas/2.2a/LGPL
>+mcstas/2.2a/LICENSE.LIB
>+mcstas/2.2a/NOMENCLATURE
>+mcstas/2.2a/README
>+mcstas/2.2a/bin/mcformat
>+mcstas/2.2a/bin/mcstas
>+mcstas/2.2a/data/Al.nxs
>+mcstas/2.2a/data/Cu.nxs
>+mcstas/2.2a/doc/man/man1/mcformat-2.2a.1
>+mcstas/2.2a/doc/man/man1/mcstas-2.2a.1
>+mcstas/2.2a/environment
>+mcstas/2.2a/module
>+mcstas/2.2a/share/adapt_tree-lib.c
>+mcstas/2.2a/share/adapt_tree-lib.h
>+mcstas/2.2a/share/general.c
>+mcstas/2.2a/share/general.h
>+mcstas/2.2a/share/interoff-lib.c
>+mcstas/2.2a/share/interoff-lib.h
>+mcstas/2.2a/share/interpolation/array-utils.c
>+mcstas/2.2a/share/interpolation/array-utils.h
>+mcstas/2.2a/share/interpolation/natural/README
>+mcstas/2.2a/share/interpolation/natural/delaunay.c
>+mcstas/2.2a/share/interpolation/natural/delaunay.h
>+mcstas/2.2a/share/interpolation/natural/example.c
>+mcstas/2.2a/share/interpolation/natural/natural.c
>+mcstas/2.2a/share/interpolation/natural/natural.h
>+mcstas/2.2a/share/interpolation/natural/predicates.c
>+mcstas/2.2a/share/interpolation/natural/utils-extra.c
>+mcstas/2.2a/share/interpolation/natural/utils-extra.h
>+mcstas/2.2a/share/interpolation/natural/vertex.h
>+mcstas/2.2a/share/interpolation/nearest/README
>+mcstas/2.2a/share/interpolation/nearest/example.c
>+mcstas/2.2a/share/interpolation/nearest/kdtree.c
>+mcstas/2.2a/share/interpolation/nearest/kdtree.h
>+mcstas/2.2a/share/interpolation/nearest/vertex.h
>+mcstas/2.2a/share/interpolation/resample.c
>+mcstas/2.2a/share/interpolation/resample.h
>+mcstas/2.2a/share/intersection.c
>+mcstas/2.2a/share/intersection.h
>+mcstas/2.2a/share/mccode-r.c
>+mcstas/2.2a/share/mccode-r.h
>+mcstas/2.2a/share/mcstas-r.c
>+mcstas/2.2a/share/mcstas-r.h
>+mcstas/2.2a/share/nxslib/README.TXT
>+mcstas/2.2a/share/nxslib/nxs.c
>+mcstas/2.2a/share/nxslib/nxs.h
>+mcstas/2.2a/share/nxslib/sgclib.c
>+mcstas/2.2a/share/nxslib/sgfind.c
>+mcstas/2.2a/share/nxslib/sghkl.c
>+mcstas/2.2a/share/nxslib/sginfo.h
>+mcstas/2.2a/share/nxslib/sgio.c
>+mcstas/2.2a/share/nxslib/sgsi.c
>+mcstas/2.2a/share/pol-lib.c
>+mcstas/2.2a/share/pol-lib.h
>+mcstas/2.2a/share/read_table-lib.c
>+mcstas/2.2a/share/read_table-lib.h
>+mcstas/2.2a/share/ref-lib.c
>+mcstas/2.2a/share/ref-lib.h
>+mcstas/2.2a/share/vitess-lib.c
>+mcstas/2.2a/share/vitess-lib.h
>+@dirrmtry mcstas/2.2a/bin
>+@dirrmtry mcstas/2.2a/data
>+@dirrmtry mcstas/2.2a/doc/man/man1
>+@dirrmtry mcstas/2.2a/doc/man
>+@dirrmtry mcstas/2.2a/doc
>+@dirrmtry mcstas/2.2a/share/interpolation/natural
>+@dirrmtry mcstas/2.2a/share/interpolation/nearest
>+@dirrmtry mcstas/2.2a/share/interpolation
>+@dirrmtry mcstas/2.2a/share/nxslib
>+@dirrmtry mcstas/2.2a/share
>+@dirrmtry mcstas/2.2a
>+@dirrmtry mcstas

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 204223: 162705