Re: CVS commit: pkgsrc/meta-pkgs/mate

["David H. Gutteridge" <david%gutteridge.ca@localhost>]

> Module Name:    pkgsrc
> Committed By:   nia
> Date:           Fri Jun 28 20:09:20 UTC 2019
> 
> Modified Files:
>         pkgsrc/meta-pkgs/mate: Makefile
> 
> Log Message:
> mate: Comment out pluma for now
> 
> It is still broken in bulk builds due to python2/python3 conflicts.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.22 -r1.23 pkgsrc/meta-pkgs/mate/Makefile
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/meta-pkgs/mate/Makefile
> diff -u pkgsrc/meta-pkgs/mate/Makefile:1.22 pkgsrc/meta-
> pkgs/mate/Makefile:1.23
> --- pkgsrc/meta-pkgs/mate/Makefile:1.22 Sat Mar 16 17:58:22 2019
> +++ pkgsrc/meta-pkgs/mate/Makefile      Fri Jun 28 20:09:20 2019
> @@ -1,4 +1,4 @@
> -# $NetBSD: Makefile,v 1.22 2019/03/16 17:58:22 gutteridge Exp $
> +# $NetBSD: Makefile,v 1.23 2019/06/28 20:09:20 nia Exp $
>  
>  PKGNAME=       mate-${VERSION}
>  CATEGORIES=    meta-pkgs
> @@ -45,6 +45,6 @@ DEPENDS+=     mate-themes>=3.22.19:../../gra
>  #DEPENDS+=     mate-user-share>=${VERSION}:../../net/mate-user-share
>  DEPENDS+=      mate-utils>=${VERSION}:../../misc/mate-utils
>  DEPENDS+=      mozo>=${VERSION}:../../x11/mozo
> -DEPENDS+=      pluma>=${VERSION}:../../editors/pluma
> +#DEPENDS+=     pluma>=${VERSION}:../../editors/pluma
>  
>  .include "../../mk/bsd.pkg.mk"

Hi Nia (& *),

Co-incidentally, I've been looking at this over the last couple of days
(mostly recreating a test environment). I think this can be fixed just
by using this:

Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pluma/options.mk,v
retrieving revision 1.9
diff -u -r1.9 options.mk
--- options.mk  26 Apr 2019 13:13:56 -0000      1.9
+++ options.mk  29 Jun 2019 02:12:18 -0000
@@ -35,5 +35,6 @@
 # XXX: Due to the mess described above, and the fact that python is
required
 # by the build process but is not python3 compatible, we need to
override and
 # use python2.7 explicitly.
+TOOL_DEPENDS+=         python27-[0-9]*:../../lang/python27
 PYTHONBIN=             ${PREFIX}/bin/python2.7
 .endif

It used to "just work" because 2.7 was the default. If I understand
correctly, we can't use the normal means of identifying Python as a
tool dependency, since 3.x is already getting pulled in through such
as an application dependency. But we can just add a TOOL_DEPENDS to
pull in 2.7 as well. (This is what Firefox does in mozilla-common.mk,
since it requires 2.7 and 3.x simultaneously as build tools.)

Anyway, that works for me. (There is more work that needs to be done in
Pluma's options.mk, but that's not something that could be done during
a freeze.)

Regards,

Dave