On May 8, 2018, at 08:49, Nicolas Pavillon wrote:
> NicosPavlov pushed a commit to branch master
> in repository macports-ports.
>
>
> https://github.com/macports/macports-ports/commit/f578df0c2a5e1479fa834624b11e487ed79b23cb
>
> The following commit(s) were added to refs/heads/master by this push:
>
> new f578df0 scidavis: remove unnecessary reinplace instructions in case
> of standard prefix
>
> f578df0 is described below
>
>
> commit f578df0c2a5e1479fa834624b11e487ed79b23cb
>
> Author: Nicolas Pavillon
> AuthorDate: Tue May 8 22:49:58 2018 +0900
>
>
> scidavis: remove unnecessary reinplace instructions in case of standard
> prefix
>
> ---
> science/scidavis/Portfile | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/science/scidavis/Portfile b/science/scidavis/Portfile
> index 7dc8a01..f6696db 100644
> --- a/science/scidavis/Portfile
> +++ b/science/scidavis/Portfile
> @@ -41,15 +41,17 @@ configure.pre_args-append "'CONFIG+=osx_dist
> noassistant'"
>
> pre-configure {
> reinplace "s|/usr|${prefix}|g" ${worksrcpath}/config.pri
> - reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/config.pri
> - reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/mkMacDist.sh
> reinplace "s|/usr|${prefix}|g"
> ${worksrcpath}/fitPlugins/exp_saturation/exp_saturation.pro
> reinplace "s|/usr|${prefix}|g"
> ${worksrcpath}/fitPlugins/explin/explin.pro
> reinplace "s|/usr|${prefix}|g"
> ${worksrcpath}/fitPlugins/fitRational0/fitRational0.pro
> reinplace "s|/usr|${prefix}|g"
> ${worksrcpath}/fitPlugins/fitRational1/fitRational1.pro
> reinplace "s|/usr|${prefix}|g"
> ${worksrcpath}/fitPlugins/planck_wavelength/planck_wavelength.pro
>
> - reinplace "s|@PREFIX@|${prefix}|g"
> ${worksrcpath}/3rdparty/liborigin/CMakeLists.txt
This reinplace is always needed, even when the prefix is /opt/local.
> + if {${prefix} ne "/opt/local"} {
> + reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/config.pri
> + reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/mkMacDist.sh
> + reinplace "s|@PREFIX@|${prefix}|g"
> ${worksrcpath}/3rdparty/liborigin/CMakeLists.txt
> + }
