Index: Makefile
===================================================================
--- Makefile	(revision 487965)
+++ Makefile	(working copy)
@@ -1,19 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	mcstas
-PORTVERSION=	2.2a
+PORTVERSION=	2.5
 CATEGORIES=	science
-MASTER_SITES=	http://download.mcstas.org/${PORTNAME}-${PORTVERSION}/unix/McStas-${PORTVERSION}-UNIX-src/
+MASTER_SITES=	http://download.mcstas.org/${PORTNAME}-${PORTVERSION}/unix/
 DISTNAME=	mcstas-${PORTVERSION}-src
 
 MAINTAINER=	erkn@fysik.dtu.dk
 COMMENT=	Monte Carlo neutron ray tracing package
 
-LICENSE=	LGPL21+
+LICENSE=	GPLv2
 
-USES=		bison:build cmake:outsource
+USES=		bison:build cmake:outsource shebangfix
+
 CMAKE_ARGS=	"-Denable_mcstas=1"
-
+SHEBANG_FILES=	cmake/support/install-scripts/postinst.in cmake/support/run-scripts/mccode_errmsg.in
 MANDIRS=	${PREFIX}/${PORTNAME}/${DISTVERSION}/doc/man/man1
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
@@ -22,7 +23,7 @@
 post-install:
 .for e in ${MCEXECS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/${PORTVERSION}/bin/${e}
-	${LN} -s ${PREFIX}/${PORTNAME}/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
+	${RLN} -s ${STAGEDIR}/${PREFIX}/${PORTNAME}/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 487965)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511649139
-SHA256 (mcstas-2.2a-src.tar.gz) = 7f8cca7ceea87e4b99c17ee16e4f1e6fd89712d2de1ba61ab97a2cd7ea0f8b9d
-SIZE (mcstas-2.2a-src.tar.gz) = 347943
+TIMESTAMP = 1545386556
+SHA256 (mcstas-2.5-src.tar.gz) = b666d46e6b458f35932ef10f1b22d40fd37bc2e1f87f77709d8793da3a818fa7
+SIZE (mcstas-2.5-src.tar.gz) = 253503
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 487965)
+++ pkg-plist	(working copy)
@@ -1,13 +1,10 @@
-mcstas/%%PORTVERSION%%/LGPL
-mcstas/%%PORTVERSION%%/LICENSE.LIB
-mcstas/%%PORTVERSION%%/NOMENCLATURE
-mcstas/%%PORTVERSION%%/README
+bin/mcformat
+bin/mcstas
+mcstas/%%PORTVERSION%%/COPYING
 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.gz
-mcstas/%%PORTVERSION%%/doc/man/man1/mcstas-%%PORTVERSION%%.1.gz
+mcstas/%%PORTVERSION%%/bin/mcstas_errmsg
+mcstas/%%PORTVERSION%%/bin/postinst
 mcstas/%%PORTVERSION%%/environment
 mcstas/%%PORTVERSION%%/module
 mcstas/%%PORTVERSION%%/share/adapt_tree-lib.c
@@ -16,25 +13,8 @@
 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/interpolation-lib.c
+mcstas/%%PORTVERSION%%/share/interpolation-lib.h
 mcstas/%%PORTVERSION%%/share/intersection.c
 mcstas/%%PORTVERSION%%/share/intersection.h
 mcstas/%%PORTVERSION%%/share/mccode-r.c
@@ -41,15 +21,6 @@
 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
@@ -58,5 +29,3 @@
 mcstas/%%PORTVERSION%%/share/ref-lib.h
 mcstas/%%PORTVERSION%%/share/vitess-lib.c
 mcstas/%%PORTVERSION%%/share/vitess-lib.h
-bin/mcstas
-bin/mcformat