Index: Makefile
===================================================================
--- Makefile	(revision 493850)
+++ Makefile	(working copy)
@@ -1,13 +1,11 @@
-# Created by: Erik B Knudsen
 # $FreeBSD$
 
 PORTNAME=	Mcstas-Tools
-PORTVERSION=	2.2a
-PORTREVISION=	2
+PORTVERSION=	2.5
 CATEGORIES=	science
-MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/McStas-${PORTVERSION}-UNIX-src/
+MASTER_SITES=	http://download.mcstas.org/mcstas-${PORTVERSION}/unix/
 PKGNAMEPREFIX=	p5-
-DISTNAME=	mcstas-tools-perl-${PORTVERSION}-src
+DISTFILES=	mcstas-tools-perl-cmdline-${PORTVERSION}-src.tar.gz mcstas-tools-perl-${PORTVERSION}-src.tar.gz
 
 MAINTAINER=	erkn@fysik.dtu.dk
 COMMENT=	Perl based tools for the McStas neutron ray tracing package
@@ -20,18 +18,35 @@
 		mcstas:science/mcstas
 
 USES=		cmake perl5 shebangfix
+
+NO_WRKSUBDIR=	yes
 CMAKE_ARGS=	-Denable_mcstas=1
-SHEBANG_FILES=	${EXECS:S/$/.pl/}
-
+SHEBANG_GLOB=	*.pl
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-EXECS=		mcdaemon mcdisplay mcdoc mcformatgui mcgui mcplot mcresplot mcrun mcstas2vitess
+EXECS=		mcdoc.pl mcrun.pl mcdaemon.pl mcdisplay.pl mcformatgui.pl mcgui.pl mcplot.pl mcresplot.pl mcrun.pl mcstas2vitess.pl
+WRKSRC_SUBDIRS=	${DISTFILES:S/.tar.gz$//}
 
+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
+
 post-install:
-	${MV} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/doc/man/man1/*.1 ${STAGEDIR}${PREFIX}/man/man1/
-	${RMDIR} -p ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/doc/man/man1 || : > /dev/null 2>&1
-.for target in ${EXECS}
-	${LN} -s ${PREFIX}/mcstas/${PORTVERSION}/bin/${target} ${STAGEDIR}${PREFIX}/bin/${target}
+.for e in ${EXECS}
+	${RLN} -s ${STAGEDIR}/${PREFIX}/mcstas/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 493850)
+++ distinfo	(working copy)
@@ -1,2 +1,5 @@
-SHA256 (mcstas-tools-perl-2.2a-src.tar.gz) = ccb35ca79075c7a4556c2cd246becb8437c7ddfabae1e1946dddc092e01f2f73
-SIZE (mcstas-tools-perl-2.2a-src.tar.gz) = 256717
+TIMESTAMP = 1546522722
+SHA256 (mcstas-tools-perl-2.5-src.tar.gz) = 9bca4b97351661d2fee14d5d23ac0d1b4c846e9c8161de667e247ae5ec422661
+SIZE (mcstas-tools-perl-2.5-src.tar.gz) = 223795
+SHA256 (mcstas-tools-perl-cmdline-2.5-src.tar.gz) = b5cdf4c46b056fcf35939778b6ddf5542498ecbff213f1be839c8b81fa9d5df6
+SIZE (mcstas-tools-perl-cmdline-2.5-src.tar.gz) = 76353
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 493850)
+++ pkg-plist	(working copy)
@@ -1,26 +1,21 @@
-bin/mcdaemon
-bin/mcdisplay
-bin/mcdoc
-bin/mcformatgui
-bin/mcgui
-bin/mcplot
-bin/mcresplot
-bin/mcrun
-bin/mcstas2vitess
-man/man1/mcdisplay-%%PORTVERSION%%.1.gz
-man/man1/mcdoc-%%PORTVERSION%%.1.gz
-man/man1/mcgui-%%PORTVERSION%%.1.gz
-man/man1/mcplot-%%PORTVERSION%%.1.gz
-man/man1/mcrun-%%PORTVERSION%%.1.gz
-mcstas/%%PORTVERSION%%/bin/mcdaemon
-mcstas/%%PORTVERSION%%/bin/mcdisplay
-mcstas/%%PORTVERSION%%/bin/mcdoc
-mcstas/%%PORTVERSION%%/bin/mcformatgui
-mcstas/%%PORTVERSION%%/bin/mcgui
-mcstas/%%PORTVERSION%%/bin/mcplot
-mcstas/%%PORTVERSION%%/bin/mcresplot
-mcstas/%%PORTVERSION%%/bin/mcrun
-mcstas/%%PORTVERSION%%/bin/mcstas2vitess
+bin/mcdaemon.pl
+bin/mcdisplay.pl
+bin/mcdoc.pl
+bin/mcformatgui.pl
+bin/mcgui.pl
+bin/mcplot.pl
+bin/mcresplot.pl
+bin/mcrun.pl
+bin/mcstas2vitess.pl
+mcstas/%%PORTVERSION%%/bin/mcdaemon.pl
+mcstas/%%PORTVERSION%%/bin/mcdisplay.pl
+mcstas/%%PORTVERSION%%/bin/mcdoc.pl
+mcstas/%%PORTVERSION%%/bin/mcformatgui.pl
+mcstas/%%PORTVERSION%%/bin/mcgui.pl
+mcstas/%%PORTVERSION%%/bin/mcplot.pl
+mcstas/%%PORTVERSION%%/bin/mcresplot.pl
+mcstas/%%PORTVERSION%%/bin/mcrun.pl
+mcstas/%%PORTVERSION%%/bin/mcstas2vitess.pl
 mcstas/%%PORTVERSION%%/launchers/McStas.desktop
 mcstas/%%PORTVERSION%%/launchers/mcstas-pl.png
 mcstas/%%PORTVERSION%%/tools/Perl/launcher/mcstas-pl.png