[macports-ports] branch master updated: Reoslving conflicts with upstream

[Ryan Schmidt]

On Jan 31, 2018, at 15:03, Henry Mohn wrote:

> Perry E. Metzger (pmetzger) pushed a commit to branch master
> in repository macports-ports.
> 
> 
> https://github.com/macports/macports-ports/commit/e0a73e68de6a7b2b05abf93374f476a080400f39
> 
> The following commit(s) were added to refs/heads/master by this push:
> 
>      new e0a73e6  Reoslving conflicts with upstream
> 
> e0a73e6 is described below
> 
> 
> commit e0a73e68de6a7b2b05abf93374f476a080400f39
> 
> Author: Henry Mohn
> AuthorDate: Wed Jan 31 12:32:32 2018 -0600
> 
> 
>     Reoslving conflicts with upstream

Please make sure a commit message says what was done, preferably beginning with the port name and a colon, such as: "kmymoney4-devel: Update to 4.8.1-20171206"


> ---
>  kde/kmymoney4-devel/Portfile                           |  8 +++-----
>  .../files/patch-CMakeLists_QGPGME.txt.diff             | 18 ------------------
>  2 files changed, 3 insertions(+), 23 deletions(-)
> 
> 
> diff --git a/kde/kmymoney4-devel/Portfile b/kde/kmymoney4-devel/Portfile
> 
> index 9e8a8cb..0c3ca4e 100644
> 
> --- a/kde/kmymoney4-devel/Portfile
> 
> +++ b/kde/kmymoney4-devel/Portfile
> 
> @@ -7,11 +7,10 @@ PortGroup           kde4    1.1
> 
>  
>  fetch.type          git
>  git.url             git://anongit.kde.org/kmymoney
> 
> -git.branch          485aea8e20604cf79612f62d1393fde9872c0273
> 
> +git.branch          ebeeced0715a82327ae0e2ee833cf93fc3029366
> 
>  
>  name                kmymoney4-devel
> 
> -version             4.8-20161022
> 
> -revision            3
> 
> +version             4.8.1-20171206
> 
>  
>  categories          kde kde4 finance
>  maintainers         pixilla openmaintainer
> 
> @@ -41,8 +40,7 @@ depends_lib-append  port:libofx \
> 
>  
>  patch.dir         ${workpath}/${distname}
>  patch.pre_args    -p1
> 
> -patchfiles        patch-mainRaster.diff \
> 
> -                  patch-CMakeLists_QGPGME.txt.diff
> 
> +patchfiles        patch-mainRaster.diff
> 
>  
>  if {![variant_isset docs]} {
>      patchfiles-append   patch_remove_manpage.diff patch-CMakeLists_remove_APIDOC.txt.diff