Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Dec 2017 16:18:35 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r455658 - head/science/mcstas
Message-ID:  <201712061618.vB6GIZ76091341@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Dec  6 16:18:35 2017
New Revision: 455658
URL: https://svnweb.freebsd.org/changeset/ports/455658

Log:
  science/mcstas: switch back to PORTVERSION
  
  Avoids an issue with verion going backwards.

Modified:
  head/science/mcstas/Makefile
  head/science/mcstas/pkg-plist

Modified: head/science/mcstas/Makefile
==============================================================================
--- head/science/mcstas/Makefile	Wed Dec  6 15:55:46 2017	(r455657)
+++ head/science/mcstas/Makefile	Wed Dec  6 16:18:35 2017	(r455658)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	mcstas
-DISTVERSION=	2.2a
+PORTVERSION=	2.2a
 CATEGORIES=	science
-MASTER_SITES=	http://download.mcstas.org/${PORTNAME}-${DISTVERSION}/unix/McStas-${DISTVERSION}-UNIX-src/
-DISTNAME=	mcstas-${DISTVERSION}-src
+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
@@ -15,14 +15,14 @@ USES=		bison:build cmake:outsource
 CMAKE_ARGS=	"-Denable_mcstas=1"
 
 MANDIRS=	${PREFIX}/${PORTNAME}/${DISTVERSION}/doc/man/man1
-PLIST_SUB+=	DISTVERSION=${DISTVERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 MCEXECS=	mcstas mcformat
 
 post-install:
 .for e in ${MCEXECS}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/${DISTVERSION}/bin/${e}
-	${LN} -s ${PREFIX}/${PORTNAME}/${DISTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/${PORTVERSION}/bin/${e}
+	${LN} -s ${PREFIX}/${PORTNAME}/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/science/mcstas/pkg-plist
==============================================================================
--- head/science/mcstas/pkg-plist	Wed Dec  6 15:55:46 2017	(r455657)
+++ head/science/mcstas/pkg-plist	Wed Dec  6 16:18:35 2017	(r455658)
@@ -1,62 +1,62 @@
-mcstas/%%DISTVERSION%%/LGPL
-mcstas/%%DISTVERSION%%/LICENSE.LIB
-mcstas/%%DISTVERSION%%/NOMENCLATURE
-mcstas/%%DISTVERSION%%/README
-mcstas/%%DISTVERSION%%/bin/mcformat
-mcstas/%%DISTVERSION%%/bin/mcstas
-mcstas/%%DISTVERSION%%/data/Al.nxs
-mcstas/%%DISTVERSION%%/data/Cu.nxs
-mcstas/%%DISTVERSION%%/doc/man/man1/mcformat-%%DISTVERSION%%.1.gz
-mcstas/%%DISTVERSION%%/doc/man/man1/mcstas-%%DISTVERSION%%.1.gz
-mcstas/%%DISTVERSION%%/environment
-mcstas/%%DISTVERSION%%/module
-mcstas/%%DISTVERSION%%/share/adapt_tree-lib.c
-mcstas/%%DISTVERSION%%/share/adapt_tree-lib.h
-mcstas/%%DISTVERSION%%/share/general.c
-mcstas/%%DISTVERSION%%/share/general.h
-mcstas/%%DISTVERSION%%/share/interoff-lib.c
-mcstas/%%DISTVERSION%%/share/interoff-lib.h
-mcstas/%%DISTVERSION%%/share/interpolation/array-utils.c
-mcstas/%%DISTVERSION%%/share/interpolation/array-utils.h
-mcstas/%%DISTVERSION%%/share/interpolation/natural/README
-mcstas/%%DISTVERSION%%/share/interpolation/natural/delaunay.c
-mcstas/%%DISTVERSION%%/share/interpolation/natural/delaunay.h
-mcstas/%%DISTVERSION%%/share/interpolation/natural/example.c
-mcstas/%%DISTVERSION%%/share/interpolation/natural/natural.c
-mcstas/%%DISTVERSION%%/share/interpolation/natural/natural.h
-mcstas/%%DISTVERSION%%/share/interpolation/natural/predicates.c
-mcstas/%%DISTVERSION%%/share/interpolation/natural/utils-extra.c
-mcstas/%%DISTVERSION%%/share/interpolation/natural/utils-extra.h
-mcstas/%%DISTVERSION%%/share/interpolation/natural/vertex.h
-mcstas/%%DISTVERSION%%/share/interpolation/nearest/README
-mcstas/%%DISTVERSION%%/share/interpolation/nearest/example.c
-mcstas/%%DISTVERSION%%/share/interpolation/nearest/kdtree.c
-mcstas/%%DISTVERSION%%/share/interpolation/nearest/kdtree.h
-mcstas/%%DISTVERSION%%/share/interpolation/nearest/vertex.h
-mcstas/%%DISTVERSION%%/share/interpolation/resample.c
-mcstas/%%DISTVERSION%%/share/interpolation/resample.h
-mcstas/%%DISTVERSION%%/share/intersection.c
-mcstas/%%DISTVERSION%%/share/intersection.h
-mcstas/%%DISTVERSION%%/share/mccode-r.c
-mcstas/%%DISTVERSION%%/share/mccode-r.h
-mcstas/%%DISTVERSION%%/share/mcstas-r.c
-mcstas/%%DISTVERSION%%/share/mcstas-r.h
-mcstas/%%DISTVERSION%%/share/nxslib/README.TXT
-mcstas/%%DISTVERSION%%/share/nxslib/nxs.c
-mcstas/%%DISTVERSION%%/share/nxslib/nxs.h
-mcstas/%%DISTVERSION%%/share/nxslib/sgclib.c
-mcstas/%%DISTVERSION%%/share/nxslib/sgfind.c
-mcstas/%%DISTVERSION%%/share/nxslib/sghkl.c
-mcstas/%%DISTVERSION%%/share/nxslib/sginfo.h
-mcstas/%%DISTVERSION%%/share/nxslib/sgio.c
-mcstas/%%DISTVERSION%%/share/nxslib/sgsi.c
-mcstas/%%DISTVERSION%%/share/pol-lib.c
-mcstas/%%DISTVERSION%%/share/pol-lib.h
-mcstas/%%DISTVERSION%%/share/read_table-lib.c
-mcstas/%%DISTVERSION%%/share/read_table-lib.h
-mcstas/%%DISTVERSION%%/share/ref-lib.c
-mcstas/%%DISTVERSION%%/share/ref-lib.h
-mcstas/%%DISTVERSION%%/share/vitess-lib.c
-mcstas/%%DISTVERSION%%/share/vitess-lib.h
+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.gz
+mcstas/%%PORTVERSION%%/doc/man/man1/mcstas-%%PORTVERSION%%.1.gz
+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
 bin/mcstas
 bin/mcformat



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712061618.vB6GIZ76091341>