science/mcstats[-comps]: update 2.1 -> 2.2a

- Update PORTVERSION and distinfo to 2.2a
- Simplify DISTNAME/DISTFILES/MASTER_SITES/WRKSRC handling
- Clean up language in COMMENT (mcstas-comps only)
- Use PORTVERSION in PLIST_SUB and %%PORTVERSION%% in pkg-plist as
  as port installs self-contained under ${PREFIX}/mcstas/${PORTVERSION}
- Add pkg-install/pkg-install to SUB_FILES and rename appropriately
- Use PREFIX in pkg-install.in/pkg-deinstall.in
- Remove the post-fetch routines
- Switch unnecessary bsd.port.(pre|post).mk include to just bsd.port.mk
- Sync pkg-descr verbiage between ports and wrap at 76 characters

PR:		204223
PR:		204224
Submitted by:	Erik B Knudsen <erkn@fysik.dtu.dk> (maintainer)

10 files changed, 597 insertions, 638 deletions

diff --git a/science/mcstas-comps/Makefile b/science/mcstas-comps/Makefile
index c92fef0c777d..32156ec621f0 100644
--- a/science/mcstas-comps/Makefile
+++ b/science/mcstas-comps/Makefile
@@ -2,41 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	mcstas-comps
-PORTVERSION=	2.1
-#PORTREVISION=	beta
+PORTVERSION=	2.2a
 CATEGORIES=	science
-MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	McStas-${PORTVERSION}-UNIX-src.tar.gz
-DIST_SUBDIR=	mcstas
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/McStas-${PORTVERSION}-UNIX-src/
+DISTNAME=	mcstas-comps-${PORTVERSION}-src
 
 MAINTAINER=	erkn@fysik.dtu.dk
-COMMENT=	Component Library for McStas Monte Carlo neutron ray tracing
+COMMENT=	Component Library for the McStas neutron ray tracing package
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/mcstas/${PORTVERSION}/bin/mcstas:${PORTSDIR}/science/mcstas
 
-USES=		cmake gmake bison:build
+USES=		cmake gmake
 # Apparently cmake does not generate an install/strip target if nothing
 # is supposed to be stripped, so override the cmake-default install
 # target of install/strip by resetting STRIP
 STRIP=		#none
 CMAKE_ARGS=	"-Denable_mcstas=1"
-GNU_CONFIGURE=	yes
-#USE_GMAKE= yes
-#USE_BISON= yes
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-# this is necessary since mcxtrace and mcstas are packaged in a
-# single tarball in which the kernel, component library, 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-${PORTVERSION}-UNIX-src/${DISTNAME}.tar.gz;
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/mcstas-comps/distinfo b/science/mcstas-comps/distinfo
index 1060d2c16f9f..542418bee440 100644
--- a/science/mcstas-comps/distinfo
+++ b/science/mcstas-comps/distinfo
@@ -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-comps-2.2a-src.tar.gz) = 0a15a73c2bb280847c4bf6303e197b167fdbccef08739d4fdc60c762852c610f
+SIZE (mcstas-comps-2.2a-src.tar.gz) = 32227843
diff --git a/science/mcstas-comps/pkg-descr b/science/mcstas-comps/pkg-descr
index a3a51fac2a9f..2aaf67fb10db 100644
--- a/science/mcstas-comps/pkg-descr
+++ b/science/mcstas-comps/pkg-descr
@@ -1,6 +1,9 @@
-McStas component library for McStas, 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 - 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. 
+
+This port contains the McStas component library.
 
 WWW: http://www.mcstas.org
diff --git a/science/mcstas-comps/pkg-plist b/science/mcstas-comps/pkg-plist
index e1c137856172..d6bd4b8a3dfb 100644
--- a/science/mcstas-comps/pkg-plist
+++ b/science/mcstas-comps/pkg-plist
@@ -1,488 +1,493 @@
-mcstas/2.1/contrib/Al_window.comp
-mcstas/2.1/contrib/Analyser_ideal.comp
-mcstas/2.1/contrib/CavitiesIn.comp
-mcstas/2.1/contrib/CavitiesOut.comp
-mcstas/2.1/contrib/Collimator_ROC.comp
-mcstas/2.1/contrib/Elliptic_guide_gravity.comp
-mcstas/2.1/contrib/Exact_radial_coll.comp
-mcstas/2.1/contrib/FermiChopper_ILL.comp
-mcstas/2.1/contrib/Filter_graphite.comp
-mcstas/2.1/contrib/Gas_tables/BinBF3.table
-mcstas/2.1/contrib/Gas_tables/BinCF4.table
-mcstas/2.1/contrib/Gas_tables/He3inAr.table
-mcstas/2.1/contrib/Gas_tables/He3inC3H8.table
-mcstas/2.1/contrib/Gas_tables/He3inC4H10.table
-mcstas/2.1/contrib/Gas_tables/He3inCF4.table
-mcstas/2.1/contrib/Gas_tables/He3inCO2.table
-mcstas/2.1/contrib/Gas_tables/He3inHe.table
-mcstas/2.1/contrib/Gas_tables/He3inXeTMA2point5percent.table
-mcstas/2.1/contrib/Gas_tables/He3inXeTMA5percent.table
-mcstas/2.1/contrib/Gas_tables/NinCF4.table
-mcstas/2.1/contrib/Gas_tables/NinN2.table
-mcstas/2.1/contrib/Gas_tables/gas.table
-mcstas/2.1/contrib/Guide_curved.comp
-mcstas/2.1/contrib/Guide_four_side.comp
-mcstas/2.1/contrib/Guide_four_side_10_shells.comp
-mcstas/2.1/contrib/Guide_four_side_2_shells.comp
-mcstas/2.1/contrib/Guide_honeycomb.comp
-mcstas/2.1/contrib/He3_cell.comp
-mcstas/2.1/contrib/ISIS_moderator.comp
-mcstas/2.1/contrib/ISIS_tables/TS1.ch4
-mcstas/2.1/contrib/ISIS_tables/TS1.crisp
-mcstas/2.1/contrib/ISIS_tables/TS1.evs
-mcstas/2.1/contrib/ISIS_tables/TS1.gem
-mcstas/2.1/contrib/ISIS_tables/TS1.h2
-mcstas/2.1/contrib/ISIS_tables/TS1.het
-mcstas/2.1/contrib/ISIS_tables/TS1.hrpd
-mcstas/2.1/contrib/ISIS_tables/TS1.iris
-mcstas/2.1/contrib/ISIS_tables/TS1.maps
-mcstas/2.1/contrib/ISIS_tables/TS1.mari
-mcstas/2.1/contrib/ISIS_tables/TS1.pearl
-mcstas/2.1/contrib/ISIS_tables/TS1.polaris
-mcstas/2.1/contrib/ISIS_tables/TS1.prisma
-mcstas/2.1/contrib/ISIS_tables/TS1.sandals
-mcstas/2.1/contrib/ISIS_tables/TS1.surf
-mcstas/2.1/contrib/ISIS_tables/TS1.sxd
-mcstas/2.1/contrib/ISIS_tables/TS1.tosca
-mcstas/2.1/contrib/ISIS_tables/TS1.water
-mcstas/2.1/contrib/ISIS_tables/TS2.broad
-mcstas/2.1/contrib/ISIS_tables/TS2.e1
-mcstas/2.1/contrib/ISIS_tables/TS2.e2
-mcstas/2.1/contrib/ISIS_tables/TS2.e3
-mcstas/2.1/contrib/ISIS_tables/TS2.e4
-mcstas/2.1/contrib/ISIS_tables/TS2.e5
-mcstas/2.1/contrib/ISIS_tables/TS2.e6
-mcstas/2.1/contrib/ISIS_tables/TS2.e7
-mcstas/2.1/contrib/ISIS_tables/TS2.e8
-mcstas/2.1/contrib/ISIS_tables/TS2.e9
-mcstas/2.1/contrib/ISIS_tables/TS2.groove
-mcstas/2.1/contrib/ISIS_tables/TS2.hydrogen
-mcstas/2.1/contrib/ISIS_tables/TS2.narrow
-mcstas/2.1/contrib/ISIS_tables/TS2.w1
-mcstas/2.1/contrib/ISIS_tables/TS2.w2
-mcstas/2.1/contrib/ISIS_tables/TS2.w3
-mcstas/2.1/contrib/ISIS_tables/TS2.w4
-mcstas/2.1/contrib/ISIS_tables/TS2.w5
-mcstas/2.1/contrib/ISIS_tables/TS2.w6
-mcstas/2.1/contrib/ISIS_tables/TS2.w7
-mcstas/2.1/contrib/ISIS_tables/TS2.w8
-mcstas/2.1/contrib/ISIS_tables/TS2.w9
-mcstas/2.1/contrib/Lens.comp
-mcstas/2.1/contrib/Lens_simple.comp
-mcstas/2.1/contrib/Mirror_Curved_Bispectral.comp
-mcstas/2.1/contrib/Mirror_Elliptic.comp
-mcstas/2.1/contrib/Mirror_Elliptic_Bispectral.comp
-mcstas/2.1/contrib/Mirror_Parabolic.comp
-mcstas/2.1/contrib/Monochromator_2foc.comp
-mcstas/2.1/contrib/Multilayer_Sample.comp
-mcstas/2.1/contrib/Neutronics/runscript.sh
-mcstas/2.1/contrib/Neutronics/subs.f
-mcstas/2.1/contrib/Neutronics/testSSR
-mcstas/2.1/contrib/Neutronics/testSSW
-mcstas/2.1/contrib/PSD_Detector.comp
-mcstas/2.1/contrib/PSD_monitor_rad.comp
-mcstas/2.1/contrib/Pol_bender_tapering.comp
-mcstas/2.1/contrib/Pol_pi_2_rotator.comp
-mcstas/2.1/contrib/Pol_triafield.comp
-mcstas/2.1/contrib/Radial_div.comp
-mcstas/2.1/contrib/SANSCurve.comp
-mcstas/2.1/contrib/SANSCylinders.comp
-mcstas/2.1/contrib/SANSEllipticCylinders.comp
-mcstas/2.1/contrib/SANSLiposomes.comp
-mcstas/2.1/contrib/SANSNanodiscs.comp
-mcstas/2.1/contrib/SANSNanodiscsFast.comp
-mcstas/2.1/contrib/SANSNanodiscsWithTags.comp
-mcstas/2.1/contrib/SANSNanodiscsWithTagsFast.comp
-mcstas/2.1/contrib/SANSPDB.comp
-mcstas/2.1/contrib/SANSPDBFast.comp
-mcstas/2.1/contrib/SANSQMonitor.comp
-mcstas/2.1/contrib/SANSShells.comp
-mcstas/2.1/contrib/SANSSpheres.comp
-mcstas/2.1/contrib/SANS_AnySamp.comp
-mcstas/2.1/contrib/SANS_DebyeS.comp
-mcstas/2.1/contrib/SANS_Guinier.comp
-mcstas/2.1/contrib/SANS_benchmark2.comp
-mcstas/2.1/contrib/SNS_source.comp
-mcstas/2.1/contrib/SNS_source_analytic.comp
-mcstas/2.1/contrib/Sample_nxs.comp
-mcstas/2.1/contrib/SiC.comp
-mcstas/2.1/contrib/Source_gen4.comp
-mcstas/2.1/contrib/Source_multi_surfaces.comp
-mcstas/2.1/contrib/StatisticalChopper.comp
-mcstas/2.1/contrib/StatisticalChopper_Monitor.comp
-mcstas/2.1/contrib/TOFSANSdet.comp
-mcstas/2.1/contrib/Transmission_polarisatorABSnT.comp
-mcstas/2.1/contrib/Virtual_mcnp_input.comp
-mcstas/2.1/contrib/Virtual_mcnp_output.comp
-mcstas/2.1/contrib/Virtual_mcnp_ss_input.comp
-mcstas/2.1/contrib/Virtual_mcnp_ss_output.comp
-mcstas/2.1/contrib/Virtual_tripoli4_input.comp
-mcstas/2.1/contrib/Virtual_tripoli4_output.comp
-mcstas/2.1/contrib/doc/ISISdoc.pdf
-mcstas/2.1/contrib/doc/ISISdoc.ps
-mcstas/2.1/contrib/multi_pipe.comp
-mcstas/2.1/data/Ag.laz
-mcstas/2.1/data/Al.lau
-mcstas/2.1/data/Al.laz
-mcstas/2.1/data/Al2O3_sapphire.lau
-mcstas/2.1/data/Al2O3_sapphire.laz
-mcstas/2.1/data/Al2O3_sapphire.trm
-mcstas/2.1/data/Au.laz
-mcstas/2.1/data/B4C.lau
-mcstas/2.1/data/B4C.laz
-mcstas/2.1/data/Ba.laz
-mcstas/2.1/data/Be.laz
-mcstas/2.1/data/Be.trm
-mcstas/2.1/data/BeO.lau
-mcstas/2.1/data/BeO.laz
-mcstas/2.1/data/Bi.laz
-mcstas/2.1/data/C60.lau
-mcstas/2.1/data/C_diamond.lau
-mcstas/2.1/data/C_diamond.laz
-mcstas/2.1/data/C_graphite.lau
-mcstas/2.1/data/C_graphite.laz
-mcstas/2.1/data/Cd.laz
-mcstas/2.1/data/Cr.laz
-mcstas/2.1/data/Cs.laz
-mcstas/2.1/data/Cs_liq_tot.sqw
-mcstas/2.1/data/Cu.laz
-mcstas/2.1/data/D2O_liq.qSq
-mcstas/2.1/data/Fe.laz
-mcstas/2.1/data/Fe_Gamma.laz
-mcstas/2.1/data/Ga.laz
-mcstas/2.1/data/Gd.laz
-mcstas/2.1/data/Ge.lau
-mcstas/2.1/data/Ge.laz
-mcstas/2.1/data/Ge_liq_coh.sqw
-mcstas/2.1/data/Ge_liq_inc.sqw
-mcstas/2.1/data/H2OD2O_liq.qSq
-mcstas/2.1/data/H2O_ice_1h.laz
-mcstas/2.1/data/H2O_liq.qSq
-mcstas/2.1/data/HOPG.rfl
-mcstas/2.1/data/HOPG.trm
-mcstas/2.1/data/He4_hcp.laz
-mcstas/2.1/data/He4_liq_coh.sqw
-mcstas/2.1/data/Hg.laz
-mcstas/2.1/data/I2.laz
-mcstas/2.1/data/In.lau
-mcstas/2.1/data/Instructions_new_lau_file.pdf
-mcstas/2.1/data/K.laz
-mcstas/2.1/data/Li.laz
-mcstas/2.1/data/LiF.laz
-mcstas/2.1/data/Mo.laz
-mcstas/2.1/data/Na2Ca3Al2F14.laz
-mcstas/2.1/data/Nb.laz
-mcstas/2.1/data/Ne_liq_tot.sqw
-mcstas/2.1/data/Ni.laz
-mcstas/2.1/data/PPase_D_P1.lau
-mcstas/2.1/data/Pb.laz
-mcstas/2.1/data/Pd.laz
-mcstas/2.1/data/Pt.laz
-mcstas/2.1/data/README
-mcstas/2.1/data/Rb.laz
-mcstas/2.1/data/Rb_liq_coh.sqw
-mcstas/2.1/data/Rb_liq_inc.sqw
-mcstas/2.1/data/Rb_liq_tot.sqw
-mcstas/2.1/data/Reflectometer_directbeam.txt
-mcstas/2.1/data/Reflectometer_reffile.txt
-mcstas/2.1/data/Rubredoxin.lau
-mcstas/2.1/data/Se_alpha.laz
-mcstas/2.1/data/Se_beta.laz
-mcstas/2.1/data/Si.laz
-mcstas/2.1/data/SiO2_cristobalite.lau
-mcstas/2.1/data/SiO2_liq.qSq
-mcstas/2.1/data/SiO2_quartza.lau
-mcstas/2.1/data/SiO2_quartza.laz
-mcstas/2.1/data/SiO2_quartzb.lau
-mcstas/2.1/data/SiO2_quartzb.laz
-mcstas/2.1/data/Sn_alpha.laz
-mcstas/2.1/data/Sn_beta.laz
-mcstas/2.1/data/Ti.laz
-mcstas/2.1/data/TiO2_rutile.lau
-mcstas/2.1/data/Tl.laz
-mcstas/2.1/data/V.laz
-mcstas/2.1/data/Y2O3.laz
-mcstas/2.1/data/Y3Fe5O12_YIG.laz
-mcstas/2.1/data/YBaCuO.lau
-mcstas/2.1/data/Zn.laz
-mcstas/2.1/data/Zr.laz
-mcstas/2.1/data/a1Gw2-11-f5_fit_fit.dat
-mcstas/2.1/data/a1Gw2-14-f5_fit_fit.dat
-mcstas/2.1/data/a1Gw2-17-f5_fit_fit.dat
-mcstas/2.1/data/a1Gw2-2-f5_fit_fit.dat
-mcstas/2.1/data/a1Gw2-5-f5_fit_fit.dat
-mcstas/2.1/data/a1Gw2-8-f5_fit_fit.dat
-mcstas/2.1/data/adrenaline.lau
-mcstas/2.1/data/aspirin.lau
-mcstas/2.1/data/b2_l220_tp80_cw1.18mm.dat
-mcstas/2.1/data/bender_r_ideal.dat
-mcstas/2.1/data/cube.off
-mcstas/2.1/data/flipfield.dat
-mcstas/2.1/data/leucine.lau
-mcstas/2.1/data/rot4m_sp_fit_fit.dat
-mcstas/2.1/data/socket.off
-mcstas/2.1/data/source_sct091_tu_02_1.dat
-mcstas/2.1/data/source_sct21a_td_05_1.dat
-mcstas/2.1/data/supermirror_m2.rfl
-mcstas/2.1/data/supermirror_m3.rfl
-mcstas/2.1/data/ver5tf2mm_sp_fit_fit.dat
-mcstas/2.1/editors/README
-mcstas/2.1/editors/emacs
-mcstas/2.1/editors/mccode.vim
-mcstas/2.1/editors/mcstas.xml
-mcstas/2.1/editors/mcstas1.lang
-mcstas/2.1/editors/mcstas2.lang
-mcstas/2.1/editors/mcstas3.lang
-mcstas/2.1/editors/nedit
-mcstas/2.1/examples/BNL_H8.instr
-mcstas/2.1/examples/ESS_2001_bispectral.instr
-mcstas/2.1/examples/ESS_Brilliance_2001.instr
-mcstas/2.1/examples/ESS_Brilliance_2013.instr
-mcstas/2.1/examples/ESS_Brilliance_2014.instr
-mcstas/2.1/examples/ESS_Brilliance_TDR.instr
-mcstas/2.1/examples/ESS_IN5_reprate.instr
-mcstas/2.1/examples/FZJ_BenchmarkSfin2.instr
-mcstas/2.1/examples/FZJ_KWS2_Lens.instr
-mcstas/2.1/examples/FZJ_SANS_KWS2_AnySample.instr
-mcstas/2.1/examples/Gallmeier_SNS_decoupled_poisoned.instr
-mcstas/2.1/examples/Granroth_SNS_decoupled_poisoned.instr
-mcstas/2.1/examples/HZB_FLEX.instr
-mcstas/2.1/examples/HZB_NEAT.instr
-mcstas/2.1/examples/Histogrammer.instr
-mcstas/2.1/examples/ILL_BRISP.instr
-mcstas/2.1/examples/ILL_D2B.instr
-mcstas/2.1/examples/ILL_D4.instr
-mcstas/2.1/examples/ILL_H10_IN8.instr
-mcstas/2.1/examples/ILL_H113.instr
-mcstas/2.1/examples/ILL_H13_IN20.instr
-mcstas/2.1/examples/ILL_H142.instr
-mcstas/2.1/examples/ILL_H142_IN12.instr
-mcstas/2.1/examples/ILL_H143_LADI.instr
-mcstas/2.1/examples/ILL_H15.instr
-mcstas/2.1/examples/ILL_H15_IN6.instr
-mcstas/2.1/examples/ILL_H16.instr
-mcstas/2.1/examples/ILL_H16_IN5.instr
-mcstas/2.1/examples/ILL_H16_IN5_Mantid.instr
-mcstas/2.1/examples/ILL_H16_Mantid.instr
-mcstas/2.1/examples/ILL_H22.instr
-mcstas/2.1/examples/ILL_H22_D1A.instr
-mcstas/2.1/examples/ILL_H22_D1B.instr
-mcstas/2.1/examples/ILL_H22_VIVALDI.instr
-mcstas/2.1/examples/ILL_H24.instr
-mcstas/2.1/examples/ILL_H25.instr
-mcstas/2.1/examples/ILL_H25_IN22.instr
-mcstas/2.1/examples/ILL_H512_D22.instr
-mcstas/2.1/examples/ILL_H53.instr
-mcstas/2.1/examples/ILL_H53_D16.instr
-mcstas/2.1/examples/ILL_H53_IN14.instr
-mcstas/2.1/examples/ILL_H8_IN1.instr
-mcstas/2.1/examples/ILL_IN5.instr
-mcstas/2.1/examples/ILL_IN5_Mantid.instr
-mcstas/2.1/examples/ILL_IN6.instr
-mcstas/2.1/examples/ILL_Lagrange.instr
-mcstas/2.1/examples/ISIS_CRISP.instr
-mcstas/2.1/examples/ISIS_GEM.instr
-mcstas/2.1/examples/ISIS_HET.instr
-mcstas/2.1/examples/ISIS_Prisma2.instr
-mcstas/2.1/examples/ISIS_SANS2d.instr
-mcstas/2.1/examples/ISIS_TS1_Brilliance.instr
-mcstas/2.1/examples/ISIS_TS2_Brilliance.instr
-mcstas/2.1/examples/ISIS_test.instr
-mcstas/2.1/examples/Mezei_SNS_decoupled_poisoned.instr
-mcstas/2.1/examples/PSI_DMC.instr
-mcstas/2.1/examples/PSI_Focus.instr
-mcstas/2.1/examples/RITA-II.instr
-mcstas/2.1/examples/RITA-II_test.sh
-mcstas/2.1/examples/RTP_DIF.instr
-mcstas/2.1/examples/RTP_Laue.instr
-mcstas/2.1/examples/RTP_NeutronRadiography.instr
-mcstas/2.1/examples/RTP_SANS.instr
-mcstas/2.1/examples/Reflectometer.instr
-mcstas/2.1/examples/SEMSANS_instrument.instr
-mcstas/2.1/examples/SNS_analytic_test.instr
-mcstas/2.1/examples/SNS_test.instr
-mcstas/2.1/examples/Samples_Incoherent.instr
-mcstas/2.1/examples/Samples_Incoherent_off.instr
-mcstas/2.1/examples/Samples_Isotropic_Sqw.instr
-mcstas/2.1/examples/Samples_Phonon.instr
-mcstas/2.1/examples/Samples_vanadium.instr
-mcstas/2.1/examples/TestSANS.instr
-mcstas/2.1/examples/Test_Collimator_Radial.instr
-mcstas/2.1/examples/Test_Fermi.instr
-mcstas/2.1/examples/Test_FocalisationMirrors.instr
-mcstas/2.1/examples/Test_Guides.instr
-mcstas/2.1/examples/Test_Guides_Curved.instr
-mcstas/2.1/examples/Test_Lens.instr
-mcstas/2.1/examples/Test_Magnetic_Constant.instr
-mcstas/2.1/examples/Test_Magnetic_Majorana.instr
-mcstas/2.1/examples/Test_Magnetic_Rotation.instr
-mcstas/2.1/examples/Test_Magnetic_Userdefined.instr
-mcstas/2.1/examples/Test_Monitor_Sqw.instr
-mcstas/2.1/examples/Test_Monochromators.instr
-mcstas/2.1/examples/Test_PSD_Detector.instr
-mcstas/2.1/examples/Test_Pol_Bender.instr
-mcstas/2.1/examples/Test_Pol_Bender_Vs_Guide_Curved.instr
-mcstas/2.1/examples/Test_Pol_Guide_Vmirror.instr
-mcstas/2.1/examples/Test_Pol_MSF.instr
-mcstas/2.1/examples/Test_Pol_Mirror.instr
-mcstas/2.1/examples/Test_Pol_Set.instr
-mcstas/2.1/examples/Test_Pol_TripleAxis.instr
-mcstas/2.1/examples/Test_SSR_SSW.instr
-mcstas/2.1/examples/Test_SSR_SSW_Guide.instr
-mcstas/2.1/examples/Test_Sample_nxs_diffraction.instr
-mcstas/2.1/examples/Test_Sample_nxs_imaging.instr
-mcstas/2.1/examples/Test_Scatter_log_losses.instr
-mcstas/2.1/examples/Test_Scatter_log_mvalues.instr
-mcstas/2.1/examples/Test_Scatter_log_ssw_mcnp.instr
-mcstas/2.1/examples/Test_Selectors.instr
-mcstas/2.1/examples/Test_Sources.instr
-mcstas/2.1/examples/Test_StatisticalChopper.instr
-mcstas/2.1/examples/Test_pol_tabled.instr
-mcstas/2.1/examples/Test_shellguides.instr
-mcstas/2.1/examples/Tomography.instr
-mcstas/2.1/examples/Vin_test.instr
-mcstas/2.1/examples/Vout_test.instr
-mcstas/2.1/examples/h8_test_legacy.instr
-mcstas/2.1/examples/linup-1.instr
-mcstas/2.1/examples/linup-2.instr
-mcstas/2.1/examples/linup-3.instr
-mcstas/2.1/examples/linup-4.instr
-mcstas/2.1/examples/linup-5.instr
-mcstas/2.1/examples/linup-6.instr
-mcstas/2.1/examples/linup-7.instr
-mcstas/2.1/examples/template.instr
-mcstas/2.1/examples/templateDIFF.instr
-mcstas/2.1/examples/templateLaue.instr
-mcstas/2.1/examples/templateNMX.instr
-mcstas/2.1/examples/templateSANS.instr
-mcstas/2.1/examples/templateSANS_Mantid.instr
-mcstas/2.1/examples/templateTAS.instr
-mcstas/2.1/examples/templateTOF.instr
-mcstas/2.1/misc/Beam_spy.comp
-mcstas/2.1/misc/PolAnalyser_ideal.comp
-mcstas/2.1/misc/Progress_bar.comp
-mcstas/2.1/misc/Scatter_log_iterator.comp
-mcstas/2.1/misc/Scatter_log_iterator_stop.comp
-mcstas/2.1/misc/Scatter_logger.comp
-mcstas/2.1/misc/Scatter_logger_stop.comp
-mcstas/2.1/misc/Set_pol.comp
-mcstas/2.1/misc/Shape.comp
-mcstas/2.1/misc/Vitess_input.comp
-mcstas/2.1/misc/Vitess_output.comp
-mcstas/2.1/monitors/Brilliance_monitor.comp
-mcstas/2.1/monitors/DivLambda_monitor.comp
-mcstas/2.1/monitors/DivPos_monitor.comp
-mcstas/2.1/monitors/Divergence_monitor.comp
-mcstas/2.1/monitors/EPSD_monitor.comp
-mcstas/2.1/monitors/E_monitor.comp
-mcstas/2.1/monitors/Hdiv_monitor.comp
-mcstas/2.1/monitors/L_monitor.comp
-mcstas/2.1/monitors/MeanPolLambda_monitor.comp
-mcstas/2.1/monitors/Monitor.comp
-mcstas/2.1/monitors/Monitor_4PI.comp
-mcstas/2.1/monitors/Monitor_Sqw.comp
-mcstas/2.1/monitors/Monitor_nD.comp
-mcstas/2.1/monitors/PSD_TOF_monitor.comp
-mcstas/2.1/monitors/PSD_monitor.comp
-mcstas/2.1/monitors/PSD_monitor_4PI.comp
-mcstas/2.1/monitors/PSD_monitor_psf.comp
-mcstas/2.1/monitors/PSD_monitor_psf_eff.comp
-mcstas/2.1/monitors/PSDcyl_monitor.comp
-mcstas/2.1/monitors/PSDlin_diff_monitor.comp
-mcstas/2.1/monitors/PSDlin_monitor.comp
-mcstas/2.1/monitors/PolLambda_monitor.comp
-mcstas/2.1/monitors/Pol_monitor.comp
-mcstas/2.1/monitors/PreMonitor_nD.comp
-mcstas/2.1/monitors/Res_monitor.comp
-mcstas/2.1/monitors/TOF2E_monitor.comp
-mcstas/2.1/monitors/TOF2Q_cylPSD_monitor.comp
-mcstas/2.1/monitors/TOFLambda_monitor.comp
-mcstas/2.1/monitors/TOF_PSD_monitor_rad.comp
-mcstas/2.1/monitors/TOF_cylPSD_monitor.comp
-mcstas/2.1/monitors/TOF_monitor.comp
-mcstas/2.1/monitors/TOFlog_monitor.comp
-mcstas/2.1/obsolete/ESS_moderator_long.comp
-mcstas/2.1/obsolete/ESS_moderator_long_2001.comp
-mcstas/2.1/obsolete/ESS_moderator_short.comp
-mcstas/2.1/obsolete/V_sample.comp
-mcstas/2.1/optics/Absorber.comp
-mcstas/2.1/optics/Arm.comp
-mcstas/2.1/optics/Beamstop.comp
-mcstas/2.1/optics/Bender.comp
-mcstas/2.1/optics/Collimator_linear.comp
-mcstas/2.1/optics/Collimator_radial.comp
-mcstas/2.1/optics/Derotator.comp
-mcstas/2.1/optics/DiskChopper.comp
-mcstas/2.1/optics/FermiChopper.comp
-mcstas/2.1/optics/Filter_gen.comp
-mcstas/2.1/optics/Guide.comp
-mcstas/2.1/optics/Guide_anyshape.comp
-mcstas/2.1/optics/Guide_channeled.comp
-mcstas/2.1/optics/Guide_gravity.comp
-mcstas/2.1/optics/Guide_tapering.comp
-mcstas/2.1/optics/Guide_wavy.comp
-mcstas/2.1/optics/Mirror.comp
-mcstas/2.1/optics/Monochromator_curved.comp
-mcstas/2.1/optics/Monochromator_flat.comp
-mcstas/2.1/optics/Monochromator_pol.comp
-mcstas/2.1/optics/Pol_bender.comp
-mcstas/2.1/optics/Pol_constBfield.comp
-mcstas/2.1/optics/Pol_guide_vmirror.comp
-mcstas/2.1/optics/Pol_mirror.comp
-mcstas/2.1/optics/Pol_simpleBfield.comp
-mcstas/2.1/optics/Pol_simpleBfield_stop.comp
-mcstas/2.1/optics/Rotator.comp
-mcstas/2.1/optics/Selector.comp
-mcstas/2.1/optics/Slit.comp
-mcstas/2.1/optics/V_selector.comp
-mcstas/2.1/optics/Virtual_mcnp_ss_Guide.comp
-mcstas/2.1/optics/Vitess_ChopperFermi.comp
-mcstas/2.1/samples/Incoherent.comp
-mcstas/2.1/samples/Isotropic_Sqw.comp
-mcstas/2.1/samples/Phonon_simple.comp
-mcstas/2.1/samples/Powder1.comp
-mcstas/2.1/samples/PowderN.comp
-mcstas/2.1/samples/Res_sample.comp
-mcstas/2.1/samples/Sans_spheres.comp
-mcstas/2.1/samples/Single_crystal.comp
-mcstas/2.1/samples/TOFRes_sample.comp
-mcstas/2.1/samples/Tunneling_sample.comp
-mcstas/2.1/share/chopper_fermi.c
-mcstas/2.1/share/chopper_fermi.h
-mcstas/2.1/share/ess_source-lib.c
-mcstas/2.1/share/ess_source-lib.h
-mcstas/2.1/share/monitor_nd-lib.c
-mcstas/2.1/share/monitor_nd-lib.h
-mcstas/2.1/sources/Adapt_check.comp
-mcstas/2.1/sources/ESS_moderator.comp
-mcstas/2.1/sources/Moderator.comp
-mcstas/2.1/sources/Monitor_Optimizer.comp
-mcstas/2.1/sources/Source_Maxwell_3.comp
-mcstas/2.1/sources/Source_Optimizer.comp
-mcstas/2.1/sources/Source_adapt.comp
-mcstas/2.1/sources/Source_div.comp
-mcstas/2.1/sources/Source_gen.comp
-mcstas/2.1/sources/Source_simple.comp
-mcstas/2.1/sources/Virtual_input.comp
-mcstas/2.1/sources/Virtual_output.comp
-@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/SANS
-@dir mcstas/2.1/contrib/doc
-@dir mcstas/2.1/contrib
-@dir mcstas/2.1/data
-@dir mcstas/2.1/editors
-@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
-@dir mcstas/2.1/sources
-@dir mcstas/2.1
-@dir mcstas
+mcstas/%%PORTVERSION%%/contrib/Al_window.comp
+mcstas/%%PORTVERSION%%/contrib/Analyser_ideal.comp
+mcstas/%%PORTVERSION%%/contrib/CavitiesIn.comp
+mcstas/%%PORTVERSION%%/contrib/CavitiesOut.comp
+mcstas/%%PORTVERSION%%/contrib/Collimator_ROC.comp
+mcstas/%%PORTVERSION%%/contrib/Elliptic_guide_gravity.comp
+mcstas/%%PORTVERSION%%/contrib/Exact_radial_coll.comp
+mcstas/%%PORTVERSION%%/contrib/FermiChopper_ILL.comp
+mcstas/%%PORTVERSION%%/contrib/Filter_graphite.comp
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/BinBF3.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/BinCF4.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inAr.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inC3H8.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inC4H10.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inCF4.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inCO2.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inHe.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inXeTMA2point5percent.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/He3inXeTMA5percent.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/NinCF4.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/NinN2.table
+mcstas/%%PORTVERSION%%/contrib/Gas_tables/gas.table
+mcstas/%%PORTVERSION%%/contrib/Guide_curved.comp
+mcstas/%%PORTVERSION%%/contrib/Guide_four_side.comp
+mcstas/%%PORTVERSION%%/contrib/Guide_four_side_10_shells.comp
+mcstas/%%PORTVERSION%%/contrib/Guide_four_side_2_shells.comp
+mcstas/%%PORTVERSION%%/contrib/Guide_honeycomb.comp
+mcstas/%%PORTVERSION%%/contrib/He3_cell.comp
+mcstas/%%PORTVERSION%%/contrib/ISIS_moderator.comp
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.ch4
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.crisp
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.evs
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.gem
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.h2
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.het
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.hrpd
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.iris
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.maps
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.mari
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.pearl
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.polaris
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.prisma
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.sandals
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.surf
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.sxd
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.tosca
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS1.water
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.broad
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e1
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e2
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e3
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e4
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e5
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e6
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e7
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e8
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.e9
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.groove
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.hydrogen
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.narrow
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w1
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w2
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w3
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w4
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w5
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w6
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w7
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w8
+mcstas/%%PORTVERSION%%/contrib/ISIS_tables/TS2.w9
+mcstas/%%PORTVERSION%%/contrib/Lens.comp
+mcstas/%%PORTVERSION%%/contrib/Lens_simple.comp
+mcstas/%%PORTVERSION%%/contrib/Mirror_Curved_Bispectral.comp
+mcstas/%%PORTVERSION%%/contrib/Mirror_Elliptic.comp
+mcstas/%%PORTVERSION%%/contrib/Mirror_Elliptic_Bispectral.comp
+mcstas/%%PORTVERSION%%/contrib/Mirror_Parabolic.comp
+mcstas/%%PORTVERSION%%/contrib/Monochromator_2foc.comp
+mcstas/%%PORTVERSION%%/contrib/Multilayer_Sample.comp
+mcstas/%%PORTVERSION%%/contrib/Neutronics/runscript.sh
+mcstas/%%PORTVERSION%%/contrib/Neutronics/subs.f
+mcstas/%%PORTVERSION%%/contrib/Neutronics/testSSR
+mcstas/%%PORTVERSION%%/contrib/Neutronics/testSSW
+mcstas/%%PORTVERSION%%/contrib/PSD_Detector.comp
+mcstas/%%PORTVERSION%%/contrib/PSD_monitor_rad.comp
+mcstas/%%PORTVERSION%%/contrib/Pol_bender_tapering.comp
+mcstas/%%PORTVERSION%%/contrib/Pol_pi_2_rotator.comp
+mcstas/%%PORTVERSION%%/contrib/Pol_triafield.comp
+mcstas/%%PORTVERSION%%/contrib/Radial_div.comp
+mcstas/%%PORTVERSION%%/contrib/SANSCurve.comp
+mcstas/%%PORTVERSION%%/contrib/SANSCylinders.comp
+mcstas/%%PORTVERSION%%/contrib/SANSEllipticCylinders.comp
+mcstas/%%PORTVERSION%%/contrib/SANSLiposomes.comp
+mcstas/%%PORTVERSION%%/contrib/SANSNanodiscs.comp
+mcstas/%%PORTVERSION%%/contrib/SANSNanodiscsFast.comp
+mcstas/%%PORTVERSION%%/contrib/SANSNanodiscsWithTags.comp
+mcstas/%%PORTVERSION%%/contrib/SANSNanodiscsWithTagsFast.comp
+mcstas/%%PORTVERSION%%/contrib/SANSPDB.comp
+mcstas/%%PORTVERSION%%/contrib/SANSPDBFast.comp
+mcstas/%%PORTVERSION%%/contrib/SANSQMonitor.comp
+mcstas/%%PORTVERSION%%/contrib/SANSShells.comp
+mcstas/%%PORTVERSION%%/contrib/SANSSpheres.comp
+mcstas/%%PORTVERSION%%/contrib/SANS_AnySamp.comp
+mcstas/%%PORTVERSION%%/contrib/SANS_DebyeS.comp
+mcstas/%%PORTVERSION%%/contrib/SANS_Guinier.comp
+mcstas/%%PORTVERSION%%/contrib/SANS_benchmark2.comp
+mcstas/%%PORTVERSION%%/contrib/SNS_source.comp
+mcstas/%%PORTVERSION%%/contrib/SNS_source_analytic.comp
+mcstas/%%PORTVERSION%%/contrib/Sample_nxs.comp
+mcstas/%%PORTVERSION%%/contrib/SiC.comp
+mcstas/%%PORTVERSION%%/contrib/Source_gen4.comp
+mcstas/%%PORTVERSION%%/contrib/Source_multi_surfaces.comp
+mcstas/%%PORTVERSION%%/contrib/StatisticalChopper.comp
+mcstas/%%PORTVERSION%%/contrib/StatisticalChopper_Monitor.comp
+mcstas/%%PORTVERSION%%/contrib/TOFSANSdet.comp
+mcstas/%%PORTVERSION%%/contrib/Transmission_polarisatorABSnT.comp
+mcstas/%%PORTVERSION%%/contrib/Virtual_mcnp_input.comp
+mcstas/%%PORTVERSION%%/contrib/Virtual_mcnp_output.comp
+mcstas/%%PORTVERSION%%/contrib/Virtual_mcnp_ss_input.comp
+mcstas/%%PORTVERSION%%/contrib/Virtual_mcnp_ss_output.comp
+mcstas/%%PORTVERSION%%/contrib/Virtual_tripoli4_input.comp
+mcstas/%%PORTVERSION%%/contrib/Virtual_tripoli4_output.comp
+mcstas/%%PORTVERSION%%/contrib/doc/ISISdoc.pdf
+mcstas/%%PORTVERSION%%/contrib/doc/ISISdoc.ps
+mcstas/%%PORTVERSION%%/contrib/multi_pipe.comp
+mcstas/%%PORTVERSION%%/data/Ag.laz
+mcstas/%%PORTVERSION%%/data/Al.lau
+mcstas/%%PORTVERSION%%/data/Al.laz
+mcstas/%%PORTVERSION%%/data/Al2O3_sapphire.lau
+mcstas/%%PORTVERSION%%/data/Al2O3_sapphire.laz
+mcstas/%%PORTVERSION%%/data/Al2O3_sapphire.trm
+mcstas/%%PORTVERSION%%/data/Au.laz
+mcstas/%%PORTVERSION%%/data/B4C.lau
+mcstas/%%PORTVERSION%%/data/B4C.laz
+mcstas/%%PORTVERSION%%/data/Ba.laz
+mcstas/%%PORTVERSION%%/data/Be.laz
+mcstas/%%PORTVERSION%%/data/Be.trm
+mcstas/%%PORTVERSION%%/data/BeO.lau
+mcstas/%%PORTVERSION%%/data/BeO.laz
+mcstas/%%PORTVERSION%%/data/Bi.laz
+mcstas/%%PORTVERSION%%/data/C60.lau
+mcstas/%%PORTVERSION%%/data/C_diamond.lau
+mcstas/%%PORTVERSION%%/data/C_diamond.laz
+mcstas/%%PORTVERSION%%/data/C_graphite.lau
+mcstas/%%PORTVERSION%%/data/C_graphite.laz
+mcstas/%%PORTVERSION%%/data/CaF2.lau
+mcstas/%%PORTVERSION%%/data/Cd.laz
+mcstas/%%PORTVERSION%%/data/Cr.laz
+mcstas/%%PORTVERSION%%/data/Cs.laz
+mcstas/%%PORTVERSION%%/data/Cs_liq_tot.sqw
+mcstas/%%PORTVERSION%%/data/Cu.laz
+mcstas/%%PORTVERSION%%/data/D2O_liq.qSq
+mcstas/%%PORTVERSION%%/data/D2O_liq_300_tot.sqw
+mcstas/%%PORTVERSION%%/data/Fe.laz
+mcstas/%%PORTVERSION%%/data/Fe_Gamma.laz
+mcstas/%%PORTVERSION%%/data/Ga.laz
+mcstas/%%PORTVERSION%%/data/Gd.laz
+mcstas/%%PORTVERSION%%/data/Ge.lau
+mcstas/%%PORTVERSION%%/data/Ge.laz
+mcstas/%%PORTVERSION%%/data/Ge_liq_coh.sqw
+mcstas/%%PORTVERSION%%/data/Ge_liq_inc.sqw
+mcstas/%%PORTVERSION%%/data/H2OD2O_liq.qSq
+mcstas/%%PORTVERSION%%/data/H2O_ice_1h.laz
+mcstas/%%PORTVERSION%%/data/H2O_liq.qSq
+mcstas/%%PORTVERSION%%/data/H2O_liq_300_tot.sqw
+mcstas/%%PORTVERSION%%/data/HOPG.rfl
+mcstas/%%PORTVERSION%%/data/HOPG.trm
+mcstas/%%PORTVERSION%%/data/He4_hcp.laz
+mcstas/%%PORTVERSION%%/data/He4_liq_coh.sqw
+mcstas/%%PORTVERSION%%/data/Hg.laz
+mcstas/%%PORTVERSION%%/data/I2.laz
+mcstas/%%PORTVERSION%%/data/In.lau
+mcstas/%%PORTVERSION%%/data/Instructions_new_lau_file.pdf
+mcstas/%%PORTVERSION%%/data/K.laz
+mcstas/%%PORTVERSION%%/data/Li.laz
+mcstas/%%PORTVERSION%%/data/LiF.laz
+mcstas/%%PORTVERSION%%/data/Mo.laz
+mcstas/%%PORTVERSION%%/data/Na2Ca3Al2F14.laz
+mcstas/%%PORTVERSION%%/data/Nb.laz
+mcstas/%%PORTVERSION%%/data/Ne_liq_tot.sqw
+mcstas/%%PORTVERSION%%/data/Ni.laz
+mcstas/%%PORTVERSION%%/data/PPase_D_P1.lau
+mcstas/%%PORTVERSION%%/data/Pb.laz
+mcstas/%%PORTVERSION%%/data/Pd.laz
+mcstas/%%PORTVERSION%%/data/Pt.laz
+mcstas/%%PORTVERSION%%/data/README
+mcstas/%%PORTVERSION%%/data/Rb.laz
+mcstas/%%PORTVERSION%%/data/Rb_liq_coh.sqw
+mcstas/%%PORTVERSION%%/data/Rb_liq_inc.sqw
+mcstas/%%PORTVERSION%%/data/Rb_liq_tot.sqw
+mcstas/%%PORTVERSION%%/data/Reflectometer_directbeam.txt
+mcstas/%%PORTVERSION%%/data/Reflectometer_reffile.txt
+mcstas/%%PORTVERSION%%/data/Rubredoxin.lau
+mcstas/%%PORTVERSION%%/data/Se_alpha.laz
+mcstas/%%PORTVERSION%%/data/Se_beta.laz
+mcstas/%%PORTVERSION%%/data/Si.laz
+mcstas/%%PORTVERSION%%/data/SiO2_cristobalite.lau
+mcstas/%%PORTVERSION%%/data/SiO2_liq.qSq
+mcstas/%%PORTVERSION%%/data/SiO2_quartza.lau
+mcstas/%%PORTVERSION%%/data/SiO2_quartza.laz
+mcstas/%%PORTVERSION%%/data/SiO2_quartzb.lau
+mcstas/%%PORTVERSION%%/data/SiO2_quartzb.laz
+mcstas/%%PORTVERSION%%/data/Sn_alpha.laz
+mcstas/%%PORTVERSION%%/data/Sn_beta.laz
+mcstas/%%PORTVERSION%%/data/Ti.laz
+mcstas/%%PORTVERSION%%/data/TiO2_rutile.lau
+mcstas/%%PORTVERSION%%/data/Tl.laz
+mcstas/%%PORTVERSION%%/data/V.laz
+mcstas/%%PORTVERSION%%/data/Y2O3.laz
+mcstas/%%PORTVERSION%%/data/Y3Fe5O12_YIG.laz
+mcstas/%%PORTVERSION%%/data/YBaCuO.lau
+mcstas/%%PORTVERSION%%/data/Zn.laz
+mcstas/%%PORTVERSION%%/data/Zr.laz
+mcstas/%%PORTVERSION%%/data/a1Gw2-11-f5_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/a1Gw2-14-f5_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/a1Gw2-17-f5_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/a1Gw2-2-f5_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/a1Gw2-5-f5_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/a1Gw2-8-f5_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/adrenaline.lau
+mcstas/%%PORTVERSION%%/data/aspirin.lau
+mcstas/%%PORTVERSION%%/data/b2_l220_tp80_cw1.18mm.dat
+mcstas/%%PORTVERSION%%/data/bender_r_ideal.dat
+mcstas/%%PORTVERSION%%/data/cube.off
+mcstas/%%PORTVERSION%%/data/flipfield.dat
+mcstas/%%PORTVERSION%%/data/leucine.lau
+mcstas/%%PORTVERSION%%/data/rot4m_sp_fit_fit.dat
+mcstas/%%PORTVERSION%%/data/socket.off
+mcstas/%%PORTVERSION%%/data/source_sct091_tu_02_1.dat
+mcstas/%%PORTVERSION%%/data/source_sct21a_td_05_1.dat
+mcstas/%%PORTVERSION%%/data/supermirror_m2.rfl
+mcstas/%%PORTVERSION%%/data/supermirror_m3.rfl
+mcstas/%%PORTVERSION%%/data/ver5tf2mm_sp_fit_fit.dat
+mcstas/%%PORTVERSION%%/editors/README
+mcstas/%%PORTVERSION%%/editors/emacs
+mcstas/%%PORTVERSION%%/editors/mccode.vim
+mcstas/%%PORTVERSION%%/editors/mcstas.xml
+mcstas/%%PORTVERSION%%/editors/mcstas1.lang
+mcstas/%%PORTVERSION%%/editors/mcstas2.lang
+mcstas/%%PORTVERSION%%/editors/mcstas3.lang
+mcstas/%%PORTVERSION%%/editors/nedit
+mcstas/%%PORTVERSION%%/examples/BNL_H8.instr
+mcstas/%%PORTVERSION%%/examples/ESS_2001_bispectral.instr
+mcstas/%%PORTVERSION%%/examples/ESS_Brilliance_2001.instr
+mcstas/%%PORTVERSION%%/examples/ESS_Brilliance_2013.instr
+mcstas/%%PORTVERSION%%/examples/ESS_Brilliance_2014.instr
+mcstas/%%PORTVERSION%%/examples/ESS_Brilliance_2015.instr
+mcstas/%%PORTVERSION%%/examples/ESS_Brilliance_TDR.instr
+mcstas/%%PORTVERSION%%/examples/ESS_IN5_reprate.instr
+mcstas/%%PORTVERSION%%/examples/FZJ_BenchmarkSfin2.instr
+mcstas/%%PORTVERSION%%/examples/FZJ_KWS2_Lens.instr
+mcstas/%%PORTVERSION%%/examples/FZJ_SANS_KWS2_AnySample.instr
+mcstas/%%PORTVERSION%%/examples/Gallmeier_SNS_decoupled_poisoned.instr
+mcstas/%%PORTVERSION%%/examples/Granroth_SNS_decoupled_poisoned.instr
+mcstas/%%PORTVERSION%%/examples/HZB_FLEX.instr
+mcstas/%%PORTVERSION%%/examples/HZB_NEAT.instr
+mcstas/%%PORTVERSION%%/examples/Histogrammer.instr
+mcstas/%%PORTVERSION%%/examples/ILL_BRISP.instr
+mcstas/%%PORTVERSION%%/examples/ILL_D2B.instr
+mcstas/%%PORTVERSION%%/examples/ILL_D4.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H10_IN8.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H113.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H13_IN20.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H142.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H142_IN12.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H143_LADI.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H15.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H15_IN6.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H16.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H16_IN5.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H16_IN5_Mantid.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H16_Mantid.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H22.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H22_D1A.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H22_D1B.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H22_VIVALDI.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H24.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H25.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H25_IN22.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H512_D22.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H53.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H53_D16.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H53_IN14.instr
+mcstas/%%PORTVERSION%%/examples/ILL_H8_IN1.instr
+mcstas/%%PORTVERSION%%/examples/ILL_IN13.instr
+mcstas/%%PORTVERSION%%/examples/ILL_IN4.instr
+mcstas/%%PORTVERSION%%/examples/ILL_IN5.instr
+mcstas/%%PORTVERSION%%/examples/ILL_IN5_Mantid.instr
+mcstas/%%PORTVERSION%%/examples/ILL_IN6.instr
+mcstas/%%PORTVERSION%%/examples/ILL_Lagrange.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_CRISP.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_GEM.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_HET.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_Prisma2.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_SANS2d.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_TS1_Brilliance.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_TS2_Brilliance.instr
+mcstas/%%PORTVERSION%%/examples/ISIS_test.instr
+mcstas/%%PORTVERSION%%/examples/Mezei_SNS_decoupled_poisoned.instr
+mcstas/%%PORTVERSION%%/examples/PSI_DMC.instr
+mcstas/%%PORTVERSION%%/examples/PSI_Focus.instr
+mcstas/%%PORTVERSION%%/examples/RITA-II.instr
+mcstas/%%PORTVERSION%%/examples/RITA-II_test.sh
+mcstas/%%PORTVERSION%%/examples/RTP_DIF.instr
+mcstas/%%PORTVERSION%%/examples/RTP_Laue.instr
+mcstas/%%PORTVERSION%%/examples/RTP_NeutronRadiography.instr
+mcstas/%%PORTVERSION%%/examples/RTP_SANS.instr
+mcstas/%%PORTVERSION%%/examples/Reflectometer.instr
+mcstas/%%PORTVERSION%%/examples/SEMSANS_instrument.instr
+mcstas/%%PORTVERSION%%/examples/SE_example.instr
+mcstas/%%PORTVERSION%%/examples/SE_example2.instr
+mcstas/%%PORTVERSION%%/examples/SNS_analytic_test.instr
+mcstas/%%PORTVERSION%%/examples/SNS_test.instr
+mcstas/%%PORTVERSION%%/examples/Samples_Incoherent.instr
+mcstas/%%PORTVERSION%%/examples/Samples_Incoherent_off.instr
+mcstas/%%PORTVERSION%%/examples/Samples_Isotropic_Sqw.instr
+mcstas/%%PORTVERSION%%/examples/Samples_Phonon.instr
+mcstas/%%PORTVERSION%%/examples/Samples_vanadium.instr
+mcstas/%%PORTVERSION%%/examples/TestSANS.instr
+mcstas/%%PORTVERSION%%/examples/Test_Collimator_Radial.instr
+mcstas/%%PORTVERSION%%/examples/Test_Fermi.instr
+mcstas/%%PORTVERSION%%/examples/Test_FocalisationMirrors.instr
+mcstas/%%PORTVERSION%%/examples/Test_Guides.instr
+mcstas/%%PORTVERSION%%/examples/Test_Guides_Curved.instr
+mcstas/%%PORTVERSION%%/examples/Test_Jump_Iterate.instr
+mcstas/%%PORTVERSION%%/examples/Test_Lens.instr
+mcstas/%%PORTVERSION%%/examples/Test_Magnetic_Constant.instr
+mcstas/%%PORTVERSION%%/examples/Test_Magnetic_Majorana.instr
+mcstas/%%PORTVERSION%%/examples/Test_Magnetic_Rotation.instr
+mcstas/%%PORTVERSION%%/examples/Test_Magnetic_Userdefined.instr
+mcstas/%%PORTVERSION%%/examples/Test_Monitor_Sqw.instr
+mcstas/%%PORTVERSION%%/examples/Test_Monochromators.instr
+mcstas/%%PORTVERSION%%/examples/Test_PSD_Detector.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_Bender.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_Bender_Vs_Guide_Curved.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_Guide_Vmirror.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_MSF.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_Mirror.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_Set.instr
+mcstas/%%PORTVERSION%%/examples/Test_Pol_TripleAxis.instr
+mcstas/%%PORTVERSION%%/examples/Test_PreMonitor_nD.instr
+mcstas/%%PORTVERSION%%/examples/Test_SSR_SSW.instr
+mcstas/%%PORTVERSION%%/examples/Test_SSR_SSW_Guide.instr
+mcstas/%%PORTVERSION%%/examples/Test_Sample_nxs_diffraction.instr
+mcstas/%%PORTVERSION%%/examples/Test_Sample_nxs_imaging.instr
+mcstas/%%PORTVERSION%%/examples/Test_Scatter_log_losses.instr
+mcstas/%%PORTVERSION%%/examples/Test_Scatter_log_mvalues.instr
+mcstas/%%PORTVERSION%%/examples/Test_Scatter_log_ssw_mcnp.instr
+mcstas/%%PORTVERSION%%/examples/Test_Selectors.instr
+mcstas/%%PORTVERSION%%/examples/Test_Sources.instr
+mcstas/%%PORTVERSION%%/examples/Test_StatisticalChopper.instr
+mcstas/%%PORTVERSION%%/examples/Test_pol_tabled.instr
+mcstas/%%PORTVERSION%%/examples/Test_shellguides.instr
+mcstas/%%PORTVERSION%%/examples/Tomography.instr
+mcstas/%%PORTVERSION%%/examples/Vin_test.instr
+mcstas/%%PORTVERSION%%/examples/Vout_test.instr
+mcstas/%%PORTVERSION%%/examples/h8_test_legacy.instr
+mcstas/%%PORTVERSION%%/examples/linup-1.instr
+mcstas/%%PORTVERSION%%/examples/linup-2.instr
+mcstas/%%PORTVERSION%%/examples/linup-3.instr
+mcstas/%%PORTVERSION%%/examples/linup-4.instr
+mcstas/%%PORTVERSION%%/examples/linup-5.instr
+mcstas/%%PORTVERSION%%/examples/linup-6.instr
+mcstas/%%PORTVERSION%%/examples/linup-7.instr
+mcstas/%%PORTVERSION%%/examples/template.instr
+mcstas/%%PORTVERSION%%/examples/templateDIFF.instr
+mcstas/%%PORTVERSION%%/examples/templateLaue.instr
+mcstas/%%PORTVERSION%%/examples/templateNMX.instr
+mcstas/%%PORTVERSION%%/examples/templateSANS.instr
+mcstas/%%PORTVERSION%%/examples/templateSANS_Mantid.instr
+mcstas/%%PORTVERSION%%/examples/templateTAS.instr
+mcstas/%%PORTVERSION%%/examples/templateTOF.instr
+mcstas/%%PORTVERSION%%/misc/Beam_spy.comp
+mcstas/%%PORTVERSION%%/misc/PolAnalyser_ideal.comp
+mcstas/%%PORTVERSION%%/misc/Progress_bar.comp
+mcstas/%%PORTVERSION%%/misc/Scatter_log_iterator.comp
+mcstas/%%PORTVERSION%%/misc/Scatter_log_iterator_stop.comp
+mcstas/%%PORTVERSION%%/misc/Scatter_logger.comp
+mcstas/%%PORTVERSION%%/misc/Scatter_logger_stop.comp
+mcstas/%%PORTVERSION%%/misc/Set_pol.comp
+mcstas/%%PORTVERSION%%/misc/Shape.comp
+mcstas/%%PORTVERSION%%/misc/Vitess_input.comp
+mcstas/%%PORTVERSION%%/misc/Vitess_output.comp
+mcstas/%%PORTVERSION%%/monitors/Brilliance_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/DivLambda_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/DivPos_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/Divergence_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/EPSD_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/E_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/Hdiv_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/L_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/MeanPolLambda_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/Monitor.comp
+mcstas/%%PORTVERSION%%/monitors/Monitor_4PI.comp
+mcstas/%%PORTVERSION%%/monitors/Monitor_Sqw.comp
+mcstas/%%PORTVERSION%%/monitors/Monitor_nD.comp
+mcstas/%%PORTVERSION%%/monitors/PSD_TOF_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/PSD_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/PSD_monitor_4PI.comp
+mcstas/%%PORTVERSION%%/monitors/PSD_monitor_psf.comp
+mcstas/%%PORTVERSION%%/monitors/PSD_monitor_psf_eff.comp
+mcstas/%%PORTVERSION%%/monitors/PSDcyl_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/PSDlin_diff_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/PSDlin_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/PolLambda_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/Pol_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/PreMonitor_nD.comp
+mcstas/%%PORTVERSION%%/monitors/Res_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/TOF2E_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/TOF2Q_cylPSD_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/TOFLambda_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/TOF_PSD_monitor_rad.comp
+mcstas/%%PORTVERSION%%/monitors/TOF_cylPSD_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/TOF_monitor.comp
+mcstas/%%PORTVERSION%%/monitors/TOFlog_monitor.comp
+mcstas/%%PORTVERSION%%/obsolete/ESS_moderator_long.comp
+mcstas/%%PORTVERSION%%/obsolete/ESS_moderator_long_2001.comp
+mcstas/%%PORTVERSION%%/obsolete/ESS_moderator_short.comp
+mcstas/%%PORTVERSION%%/obsolete/V_sample.comp
+mcstas/%%PORTVERSION%%/optics/Absorber.comp
+mcstas/%%PORTVERSION%%/optics/Arm.comp
+mcstas/%%PORTVERSION%%/optics/Beamstop.comp
+mcstas/%%PORTVERSION%%/optics/Bender.comp
+mcstas/%%PORTVERSION%%/optics/Collimator_linear.comp
+mcstas/%%PORTVERSION%%/optics/Collimator_radial.comp
+mcstas/%%PORTVERSION%%/optics/Derotator.comp
+mcstas/%%PORTVERSION%%/optics/DiskChopper.comp
+mcstas/%%PORTVERSION%%/optics/FermiChopper.comp
+mcstas/%%PORTVERSION%%/optics/Filter_gen.comp
+mcstas/%%PORTVERSION%%/optics/Guide.comp
+mcstas/%%PORTVERSION%%/optics/Guide_anyshape.comp
+mcstas/%%PORTVERSION%%/optics/Guide_channeled.comp
+mcstas/%%PORTVERSION%%/optics/Guide_gravity.comp
+mcstas/%%PORTVERSION%%/optics/Guide_tapering.comp
+mcstas/%%PORTVERSION%%/optics/Guide_wavy.comp
+mcstas/%%PORTVERSION%%/optics/Mirror.comp
+mcstas/%%PORTVERSION%%/optics/Monochromator_curved.comp
+mcstas/%%PORTVERSION%%/optics/Monochromator_flat.comp
+mcstas/%%PORTVERSION%%/optics/Monochromator_pol.comp
+mcstas/%%PORTVERSION%%/optics/Pol_bender.comp
+mcstas/%%PORTVERSION%%/optics/Pol_constBfield.comp
+mcstas/%%PORTVERSION%%/optics/Pol_guide_vmirror.comp
+mcstas/%%PORTVERSION%%/optics/Pol_mirror.comp
+mcstas/%%PORTVERSION%%/optics/Pol_simpleBfield.comp
+mcstas/%%PORTVERSION%%/optics/Pol_simpleBfield_stop.comp
+mcstas/%%PORTVERSION%%/optics/Rotator.comp
+mcstas/%%PORTVERSION%%/optics/Selector.comp
+mcstas/%%PORTVERSION%%/optics/Slit.comp
+mcstas/%%PORTVERSION%%/optics/V_selector.comp
+mcstas/%%PORTVERSION%%/optics/Virtual_mcnp_ss_Guide.comp
+mcstas/%%PORTVERSION%%/optics/Vitess_ChopperFermi.comp
+mcstas/%%PORTVERSION%%/samples/Incoherent.comp
+mcstas/%%PORTVERSION%%/samples/Isotropic_Sqw.comp
+mcstas/%%PORTVERSION%%/samples/Phonon_simple.comp
+mcstas/%%PORTVERSION%%/samples/Powder1.comp
+mcstas/%%PORTVERSION%%/samples/PowderN.comp
+mcstas/%%PORTVERSION%%/samples/Res_sample.comp
+mcstas/%%PORTVERSION%%/samples/Sans_spheres.comp
+mcstas/%%PORTVERSION%%/samples/Single_crystal.comp
+mcstas/%%PORTVERSION%%/samples/TOFRes_sample.comp
+mcstas/%%PORTVERSION%%/samples/Tunneling_sample.comp
+mcstas/%%PORTVERSION%%/share/chopper_fermi.c
+mcstas/%%PORTVERSION%%/share/chopper_fermi.h
+mcstas/%%PORTVERSION%%/share/ess_source-lib.c
+mcstas/%%PORTVERSION%%/share/ess_source-lib.h
+mcstas/%%PORTVERSION%%/share/monitor_nd-lib.c
+mcstas/%%PORTVERSION%%/share/monitor_nd-lib.h
+mcstas/%%PORTVERSION%%/sources/Adapt_check.comp
+mcstas/%%PORTVERSION%%/sources/ESS_moderator.comp
+mcstas/%%PORTVERSION%%/sources/Moderator.comp
+mcstas/%%PORTVERSION%%/sources/Monitor_Optimizer.comp
+mcstas/%%PORTVERSION%%/sources/Source_Maxwell_3.comp
+mcstas/%%PORTVERSION%%/sources/Source_Optimizer.comp
+mcstas/%%PORTVERSION%%/sources/Source_adapt.comp
+mcstas/%%PORTVERSION%%/sources/Source_div.comp
+mcstas/%%PORTVERSION%%/sources/Source_gen.comp
+mcstas/%%PORTVERSION%%/sources/Source_simple.comp
+mcstas/%%PORTVERSION%%/sources/Virtual_input.comp
+mcstas/%%PORTVERSION%%/sources/Virtual_output.comp
+@dir mcstas/%%PORTVERSION%%/contrib/Gas_tables
+@dir mcstas/%%PORTVERSION%%/contrib/ISIS_tables
+@dir mcstas/%%PORTVERSION%%/contrib/Neutronics
+@dir mcstas/%%PORTVERSION%%/contrib/doc
+@dir mcstas/%%PORTVERSION%%/contrib
+@dir mcstas/%%PORTVERSION%%/data
+@dir mcstas/%%PORTVERSION%%/editors
+@dir mcstas/%%PORTVERSION%%/examples
+@dir mcstas/%%PORTVERSION%%/misc
+@dir mcstas/%%PORTVERSION%%/monitors
+@dir mcstas/%%PORTVERSION%%/obsolete
+@dir mcstas/%%PORTVERSION%%/optics
+@dir mcstas/%%PORTVERSION%%/samples
+@dir mcstas/%%PORTVERSION%%/share
+@dir mcstas/%%PORTVERSION%%/sources
+@dir mcstas/%%PORTVERSION%%
diff --git a/science/mcstas/Makefile b/science/mcstas/Makefile
index 28f8edcfc879..3b2351440e37 100644
--- a/science/mcstas/Makefile
+++ b/science/mcstas/Makefile
@@ -2,39 +2,25 @@
 # $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
 
 LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
-
-USES=		cmake gmake bison:build
-#should perhaps use the toolchain file - but remember the arch
+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
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+SUB_FILES=	pkg-deinstall pkg-install
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/2.1/bin/mcstas
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/2.1/bin/mcformat
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcformat
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcstas
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/mcstas/distinfo b/science/mcstas/distinfo
index 1060d2c16f9f..543b860af46b 100644
--- a/science/mcstas/distinfo
+++ b/science/mcstas/distinfo
@@ -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
diff --git a/science/mcstas/pkg-deinstall b/science/mcstas/files/pkg-deinstall.in
index 9db0cb3c3765..47d2ae9a5a9c 100644
--- a/science/mcstas/pkg-deinstall
+++ b/science/mcstas/files/pkg-deinstall.in
@@ -1,25 +1,19 @@
 #!/bin/sh
 
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
+PKG_PREFIX=${PKG_PREFIX:-%%PREFIX%%}
 
 if [ $# -ne 2 ]; then
     echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
     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
      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                
diff --git a/science/mcstas/pkg-install b/science/mcstas/files/pkg-install.in
index 242933726294..a3fe95daaf97 100644
--- a/science/mcstas/pkg-install
+++ b/science/mcstas/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
+PKG_PREFIX=${PKG_PREFIX:-%%PREFIX%%}
 
 if [ $# -ne 2 ]; then
     echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
diff --git a/science/mcstas/pkg-descr b/science/mcstas/pkg-descr
index 5d47fb370ab2..e829e09506de 100644
--- a/science/mcstas/pkg-descr
+++ b/science/mcstas/pkg-descr
@@ -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.
+using a ray-tracing formalism. Currently the main use of McStas is in the
+field of instrument design. 
 
 WWW: http://www.mcstas.org
diff --git a/science/mcstas/pkg-plist b/science/mcstas/pkg-plist
index 278e44225c91..bddf4a6dab04 100644
--- a/science/mcstas/pkg-plist
+++ b/science/mcstas/pkg-plist
@@ -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
+mcstas/%%PORTVERSION%%/LGPL
+mcstas/%%PORTVERSION%%/LICENSE.LIB
+mcstas/%%PORTVERSION%%/NOMENCLATURE
+mcstas/%%PORTVERSION%%/README
+mcstas/%%PORTVERSION%%/bin/mcformat
+mcstas/%%PORTVERSION%%/bin/mcstas
+mcstas/%%PORTVERSION%%/data/Al.nxs
+mcstas/%%PORTVERSION%%/data/Cu.nxs
+mcstas/%%PORTVERSION%%/doc/man/man1/mcformat-%%PORTVERSION%%.1
+mcstas/%%PORTVERSION%%/doc/man/man1/mcstas-%%PORTVERSION%%.1
+mcstas/%%PORTVERSION%%/environment
+mcstas/%%PORTVERSION%%/module
+mcstas/%%PORTVERSION%%/share/adapt_tree-lib.c
+mcstas/%%PORTVERSION%%/share/adapt_tree-lib.h
+mcstas/%%PORTVERSION%%/share/general.c
+mcstas/%%PORTVERSION%%/share/general.h
+mcstas/%%PORTVERSION%%/share/interoff-lib.c
+mcstas/%%PORTVERSION%%/share/interoff-lib.h
+mcstas/%%PORTVERSION%%/share/interpolation/array-utils.c
+mcstas/%%PORTVERSION%%/share/interpolation/array-utils.h
+mcstas/%%PORTVERSION%%/share/interpolation/natural/README
+mcstas/%%PORTVERSION%%/share/interpolation/natural/delaunay.c
+mcstas/%%PORTVERSION%%/share/interpolation/natural/delaunay.h
+mcstas/%%PORTVERSION%%/share/interpolation/natural/example.c
+mcstas/%%PORTVERSION%%/share/interpolation/natural/natural.c
+mcstas/%%PORTVERSION%%/share/interpolation/natural/natural.h
+mcstas/%%PORTVERSION%%/share/interpolation/natural/predicates.c
+mcstas/%%PORTVERSION%%/share/interpolation/natural/utils-extra.c
+mcstas/%%PORTVERSION%%/share/interpolation/natural/utils-extra.h
+mcstas/%%PORTVERSION%%/share/interpolation/natural/vertex.h
+mcstas/%%PORTVERSION%%/share/interpolation/nearest/README
+mcstas/%%PORTVERSION%%/share/interpolation/nearest/example.c
+mcstas/%%PORTVERSION%%/share/interpolation/nearest/kdtree.c
+mcstas/%%PORTVERSION%%/share/interpolation/nearest/kdtree.h
+mcstas/%%PORTVERSION%%/share/interpolation/nearest/vertex.h
+mcstas/%%PORTVERSION%%/share/interpolation/resample.c
+mcstas/%%PORTVERSION%%/share/interpolation/resample.h
+mcstas/%%PORTVERSION%%/share/intersection.c
+mcstas/%%PORTVERSION%%/share/intersection.h
+mcstas/%%PORTVERSION%%/share/mccode-r.c
+mcstas/%%PORTVERSION%%/share/mccode-r.h
+mcstas/%%PORTVERSION%%/share/mcstas-r.c
+mcstas/%%PORTVERSION%%/share/mcstas-r.h
+mcstas/%%PORTVERSION%%/share/nxslib/README.TXT
+mcstas/%%PORTVERSION%%/share/nxslib/nxs.c
+mcstas/%%PORTVERSION%%/share/nxslib/nxs.h
+mcstas/%%PORTVERSION%%/share/nxslib/sgclib.c
+mcstas/%%PORTVERSION%%/share/nxslib/sgfind.c
+mcstas/%%PORTVERSION%%/share/nxslib/sghkl.c
+mcstas/%%PORTVERSION%%/share/nxslib/sginfo.h
+mcstas/%%PORTVERSION%%/share/nxslib/sgio.c
+mcstas/%%PORTVERSION%%/share/nxslib/sgsi.c
+mcstas/%%PORTVERSION%%/share/pol-lib.c
+mcstas/%%PORTVERSION%%/share/pol-lib.h
+mcstas/%%PORTVERSION%%/share/read_table-lib.c
+mcstas/%%PORTVERSION%%/share/read_table-lib.h
+mcstas/%%PORTVERSION%%/share/ref-lib.c
+mcstas/%%PORTVERSION%%/share/ref-lib.h
+mcstas/%%PORTVERSION%%/share/vitess-lib.c
+mcstas/%%PORTVERSION%%/share/vitess-lib.h
+@dir mcstas/%%PORTVERSION%%/bin
+@dir mcstas/%%PORTVERSION%%/data
+@dir mcstas/%%PORTVERSION%%/doc/man/man1
+@dir mcstas/%%PORTVERSION%%/doc/man
+@dir mcstas/%%PORTVERSION%%/doc
+@dir mcstas/%%PORTVERSION%%/share/interpolation/natural
+@dir mcstas/%%PORTVERSION%%/share/interpolation/nearest
+@dir mcstas/%%PORTVERSION%%/share/interpolation
+@dir mcstas/%%PORTVERSION%%/share/nxslib
+@dir mcstas/%%PORTVERSION%%/share
+@dir mcstas/%%PORTVERSION%%
 @dir mcstas