[macports-ports] branch master updated: gmsh-devel: mark as obsolete; replace with gmsh

[Marcus Calhoun-Lopez]

The removal of octave-legacy was accidentally included in this commit.
It was time to remove octave-legacy, so there is no need to restore it, but it should have had its own commit.

My apologies for the error.

-Marcus

> On Mar 16, 2019, at 7:18 AM, Marcus Calhoun-Lopez <mcalhoun at macports.org> wrote:
> 
> Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
> in repository macports-ports.
> 
> 
> https://github.com/macports/macports-ports/commit/bfad3ca1182d2a7a052aea81972128816cb49efa
> 
> The following commit(s) were added to refs/heads/master by this push:
> 
>      new bfad3ca  gmsh-devel: mark as obsolete; replace with gmsh
> 
> bfad3ca is described below
> 
> 
> commit bfad3ca1182d2a7a052aea81972128816cb49efa
> 
> Author: Marcus Calhoun-Lopez <mcalhoun at macports.org>
> AuthorDate: Sat Mar 16 07:17:38 2019 -0700
> 
> 
>     gmsh-devel: mark as obsolete; replace with gmsh
> 
>     
> 
>     gmsh is updated regularly, and gmsh-devel is seldom very far ahead.
> 
> ---
>  math/octave-legacy/Portfile | 22 ----------------------
>  science/gmsh/Portfile       | 19 ++++---------------
>  2 files changed, 4 insertions(+), 37 deletions(-)
> 
> 
> diff --git a/math/octave-legacy/Portfile b/math/octave-legacy/Portfile
> 
> deleted file mode 100644
> 
> index fd0e757..0000000
> 
> --- a/math/octave-legacy/Portfile
> 
> +++ /dev/null
> 
> @@ -1,22 +0,0 @@
> 
> -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
> 
> -
> 
> -PortSystem          1.0
> 
> -
> 
> -replaced_by         octave
> 
> -PortGroup           obsolete 1.0
> 
> -
> 
> -name                octave-legacy
> 
> -version             3.8.2
> 
> -revision            5
> 
> -categories          math science
> 
> -license             GPL-3
> 
> -
> 
> -subport octave-devel-rc {
> 
> -    version  4.2.0-rc4
> 
> -    revision 6
> 
> -}
> 
> -
> 
> -subport octave-devel-release {
> 
> -    version  4.0.3
> 
> -    revision 6
> 
> -}
> 
> diff --git a/science/gmsh/Portfile b/science/gmsh/Portfile
> 
> index 1ac4c99..d7a82f5 100644
> 
> --- a/science/gmsh/Portfile
> 
> +++ b/science/gmsh/Portfile
> 
> @@ -8,7 +8,6 @@ PortGroup           linear_algebra 1.0
> 
>  PortGroup           muniversal     1.0
>  
>  name                gmsh
> 
> -conflicts           gmsh-devel
> 
>  version             4.1.5
>  categories          science
>  platforms           darwin
> 
> @@ -107,18 +106,8 @@ variant getdp description {Enable GetDP solver} {
> 
>      configure.args-delete -DENABLE_GETDP=OFF
>  }
>  
> 
> -subport gmsh-devel {
> 
> -    conflicts           gmsh
> 
> -
> 
> -    fetch.type          git
> 
> -    git.url             https://gitlab.onelab.info/gmsh/gmsh.git
> 
> -    git.branch          d28e0c8829ef6b21486c3cde9ec5962caf23cf2c
> 
> -    # see https://gitlab.onelab.info/gmsh/gmsh/blob/master/CMakeLists.txt
> 
> -    version             4.2.0
> 
> -    revision            0
> 
> -
> 
> -    livecheck.type     regexm
> 
> -    livecheck.url      https://gitlab.onelab.info/gmsh/gmsh
> 
> -    livecheck.version  ${git.branch}
> 
> -    livecheck.regex    "/gmsh/gmsh/commit/(\[a-zA-Z0-9\]+)"
> 
> +# please remove on 2020-03-16
> 
> +subport ${name}-devel {
> 
> +    replaced_by ${name}
> 
> +    PortGroup   obsolete 1.0
> 
>  }
> 
>