CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Patrick Welche" <prlw1%netbsd.org@localhost>
Date: Mon, 7 Oct 2019 09:28:14 +0000

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Oct  7 09:28:14 UTC 2019

Modified Files:
        pkgsrc/audio/libmpdclient: Makefile
        pkgsrc/audio/mpc: Makefile
        pkgsrc/audio/musicpd: Makefile
        pkgsrc/audio/ncmpc: Makefile
        pkgsrc/chat/hexchat: Makefile
        pkgsrc/devel: Makefile
        pkgsrc/devel/at-spi2-atk: Makefile
        pkgsrc/devel/at-spi2-core: Makefile
        pkgsrc/devel/atk: Makefile
        pkgsrc/devel/dconf: Makefile
        pkgsrc/devel/gdbus-codegen: Makefile
        pkgsrc/devel/glib2: Makefile
        pkgsrc/devel/gobject-introspection: Makefile
        pkgsrc/devel/pango: Makefile
        pkgsrc/devel/py-gobject3: Makefile
        pkgsrc/editors/gtranslator: Makefile
        pkgsrc/emulators/snes9x-gtk: Makefile
        pkgsrc/games/taisei: Makefile
        pkgsrc/graphics/MesaLib: Makefile
        pkgsrc/graphics/gdk-pixbuf2: Makefile
        pkgsrc/graphics/gdk-pixbuf2-xlib: Makefile
        pkgsrc/graphics/gexiv2: Makefile
        pkgsrc/graphics/girara: Makefile
        pkgsrc/graphics/gnome-backgrounds: Makefile
        pkgsrc/graphics/zathura-cb: Makefile
        pkgsrc/graphics/zathura-djvu: Makefile
        pkgsrc/multimedia/gst-plugins1-editing-services: Makefile
        pkgsrc/multimedia/gst-plugins1-transcoder: Makefile
        pkgsrc/multimedia/pitivi: Makefile
        pkgsrc/net/glib-networking: Makefile
        pkgsrc/net/gssdp12: Makefile
        pkgsrc/net/gupnp12: Makefile
        pkgsrc/net/libsoup: Makefile
        pkgsrc/pkgtools/url2pkg/files: url2pkg.py url2pkg_test.py
        pkgsrc/print/zathura: Makefile
        pkgsrc/print/zathura-pdf-mupdf: Makefile
        pkgsrc/print/zathura-pdf-poppler: Makefile
        pkgsrc/print/zathura-ps: Makefile
        pkgsrc/sysutils/libnotify: Makefile
        pkgsrc/textproc/json-glib: Makefile
        pkgsrc/x11/compton: Makefile

Log Message:
Rename py-meson to meson.

The motivation is to consider meson as an application, so there is only
one copy on the system, and as a python 3 program, it can build python 2
packages.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/libmpdclient/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/mpc/Makefile
cvs rdiff -u -r1.195 -r1.196 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/ncmpc/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/chat/hexchat/Makefile
cvs rdiff -u -r1.2923 -r1.2924 pkgsrc/devel/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/at-spi2-atk/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/devel/atk/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/dconf/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/gdbus-codegen/Makefile
cvs rdiff -u -r1.258 -r1.259 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.226 -r1.227 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/py-gobject3/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/editors/gtranslator/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/emulators/snes9x-gtk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/taisei/Makefile
cvs rdiff -u -r1.167 -r1.168 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/gdk-pixbuf2/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/gexiv2/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/girara/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/gnome-backgrounds/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/zathura-cb/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/zathura-djvu/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/gst-plugins1-editing-services/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/gst-plugins1-transcoder/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/pitivi/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/glib-networking/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/gssdp12/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/gupnp12/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/libsoup/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
cvs rdiff -u -r1.17 -r1.18 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/zathura/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/zathura-pdf-mupdf/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/print/zathura-pdf-poppler/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/zathura-ps/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/sysutils/libnotify/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/textproc/json-glib/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/compton/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libmpdclient/Makefile
diff -u pkgsrc/audio/libmpdclient/Makefile:1.13 pkgsrc/audio/libmpdclient/Makefile:1.14
--- pkgsrc/audio/libmpdclient/Makefile:1.13     Sat Dec  1 11:33:08 2018
+++ pkgsrc/audio/libmpdclient/Makefile  Mon Oct  7 09:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/12/01 11:33:08 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/07 09:28:09 prlw1 Exp $
 
 DISTNAME=      libmpdclient-2.16
 CATEGORIES=    audio
@@ -12,5 +12,5 @@ LICENSE=      modified-bsd
 
 LDFLAGS.SunOS+=        -lsocket
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/mpc/Makefile
diff -u pkgsrc/audio/mpc/Makefile:1.29 pkgsrc/audio/mpc/Makefile:1.30
--- pkgsrc/audio/mpc/Makefile:1.29      Sun Jun 23 08:38:08 2019
+++ pkgsrc/audio/mpc/Makefile   Mon Oct  7 09:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/06/23 08:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/10/07 09:28:09 prlw1 Exp $
 
 DISTNAME=              mpc-0.32
 CATEGORIES=            audio
@@ -22,7 +22,7 @@ LIBS+=                        ${BUILDLINK_LDADD.iconv}
 # is installed, causing our PLIST check to fail.
 MESON_ARGS+=           -Ddocumentation=disabled
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 BUILDLINK_API_DEPENDS.libmpdclient+=   libmpdclient>=2.9
 .include "../../audio/libmpdclient/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/audio/musicpd/Makefile
diff -u pkgsrc/audio/musicpd/Makefile:1.195 pkgsrc/audio/musicpd/Makefile:1.196
--- pkgsrc/audio/musicpd/Makefile:1.195 Tue Oct  1 13:55:53 2019
+++ pkgsrc/audio/musicpd/Makefile       Mon Oct  7 09:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2019/10/01 13:55:53 nia Exp $
+# $NetBSD: Makefile,v 1.196 2019/10/07 09:28:09 prlw1 Exp $
 
 DISTNAME=              mpd-0.21.15
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
@@ -68,7 +68,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 BUILDLINK_ABI_DEPENDS.flac+=   flac>=1.2
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"

Index: pkgsrc/audio/ncmpc/Makefile
diff -u pkgsrc/audio/ncmpc/Makefile:1.33 pkgsrc/audio/ncmpc/Makefile:1.34
--- pkgsrc/audio/ncmpc/Makefile:1.33    Sun Oct  6 16:15:51 2019
+++ pkgsrc/audio/ncmpc/Makefile Mon Oct  7 09:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/10/06 16:15:51 nia Exp $
+# $NetBSD: Makefile,v 1.34 2019/10/07 09:28:09 prlw1 Exp $
 
 DISTNAME=      ncmpc-0.35
 CATEGORIES=    audio
@@ -40,7 +40,7 @@ SUBST_FILES.py+=      doc/meson.build
 SUBST_VARS.py+=                PYVERSSUFFIX
 
 .include "options.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../audio/libmpdclient/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"

Index: pkgsrc/chat/hexchat/Makefile
diff -u pkgsrc/chat/hexchat/Makefile:1.37 pkgsrc/chat/hexchat/Makefile:1.38
--- pkgsrc/chat/hexchat/Makefile:1.37   Sun Aug 11 13:18:03 2019
+++ pkgsrc/chat/hexchat/Makefile        Mon Oct  7 09:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/08/11 13:18:03 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2019/10/07 09:28:09 prlw1 Exp $
 
 DISTNAME=      hexchat-2.14.2
 PKGREVISION=   2
@@ -42,7 +42,7 @@ PLIST_SUBST+=         SOEXT=${SOEXT}
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.2923 pkgsrc/devel/Makefile:1.2924
--- pkgsrc/devel/Makefile:1.2923        Fri Oct  4 22:15:04 2019
+++ pkgsrc/devel/Makefile       Mon Oct  7 09:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2923 2019/10/04 22:15:04 gutteridge Exp $
+# $NetBSD: Makefile,v 1.2924 2019/10/07 09:28:09 prlw1 Exp $
 #
 
 COMMENT=       Development utilities
@@ -789,6 +789,7 @@ SUBDIR+=    mell
 SUBDIR+=       memcached
 SUBDIR+=       menhir
 SUBDIR+=       mercurial
+SUBDIR+=       meson
 SUBDIR+=       mico
 SUBDIR+=       mk-configure
 SUBDIR+=       mkcmd
@@ -2216,7 +2217,6 @@ SUBDIR+=  py-mccabe
 SUBDIR+=       py-memcached
 SUBDIR+=       py-memory-profiler
 SUBDIR+=       py-mercurial
-SUBDIR+=       py-meson
 SUBDIR+=       py-minimock
 SUBDIR+=       py-mixbox
 SUBDIR+=       py-mmh3

Index: pkgsrc/devel/at-spi2-atk/Makefile
diff -u pkgsrc/devel/at-spi2-atk/Makefile:1.22 pkgsrc/devel/at-spi2-atk/Makefile:1.23
--- pkgsrc/devel/at-spi2-atk/Makefile:1.22      Thu Jul 18 15:03:51 2019
+++ pkgsrc/devel/at-spi2-atk/Makefile   Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/07/18 15:03:51 prlw1 Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/07 09:28:10 prlw1 Exp $
 
 DISTNAME=      at-spi2-atk-2.33.2
 CATEGORIES=    devel gnome
@@ -25,5 +25,5 @@ BUILDLINK_API_DEPENDS.dbus+=  dbus>=1.5
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/at-spi2-core/Makefile
diff -u pkgsrc/devel/at-spi2-core/Makefile:1.31 pkgsrc/devel/at-spi2-core/Makefile:1.32
--- pkgsrc/devel/at-spi2-core/Makefile:1.31     Mon Jul 22 15:11:00 2019
+++ pkgsrc/devel/at-spi2-core/Makefile  Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/07/22 15:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/07 09:28:10 prlw1 Exp $
 
 DISTNAME=      at-spi2-core-2.33.2
 PKGREVISION=   1
@@ -48,5 +48,5 @@ post-install:
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/atk/Makefile
diff -u pkgsrc/devel/atk/Makefile:1.100 pkgsrc/devel/atk/Makefile:1.101
--- pkgsrc/devel/atk/Makefile:1.100     Thu Jul 18 14:41:00 2019
+++ pkgsrc/devel/atk/Makefile   Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2019/07/18 14:41:00 prlw1 Exp $
+# $NetBSD: Makefile,v 1.101 2019/10/07 09:28:10 prlw1 Exp $
 
 DISTNAME=              atk-2.33.3
 CATEGORIES=            devel gnome
@@ -23,5 +23,5 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.3
 BUILDLINK_DEPMETHOD.gobject-introspection:= build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/dconf/Makefile
diff -u pkgsrc/devel/dconf/Makefile:1.51 pkgsrc/devel/dconf/Makefile:1.52
--- pkgsrc/devel/dconf/Makefile:1.51    Fri Aug 16 10:54:51 2019
+++ pkgsrc/devel/dconf/Makefile Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/08/16 10:54:51 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2019/10/07 09:28:10 prlw1 Exp $
 
 DISTNAME=      dconf-0.32.0
 CATEGORIES=    devel gnome
@@ -58,7 +58,7 @@ BUILDLINK_DEPMETHOD.vala=     build
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.44.0
 #.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../devel/glib2/modules.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gdbus-codegen/Makefile
diff -u pkgsrc/devel/gdbus-codegen/Makefile:1.20 pkgsrc/devel/gdbus-codegen/Makefile:1.21
--- pkgsrc/devel/gdbus-codegen/Makefile:1.20    Mon Jun  3 09:53:50 2019
+++ pkgsrc/devel/gdbus-codegen/Makefile Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/06/03 09:53:50 prlw1 Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/07 09:28:10 prlw1 Exp $
 
 .include "../../devel/glib2/Makefile.common"
 
@@ -22,6 +22,6 @@ REPLACE_PYTHON+=      gdbus-codegen.in
 
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.258 pkgsrc/devel/glib2/Makefile:1.259
--- pkgsrc/devel/glib2/Makefile:1.258   Tue Aug 20 14:06:46 2019
+++ pkgsrc/devel/glib2/Makefile Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.258 2019/08/20 14:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.259 2019/10/07 09:28:10 prlw1 Exp $
 
 .include "Makefile.common"
 
@@ -69,7 +69,7 @@ PLIST.nococoa=        yes
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/devel/gobject-introspection/Makefile
diff -u pkgsrc/devel/gobject-introspection/Makefile:1.64 pkgsrc/devel/gobject-introspection/Makefile:1.65
--- pkgsrc/devel/gobject-introspection/Makefile:1.64    Tue Aug 20 13:56:40 2019
+++ pkgsrc/devel/gobject-introspection/Makefile Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2019/08/20 13:56:40 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2019/10/07 09:28:10 prlw1 Exp $
 
 DISTNAME=      gobject-introspection-1.60.2
 CATEGORIES=    devel gnome
@@ -39,7 +39,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.5
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0
 .include "../../devel/libffi/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.226 pkgsrc/devel/pango/Makefile:1.227
--- pkgsrc/devel/pango/Makefile:1.226   Wed Sep 11 23:37:44 2019
+++ pkgsrc/devel/pango/Makefile Mon Oct  7 09:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.226 2019/09/11 23:37:44 gutteridge Exp $
+# $NetBSD: Makefile,v 1.227 2019/10/07 09:28:10 prlw1 Exp $
 
 DISTNAME=      pango-1.44.6
 CATEGORIES=    devel fonts
@@ -58,5 +58,5 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.1
 # which corresponds to release version 2.8.1
 BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-gobject3/Makefile
diff -u pkgsrc/devel/py-gobject3/Makefile:1.37 pkgsrc/devel/py-gobject3/Makefile:1.38
--- pkgsrc/devel/py-gobject3/Makefile:1.37      Thu Sep 26 10:36:33 2019
+++ pkgsrc/devel/py-gobject3/Makefile   Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/09/26 10:36:33 prlw1 Exp $
+# $NetBSD: Makefile,v 1.38 2019/10/07 09:28:11 prlw1 Exp $
 
 .include "Makefile.common"
 
@@ -25,7 +25,7 @@ BUILDLINK_API_DEPENDS.gobject-introspect
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/py-gobject3-common/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 # https://bugzilla.gnome.org/show_bug.cgi?id=685094
 # https://bugzilla.gnome.org/show_bug.cgi?id=707196
 .include "../../graphics/py-cairo/buildlink3.mk"

Index: pkgsrc/editors/gtranslator/Makefile
diff -u pkgsrc/editors/gtranslator/Makefile:1.77 pkgsrc/editors/gtranslator/Makefile:1.78
--- pkgsrc/editors/gtranslator/Makefile:1.77    Sun Jul 21 22:24:43 2019
+++ pkgsrc/editors/gtranslator/Makefile Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2019/07/21 22:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      gtranslator-3.32.1
 PKGREVISION=   1
@@ -35,6 +35,6 @@ REPLACE_PYTHON+=      build-aux/meson/meson_p
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/snes9x-gtk/Makefile
diff -u pkgsrc/emulators/snes9x-gtk/Makefile:1.70 pkgsrc/emulators/snes9x-gtk/Makefile:1.71
--- pkgsrc/emulators/snes9x-gtk/Makefile:1.70   Sat Oct  5 20:10:19 2019
+++ pkgsrc/emulators/snes9x-gtk/Makefile        Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2019/10/05 20:10:19 nia Exp $
+# $NetBSD: Makefile,v 1.71 2019/10/07 09:28:11 prlw1 Exp $
 
 PKGREVISION= 3
 .include "../../emulators/snes9x/Makefile.common"
@@ -32,7 +32,7 @@ SUBST_SED.oss=                -e "s,/dev/dsp,${DEVOSSA
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
 .include "options.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/games/taisei/Makefile
diff -u pkgsrc/games/taisei/Makefile:1.3 pkgsrc/games/taisei/Makefile:1.4
--- pkgsrc/games/taisei/Makefile:1.3    Sat Oct  5 02:28:49 2019
+++ pkgsrc/games/taisei/Makefile        Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/05 02:28:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      taisei-v1.3.1
 PKGNAME=       ${DISTNAME:S/-v/-/}
@@ -40,7 +40,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror=implici
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/opusfile/buildlink3.mk"
 .include "../../audio/SDL2_mixer/buildlink3.mk"

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.167 pkgsrc/graphics/MesaLib/Makefile:1.168
--- pkgsrc/graphics/MesaLib/Makefile:1.167      Thu Oct  3 15:50:06 2019
+++ pkgsrc/graphics/MesaLib/Makefile    Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2019/10/03 15:50:06 nia Exp $
+# $NetBSD: Makefile,v 1.168 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      mesa-19.1.6
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -168,9 +168,6 @@ TOOL_DEPENDS+=              ${PYPKGPREFIX}-mako-[0-9
 # needed to build vulkan support
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 
-# LLVM detection
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-meson>=0.51.1nb3:../../devel/py-meson
-
 EGDIR=         ${PREFIX}/share/examples/mesa
 
 OWN_DIRS=      ${PKG_SYSCONFDIR}/drirc.d
@@ -185,7 +182,7 @@ pre-configure:
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/share/drirc.d/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gdk-pixbuf2/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.42 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.43
--- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.42   Sun Oct  6 11:07:44 2019
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile        Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/10/06 11:07:44 nia Exp $
+# $NetBSD: Makefile,v 1.43 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -41,7 +41,7 @@ _BUILDING_GTK2= yes
 pre-build:
        ${CHMOD} +x ${WRKSRC}/build-aux/*.py ${WRKSRC}/build-aux/*.sh
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile:1.24 pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile:1.25
--- pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile:1.24      Fri Oct  4 23:37:20 2019
+++ pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile   Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/10/04 23:37:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=       gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
@@ -38,7 +38,7 @@ post-install:
        ${INSTALL_LIB} ${WRKSRC}/output/contrib/gdk-pixbuf-xlib/*.so* ${DESTDIR}${PREFIX}/lib
        ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdk-pixbuf-xlib-2.0.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/graphics/gexiv2/Makefile
diff -u pkgsrc/graphics/gexiv2/Makefile:1.6 pkgsrc/graphics/gexiv2/Makefile:1.7
--- pkgsrc/graphics/gexiv2/Makefile:1.6 Fri Aug  2 08:21:05 2019
+++ pkgsrc/graphics/gexiv2/Makefile     Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/02 08:21:05 nia Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      gexiv2-0.12.0
 CATEGORIES=    graphics devel
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE=   gexiv2.pc.in
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=./gexiv2/gexiv2.map
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"

Index: pkgsrc/graphics/girara/Makefile
diff -u pkgsrc/graphics/girara/Makefile:1.18 pkgsrc/graphics/girara/Makefile:1.19
--- pkgsrc/graphics/girara/Makefile:1.18        Sun Jul 21 22:24:05 2019
+++ pkgsrc/graphics/girara/Makefile     Mon Oct  7 09:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/07/21 22:24:05 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/07 09:28:11 prlw1 Exp $
 
 DISTNAME=      girara-0.3.2
 PKGREVISION=   1
@@ -15,6 +15,6 @@ USE_TOOLS+=   gettext pkg-config
 
 CFLAGS.SunOS+= -D__EXTENSIONS__
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gnome-backgrounds/Makefile
diff -u pkgsrc/graphics/gnome-backgrounds/Makefile:1.34 pkgsrc/graphics/gnome-backgrounds/Makefile:1.35
--- pkgsrc/graphics/gnome-backgrounds/Makefile:1.34     Wed Jun 13 19:35:51 2018
+++ pkgsrc/graphics/gnome-backgrounds/Makefile  Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/06/13 19:35:51 youri Exp $
+# $NetBSD: Makefile,v 1.35 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      gnome-backgrounds-3.28.0
 CATEGORIES=    graphics gnome
@@ -14,5 +14,5 @@ USE_TOOLS+=           gmake intltool msgfmt
 
 _TOOLS_USE_PKGSRC.msgfmt=      yes
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/zathura-cb/Makefile
diff -u pkgsrc/graphics/zathura-cb/Makefile:1.16 pkgsrc/graphics/zathura-cb/Makefile:1.17
--- pkgsrc/graphics/zathura-cb/Makefile:1.16    Sun Jul 21 22:25:06 2019
+++ pkgsrc/graphics/zathura-cb/Makefile Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/07/21 22:25:06 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/07 09:28:12 prlw1 Exp $
 #
 
 DISTNAME=      zathura-cb-0.1.8
@@ -14,7 +14,7 @@ LICENSE=      zlib
 
 USE_TOOLS+=    pkg-config
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"

Index: pkgsrc/graphics/zathura-djvu/Makefile
diff -u pkgsrc/graphics/zathura-djvu/Makefile:1.14 pkgsrc/graphics/zathura-djvu/Makefile:1.15
--- pkgsrc/graphics/zathura-djvu/Makefile:1.14  Sun Jul 21 22:25:07 2019
+++ pkgsrc/graphics/zathura-djvu/Makefile       Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/07/21 22:25:07 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/07 09:28:12 prlw1 Exp $
 #
 
 DISTNAME=      zathura-djvu-0.2.8
@@ -14,7 +14,7 @@ LICENSE=      zlib
 
 USE_TOOLS+=    pkg-config
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins1-editing-services/Makefile
diff -u pkgsrc/multimedia/gst-plugins1-editing-services/Makefile:1.3 pkgsrc/multimedia/gst-plugins1-editing-services/Makefile:1.4
--- pkgsrc/multimedia/gst-plugins1-editing-services/Makefile:1.3        Thu Oct  3 22:33:20 2019
+++ pkgsrc/multimedia/gst-plugins1-editing-services/Makefile    Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/03 22:33:20 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      gstreamer-editing-services-1.16.0
 PKGNAME=       ${DISTNAME:S/gstreamer-/gst-plugins1-/1}
@@ -21,7 +21,7 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${WRKSRC}/out
 
 MESON_ARGS+=   -Dgtk_doc=disabled
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/extension.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"

Index: pkgsrc/multimedia/gst-plugins1-transcoder/Makefile
diff -u pkgsrc/multimedia/gst-plugins1-transcoder/Makefile:1.2 pkgsrc/multimedia/gst-plugins1-transcoder/Makefile:1.3
--- pkgsrc/multimedia/gst-plugins1-transcoder/Makefile:1.2      Thu Oct  3 22:40:12 2019
+++ pkgsrc/multimedia/gst-plugins1-transcoder/Makefile  Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/03 22:40:12 nia Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      gst-transcoder-1.16.0
 PKGNAME=       ${DISTNAME:S/^gst/gst-plugins1/1}
@@ -25,7 +25,7 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${WRKSRC}/out
 
 MESON_ARGS+=   -Ddisable_doc=true
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/pitivi/Makefile
diff -u pkgsrc/multimedia/pitivi/Makefile:1.53 pkgsrc/multimedia/pitivi/Makefile:1.54
--- pkgsrc/multimedia/pitivi/Makefile:1.53      Thu Oct  3 22:45:22 2019
+++ pkgsrc/multimedia/pitivi/Makefile   Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/10/03 22:45:22 nia Exp $
+# $NetBSD: Makefile,v 1.54 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      pitivi-0.999
 CATEGORIES=    multimedia
@@ -35,7 +35,7 @@ REPLACE_PYTHON+=      bin/pitivi.in
 # Python 3 only
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/gst-plugins1-gdk_pixbuf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"

Index: pkgsrc/net/glib-networking/Makefile
diff -u pkgsrc/net/glib-networking/Makefile:1.43 pkgsrc/net/glib-networking/Makefile:1.44
--- pkgsrc/net/glib-networking/Makefile:1.43    Sat Jul 20 22:46:38 2019
+++ pkgsrc/net/glib-networking/Makefile Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/07/20 22:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      glib-networking-2.60.3
 PKGREVISION=   1
@@ -23,6 +23,6 @@ BUILDLINK_API_DEPENDS.libproxy+=      libprox
 .include "../../www/libproxy/buildlink3.mk"
 .include "../../security/p11-kit/buildlink3.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/gssdp12/Makefile
diff -u pkgsrc/net/gssdp12/Makefile:1.1 pkgsrc/net/gssdp12/Makefile:1.2
--- pkgsrc/net/gssdp12/Makefile:1.1     Tue Aug 20 11:26:13 2019
+++ pkgsrc/net/gssdp12/Makefile Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/08/20 11:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      gssdp-1.2.1
 PKGNAME=       ${DISTNAME:S/gssdp/gssdp12/}
@@ -27,5 +27,5 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/gupnp12/Makefile
diff -u pkgsrc/net/gupnp12/Makefile:1.1 pkgsrc/net/gupnp12/Makefile:1.2
--- pkgsrc/net/gupnp12/Makefile:1.1     Tue Aug 20 13:16:43 2019
+++ pkgsrc/net/gupnp12/Makefile Mon Oct  7 09:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/08/20 13:16:43 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/07 09:28:12 prlw1 Exp $
 
 DISTNAME=      gupnp-1.2.1
 PKGNAME=       ${DISTNAME:S/gupnp/gupnp12/}
@@ -41,5 +41,5 @@ BUILDLINK_API_DEPENDS.libsoup+=       libsoup>
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../net/gssdp12/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libsoup/Makefile
diff -u pkgsrc/net/libsoup/Makefile:1.54 pkgsrc/net/libsoup/Makefile:1.55
--- pkgsrc/net/libsoup/Makefile:1.54    Mon Aug 19 20:01:52 2019
+++ pkgsrc/net/libsoup/Makefile Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/08/19 20:01:52 otis Exp $
+# $NetBSD: Makefile,v 1.55 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      libsoup-2.66.2
 PKGREVISION=   1
@@ -42,5 +42,5 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/libpsl/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.18 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.19
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.18       Sun Oct  6 12:50:23 2019
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py    Mon Oct  7 09:28:13 2019
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.18 2019/10/06 12:50:23 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.19 2019/10/07 09:28:13 prlw1 Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -651,7 +651,7 @@ class Adjuster:
 
     def adjust_meson(self):
         if self.wrksrc_isfile('meson.build'):
-            self.includes.append('../../devel/py-meson/build.mk')
+            self.includes.append('../../devel/meson/build.mk')
 
     def adjust_gconf2_schemas(self):
         gconf2_files = self.wrksrc_find(r'\.schemas(\.in)*$')

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.17 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.18
--- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.17  Sun Oct  6 12:50:23 2019
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py       Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.17 2019/10/06 12:50:23 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.18 2019/10/07 09:28:13 prlw1 Exp $
 
 import pytest
 from url2pkg import *
@@ -959,7 +959,7 @@ def test_Adjuster_adjust_meson(tmp_path:
 
     adjuster.adjust_meson()
 
-    assert adjuster.includes == ['../../devel/py-meson/build.mk']
+    assert adjuster.includes == ['../../devel/meson/build.mk']
 
 
 def test_Adjuster_adjust_perl_module_Build_PL(tmp_path: Path):

Index: pkgsrc/print/zathura/Makefile
diff -u pkgsrc/print/zathura/Makefile:1.28 pkgsrc/print/zathura/Makefile:1.29
--- pkgsrc/print/zathura/Makefile:1.28  Sun Jul 21 22:24:10 2019
+++ pkgsrc/print/zathura/Makefile       Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/07/21 22:24:10 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      zathura-0.4.3
 PKGREVISION=   2
@@ -23,7 +23,7 @@ MESON_ARGS+=  -D convert-icon=disabled
 CFLAGS.SunOS+= -D__EXTENSIONS__
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/girara/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

Index: pkgsrc/print/zathura-pdf-mupdf/Makefile
diff -u pkgsrc/print/zathura-pdf-mupdf/Makefile:1.35 pkgsrc/print/zathura-pdf-mupdf/Makefile:1.36
--- pkgsrc/print/zathura-pdf-mupdf/Makefile:1.35        Thu Aug 22 12:23:43 2019
+++ pkgsrc/print/zathura-pdf-mupdf/Makefile     Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/08/22 12:23:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2019/10/07 09:28:13 prlw1 Exp $
 #
 
 DISTNAME=      zathura-pdf-mupdf-0.3.5
@@ -19,7 +19,7 @@ MESON_ARGS+=  -D link-external=true
 
 CPPFLAGS+=     -D_XOPEN_SOURCE=600
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.16.0
 .include "../../print/mupdf/buildlink3.mk"

Index: pkgsrc/print/zathura-pdf-poppler/Makefile
diff -u pkgsrc/print/zathura-pdf-poppler/Makefile:1.38 pkgsrc/print/zathura-pdf-poppler/Makefile:1.39
--- pkgsrc/print/zathura-pdf-poppler/Makefile:1.38      Tue Jul 23 17:20:01 2019
+++ pkgsrc/print/zathura-pdf-poppler/Makefile   Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/07/23 17:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      zathura-pdf-poppler-0.2.9
 PKGREVISION=   10
@@ -13,7 +13,7 @@ LICENSE=      zlib
 
 USE_TOOLS+=    pkg-config
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"

Index: pkgsrc/print/zathura-ps/Makefile
diff -u pkgsrc/print/zathura-ps/Makefile:1.19 pkgsrc/print/zathura-ps/Makefile:1.20
--- pkgsrc/print/zathura-ps/Makefile:1.19       Sun Jul 21 22:25:39 2019
+++ pkgsrc/print/zathura-ps/Makefile    Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/07/21 22:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      zathura-ps-0.2.6
 PKGREVISION=   5
@@ -13,7 +13,7 @@ LICENSE=      zlib
 
 USE_TOOLS+=    pkg-config
 
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"

Index: pkgsrc/sysutils/libnotify/Makefile
diff -u pkgsrc/sysutils/libnotify/Makefile:1.55 pkgsrc/sysutils/libnotify/Makefile:1.56
--- pkgsrc/sysutils/libnotify/Makefile:1.55     Sun Aug 25 11:54:34 2019
+++ pkgsrc/sysutils/libnotify/Makefile  Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/08/25 11:54:34 leot Exp $
+# $NetBSD: Makefile,v 1.56 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      libnotify-0.7.8
 PKGREVISION=   1
@@ -27,5 +27,5 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.2
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gtk3=      build
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/json-glib/Makefile
diff -u pkgsrc/textproc/json-glib/Makefile:1.28 pkgsrc/textproc/json-glib/Makefile:1.29
--- pkgsrc/textproc/json-glib/Makefile:1.28     Thu Jun 13 09:45:17 2019
+++ pkgsrc/textproc/json-glib/Makefile  Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/06/13 09:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      json-glib-1.4.4
 CATEGORIES=    textproc gnome
@@ -32,5 +32,5 @@ PRINT_PLIST_AWK+= \
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/compton/Makefile
diff -u pkgsrc/x11/compton/Makefile:1.9 pkgsrc/x11/compton/Makefile:1.10
--- pkgsrc/x11/compton/Makefile:1.9     Tue Sep 17 11:43:29 2019
+++ pkgsrc/x11/compton/Makefile Mon Oct  7 09:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/17 11:43:29 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/07 09:28:13 prlw1 Exp $
 
 DISTNAME=      compton-7.3
 CATEGORIES=    x11 wm
@@ -29,7 +29,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/examples/compton
 
 .include "options.mk"
-.include "../../devel/py-meson/build.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/uthash/buildlink3.mk"

Prev by Date: CVS commit: [pkgsrc-2019Q3] pkgsrc/doc
Next by Date: CVS commit: pkgsrc/filesystems
Previous by Thread: CVS commit: [pkgsrc-2019Q3] pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/filesystems
Indexes:

Home | Main Index | Thread Index | Old Index