svn commit: r455594 - in head/science/mcstas: . files

[Alexey Dokuchaev]

On Tue, Dec 05, 2017 at 05:32:37PM +0000, Steve Wills wrote:
> New Revision: 455594
> URL: https://svnweb.freebsd.org/changeset/ports/455594
> 
> Log:
>   science/mcstas: simplify Makefile
>   
>   While here, remove unecessary pkg-install/deinstall
>   
>   PR:		223905
>   Submitted by:	Erik B Knudsen <erkn at fysik.dtu.dk> (maintainer)
> 
> ...
>  PORTNAME=	mcstas
> -PORTVERSION=	2.2a
> +DISTVERSION=	2.2a

Ok, so PKGVERSION had changed now, I think you might need PORTEPOCH :(

$ make -V PKGVERSION
2.2.a
$ pkg version -t 2.2.a 2.2a
<

>  
> -PLIST_SUB+=	PORTVERSION=${PORTVERSION}
> -SUB_FILES=	pkg-deinstall pkg-install
> +MANDIRS=	${PREFIX}/${PORTNAME}/${DISTVERSION}/doc/man/man1

There is MANPREFIX for manpages, but more importantly, why embed version
in the path at all?

> +PLIST_SUB+=	DISTVERSION=${DISTVERSION}
>  
> +MCEXECS=	mcstas mcformat
> +
>  post-install:
> -	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcformat
> -	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcstas
> +.for e in ${MCEXECS}
> +	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PORTNAME}/${DISTVERSION}/bin/${e}
> +	${LN} -s ${PREFIX}/${PORTNAME}/${DISTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}

Symlinks should not point to an absolute path.

> @@ -1,2 +1,3 @@
> +TIMESTAMP = 1511649139

This change was uncalled for since the remaining of distinfo was left
intact.  It should have been removed from the commit bach to reduce
the diff noise and repo churn.

> -mcstas/%%PORTVERSION%%/share/ref-lib.h
> -mcstas/%%PORTVERSION%%/share/vitess-lib.c
> -mcstas/%%PORTVERSION%%/share/vitess-lib.h
> +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

Ditt (what's the reason behind having PORTVERSION in the path?  I don't
see any potentially conflicting versions of the port in the tree.  This
also breaks its conformance to hier(7).

./danfe