diff -ruN p5-mcstas-tools.bak/Makefile p5-mcstas-tools/Makefile
--- p5-mcstas-tools.bak/Makefile	2015-09-23 23:52:28.088420000 +0200
+++ p5-mcstas-tools/Makefile	2015-09-23 23:55:46.248785000 +0200
@@ -2,89 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	p5-mcstas-tools
-PORTVERSION=	2.1
-
-METANAME=	McStas-${PORTVERSION}-UNIX-src
-
+PORTVERSION=	2.2a
 CATEGORIES=	science
-MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/
-DISTNAME=	McStas-${PORTVERSION}-UNIX-src
-
+MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/McStas-${PORTVERSION}-UNIX-src/
+DISTNAME=	mcstas-tools-perl-${PORTVERSION}-src
 
 MAINTAINER=	erkn@fysik.dtu.dk
-COMMENT=	Component Library for the McXtrace Monte Carlo X-ray tracing package
+COMMENT=	Perl based tools for the McStas neutron ray tracing package
 
 LICENSE=	GPLv2
 
-USES=		cmake gmake perl5
+RUN_DEPENDS=	p5-Tk>0:${PORTSDIR}/x11-toolkits/p5-Tk \
+		p5-PGPLOT>=2.21:${PORTSDIR}/graphics/p5-PGPLOT	\
+		PDL>0:${PORTSDIR}/math/PDL \
+	 	${LOCALBASE}/mcstas/${PORTVERSION}/bin/mcstas:${PORTSDIR}/science/mcstas
 
+USES=		cmake gmake perl5
 CMAKE_ARGS=	"-Denable_mcstas=1"
-
 GNU_CONFIGURE=	yes
 
-RUN_DEPENDS=	p5-Tk>0:${PORTSDIR}/x11-toolkits/p5-Tk    \
-		p5-PGPLOT>=2.21:${PORTSDIR}/graphics/p5-PGPLOT
-		#PDL:${PORTSDIR}/math/PDL		\
-
-WRKSRC=		${WRKDIR}/mcstas-tools-perl-2.1-src
-
-do-extract:
-	@(cd ${WRKDIR} &&  tar -xzf ${DISTDIR}/${DISTFILES} McStas-2.1-UNIX-src/mcstas-tools-perl-${PORTVERSION}-src.tar.gz \
-	&& ${TAR} -xzf McStas-2.1-UNIX-src/mcstas-tools-perl-${PORTVERSION}-src.tar.gz );  
-
+SUB_FILES=	pkg-install
+SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
-# Created by: Erik B Knudsen
-# $FreeBSD$
-
-PORTNAME= mcstas-tools-p5
-PORTVERSION= 2.1
-#PORTREVISION= beta
-
-#a helper variable
-METANAME= McStas-${PORTVERSION}-UNIX-src
-
-CATEGORIES= science
-MASTER_SITES= http://download.mcstas.org/mcstas-${PORTVERSION}/unix/
-DISTNAME= mcstas-tools-perl-${PORTVERSION}-src
-DISTFILES= McStas-${PORTVERSION}-UNIX-src.tar.gz
-DIST_SUBDIR= mcstas
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-
-MAINTAINER= erkn@fysik.dtu.dk
-COMMENT= Component Library for the McXtrace Monte Carlo X-ray tracing package
-
-LICENSE= GPLv2
-
-USES= cmake gmake perl5
-
-# 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
-
-RUN_DEPENDS= ${LOCALBASE}/mcstas/${PORTVERSION}/bin/mcstas:${PORTSDIR}/science/mcstas\
- ${LOCALBASE}/mcstas/${PORTVERSION}/examples:${PORTSDIR}/science/mcstas-comps\
- p5-Tk>=804:${PORTSDIR}/x11-toolkits/p5-Tk\
- PDL>0:${PORTSDIR}/math/PDL\
- p5-PGPLOT>=2.21:${PORTSDIR}/graphics/p5-PGPLOT
-
-.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;
-#	${TAR} -xzf ${DISTFILES} mcxtrace-1.2beta-src.tar.gz;
-.endif
-
-.include <bsd.port.post.mk>
diff -ruN p5-mcstas-tools.bak/distinfo p5-mcstas-tools/distinfo
--- p5-mcstas-tools.bak/distinfo	2015-09-23 23:52:28.089075000 +0200
+++ p5-mcstas-tools/distinfo	2015-09-23 23:55:46.248882000 +0200
@@ -1,4 +1,2 @@
-SHA256 (McStas-2.1-UNIX-src.tar.gz) = 70d5b33d67ea9b8e4c276b4e8c7ece907ac28ec63f523d7e0cbcc9e425b4aaf4
-SIZE (McStas-2.1-UNIX-src.tar.gz) = 27807879
-SHA256 (mcstas/McStas-2.1-UNIX-src.tar.gz) = 70d5b33d67ea9b8e4c276b4e8c7ece907ac28ec63f523d7e0cbcc9e425b4aaf4
-SIZE (mcstas/McStas-2.1-UNIX-src.tar.gz) = 27807879
+SHA256 (mcstas-tools-perl-2.2a-src.tar.gz) = ccb35ca79075c7a4556c2cd246becb8437c7ddfabae1e1946dddc092e01f2f73
+SIZE (mcstas-tools-perl-2.2a-src.tar.gz) = 256717
diff -ruN p5-mcstas-tools.bak/files/pkg-install.in p5-mcstas-tools/files/pkg-install.in
--- p5-mcstas-tools.bak/files/pkg-install.in	1970-01-01 01:00:00.000000000 +0100
+++ p5-mcstas-tools/files/pkg-install.in	2015-09-23 23:55:46.248579000 +0200
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+PKG_PREFIX=${PKG_PREFIX:-/usr/local}
+
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+execs="mcdaemon mcdisplay mcdoc mcformatgui mcgui mcplot mcresplot mcrun mcstas2vitess"
+
+case $2 in
+     POST-INSTALL)
+		if [ ! -f "${PKG_PREFIX}/bin" ]; then
+			echo "Installing link to executables in ${PKG_PREFIX}/bin.";
+                        for target in ${execs}; do
+				ln -s ${PKG_PREFIX}/mcstas/%%PORTVERSION%%/bin/${target} ${PKG_PREFIX}/bin/${target};
+			done                
+		fi
+		;;
+esac
+
+exit 0
diff -ruN p5-mcstas-tools.bak/pkg-deinstall p5-mcstas-tools/pkg-deinstall
--- p5-mcstas-tools.bak/pkg-deinstall	2015-09-23 23:52:28.089899000 +0200
+++ p5-mcstas-tools/pkg-deinstall	2015-09-23 23:55:46.248686000 +0200
@@ -3,55 +3,18 @@
 PKG_PREFIX=${PKG_PREFIX:-/usr/local}
 
 if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
     exit 1
 fi
 
-pname=${1%-*}
-pversion=${1##*-}
-
-#echo the extracted port name is $pname
-#echo the extracted port version is $pversion
-
-execs="mcdaemon mcdisplay mcdoc mcformatgui mcgui mcresplot mcrun mcstas2vitess"
-
-case $2 in
-     DEINSTALL)
-
-		if [ ! -f "${PKG_PREFIX}/bin" ]; then
-			echo "Deinstalling links to ${1} executables in ${PKG_PREFIX}/bin.";
-                        for target in ${execs}; do
-				rm ${PKG_PREFIX}/bin/${target};
-			done                
-		fi
-		;;
-esac
-
-exit 0
-#!/bin/sh
-
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
-
-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="mcdaemon mcdisplay mcdoc mcformatgui mcgui mcresplot mcrun mcstas2vitess"
+execs="mcdaemon mcdisplay mcdoc mcformatgui mcgui mcplot mcresplot mcrun mcstas2vitess"
 
 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};
+				rm -rf ${PKG_PREFIX}/bin/${target};
 			done                
 		fi
 		;;
diff -ruN p5-mcstas-tools.bak/pkg-descr p5-mcstas-tools/pkg-descr
--- p5-mcstas-tools.bak/pkg-descr	2015-09-23 23:52:28.090653000 +0200
+++ p5-mcstas-tools/pkg-descr	2015-09-23 23:55:46.248979000 +0200
@@ -1,7 +1,7 @@
-McStas perl tools for aiding in running neutron ray tracing simulations.
+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
+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 perl-based helper tools (including a GUI) to aid the
@@ -11,29 +11,9 @@
   point scans and simple optimizations.
 mcdoc: Script for viewing inline component documentation.
 mcplot: Tool for plotting McXtrace-generated results.
-mcdisplay: Visual ray-tracing displaying x-ray phton trajectories.
-mcformatgui: Front-end to mxformat to help reformatting data-files (obsolescent).
-mcdaemon: Deamon to dynamically monitor and plot incoming results (obsolescent).
-mcstas2vitess: Tool to transfer a McStas simulation to ViTESS.
-mcresplot: Script to help plotting resolution functions.
-
-WWW: http://www.mcstas.org
-McStas perl tools for aiding 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 perl-based helper tools (including a GUI) to aid the
-user in setting up and running simulations. The tools are:
-mcgui: A Tk/Perl 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 McXtrace-generated results.
-mcdisplay: Visual ray-tracing displaying x-ray phton trajectories.
-mcformatgui: Front-end to mxformat to help reformatting data-files (obsolescent).
-mcdaemon: Deamon to dynamically monitor and plot incoming results (obsolescent).
+mcdisplay: Visual ray-tracing displaying neutron trajectories.
+mcformatgui: Front-end to mxformat to help reformat data-files (obsolescent).
+mcdaemon: Deamon to dynamically monitor and plot results (obsolescent).
 mcstas2vitess: Tool to transfer a McStas simulation to ViTESS.
 mcresplot: Script to help plotting resolution functions.
 
diff -ruN p5-mcstas-tools.bak/pkg-install p5-mcstas-tools/pkg-install
--- p5-mcstas-tools.bak/pkg-install	2015-09-23 23:52:28.091464000 +0200
+++ p5-mcstas-tools/pkg-install	1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
-
-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="mcdaemon mcdisplay mcdoc mcformatgui mcgui mcplot mcresplot mcrun mcstas2vitess"
-
-case $2 in
-     POST-INSTALL)
-		if [ ! -f "${PKG_PREFIX}/bin" ]; then
-			echo "Installing links to ${1} executables in ${PKG_PREFIX}/bin.";
-                        for target in ${execs}; do
-				ln -s ${PKG_PREFIX}/${pname}/${pversion}/bin/${target} ${PKG_PREFIX}/bin/${target};
-			done                
-		fi
-		;;
-esac
-
-exit 0
-#!/bin/sh
-
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
-
-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="mcdaemon mcdisplay mcdoc mcformatgui mcgui mcplot mcresplot mcrun mcstas2vitess"
-
-case $2 in
-     POST-INSTALL)
-		if [ ! -f "${PKG_PREFIX}/bin" ]; then
-			echo "Installing links to ${1} executables in ${PKG_PREFIX}/bin.";
-                        for target in ${execs}; do
-				ln -s ${PKG_PREFIX}/${pname}/${pversion}/bin/${target} ${PKG_PREFIX}/bin/${target};
-			done                
-		fi
-		;;
-esac
-
-exit 0
diff -ruN p5-mcstas-tools.bak/pkg-plist p5-mcstas-tools/pkg-plist
--- p5-mcstas-tools.bak/pkg-plist	2015-09-23 23:52:28.092346000 +0200
+++ p5-mcstas-tools/pkg-plist	2015-09-24 00:21:54.293707000 +0200
@@ -1,82 +1,37 @@
-mcstas/2.1/bin/mcdaemon
-mcstas/2.1/bin/mcdisplay
-mcstas/2.1/bin/mcdoc
-mcstas/2.1/bin/mcformatgui
-mcstas/2.1/bin/mcgui
-mcstas/2.1/bin/mcplot
-mcstas/2.1/bin/mcresplot
-mcstas/2.1/bin/mcrun
-mcstas/2.1/bin/mcstas2vitess
-mcstas/2.1/doc/man/man1/mcdisplay-2.1.1
-mcstas/2.1/doc/man/man1/mcdoc-2.1.1
-mcstas/2.1/doc/man/man1/mcgui-2.1.1
-mcstas/2.1/doc/man/man1/mcplot-2.1.1
-mcstas/2.1/doc/man/man1/mcrun-2.1.1
-mcstas/2.1/mcstas-tools-perl-2.1/launcher/McStas.desktop
-mcstas/2.1/mcstas-tools-perl-2.1/launcher/mcstas.png
-mcstas/2.1/mcstas-tools-perl-2.1/launcher/mcxtrace.png
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/CheckNeutNumber.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/CheckTimeout.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/PlotInstrument.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/ReshapeTransform.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/mcdisplay.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/mcplot.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/resume.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/tomo_recon.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/wait.m
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mccode_config.perl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mccode_reconfigure
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcfrontlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcfrontlib2D.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcgnuplot.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcguilib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcoptimlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcplotlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcrunlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mxguilib.pl
-mcstas/2.1/bin/mcdaemon
-mcstas/2.1/bin/mcdisplay
-mcstas/2.1/bin/mcdoc
-mcstas/2.1/bin/mcformatgui
-mcstas/2.1/bin/mcgui
-mcstas/2.1/bin/mcplot
-mcstas/2.1/bin/mcresplot
-mcstas/2.1/bin/mcrun
-mcstas/2.1/bin/mcstas2vitess
-mcstas/2.1/doc/man/man1/mcdisplay-2.1.1
-mcstas/2.1/doc/man/man1/mcdoc-2.1.1
-mcstas/2.1/doc/man/man1/mcgui-2.1.1
-mcstas/2.1/doc/man/man1/mcplot-2.1.1
-mcstas/2.1/doc/man/man1/mcrun-2.1.1
-mcstas/2.1/mcstas-tools-perl-2.1/launcher/McStas.desktop
-mcstas/2.1/mcstas-tools-perl-2.1/launcher/mcstas.png
-mcstas/2.1/mcstas-tools-perl-2.1/launcher/mcxtrace.png
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/CheckNeutNumber.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/CheckTimeout.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/PlotInstrument.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/ReshapeTransform.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/mcdisplay.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/mcplot.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/resume.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/tomo_recon.m
-mcstas/2.1/mcstas-tools-perl-2.1/matlab/wait.m
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mccode_config.perl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mccode_reconfigure
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcfrontlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcfrontlib2D.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcgnuplot.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcguilib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcoptimlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcplotlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mcrunlib.pl
-mcstas/2.1/mcstas-tools-perl-2.1/perl/mxguilib.pl
-@dirrmtry mcstas/2.1/bin
-@dirrmtry mcstas/2.1/doc/man/man1
-@dirrmtry mcstas/2.1/doc/man
-@dirrmtry mcstas/2.1/doc
-@dirrmtry mcstas/2.1/mcstas-tools-perl-2.1/launcher
-@dirrmtry mcstas/2.1/mcstas-tools-perl-2.1/matlab
-@dirrmtry mcstas/2.1/mcstas-tools-perl-2.1/perl
-@dirrmtry mcstas/2.1/mcstas-tools-perl-2.1
-@dirrmtry mcstas/2.1
-@dirrmtry mcstas
+mcstas/2.2a/bin/mcdaemon
+mcstas/2.2a/bin/mcdisplay
+mcstas/2.2a/bin/mcdoc
+mcstas/2.2a/bin/mcformatgui
+mcstas/2.2a/bin/mcgui
+mcstas/2.2a/bin/mcplot
+mcstas/2.2a/bin/mcresplot
+mcstas/2.2a/bin/mcrun
+mcstas/2.2a/bin/mcstas2vitess
+mcstas/2.2a/doc/man/man1/mcdisplay-2.2a.1
+mcstas/2.2a/doc/man/man1/mcdoc-2.2a.1
+mcstas/2.2a/doc/man/man1/mcgui-2.2a.1
+mcstas/2.2a/doc/man/man1/mcplot-2.2a.1
+mcstas/2.2a/doc/man/man1/mcrun-2.2a.1
+mcstas/2.2a/launchers/McStas.desktop
+mcstas/2.2a/launchers/mcstas-pl.png
+mcstas/2.2a/tools/Perl/launcher/mcstas-pl.png
+mcstas/2.2a/tools/Perl/launcher/mcxtrace-pl.png
+mcstas/2.2a/tools/Perl/matlab/CheckNeutNumber.m
+mcstas/2.2a/tools/Perl/matlab/CheckTimeout.m
+mcstas/2.2a/tools/Perl/matlab/PlotInstrument.m
+mcstas/2.2a/tools/Perl/matlab/ReshapeTransform.m
+mcstas/2.2a/tools/Perl/matlab/mcdisplay.m
+mcstas/2.2a/tools/Perl/matlab/mcplot.m
+mcstas/2.2a/tools/Perl/matlab/resume.m
+mcstas/2.2a/tools/Perl/matlab/tomo_recon.m
+mcstas/2.2a/tools/Perl/matlab/wait.m
+mcstas/2.2a/tools/Perl/perl/mccode_config.perl
+mcstas/2.2a/tools/Perl/perl/mccode_reconfigure
+mcstas/2.2a/tools/Perl/perl/mcfrontlib.pl
+mcstas/2.2a/tools/Perl/perl/mcfrontlib2D.pl
+mcstas/2.2a/tools/Perl/perl/mcgnuplot.pl
+mcstas/2.2a/tools/Perl/perl/mcguilib.pl
+mcstas/2.2a/tools/Perl/perl/mcoptimlib.pl
+mcstas/2.2a/tools/Perl/perl/mcplotlib.pl
+mcstas/2.2a/tools/Perl/perl/mcrunlib.pl
+mcstas/2.2a/tools/Perl/perl/mxguilib.pl