diff options
42 files changed, 84 insertions, 87 deletions
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile index d16ed33d387..d8640180be3 100644 --- a/audio/libmpdclient/Makefile +++ b/audio/libmpdclient/Makefile @@ -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" diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index 69022f0d5c6..480d89d97a9 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -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" diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index ecc6eb24873..f9ac0de149a 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -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" diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index 3b7bec9c30b..21dc97f90b7 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -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" diff --git a/chat/hexchat/Makefile b/chat/hexchat/Makefile index 5d8cc4da872..bf85f9a5e95 100644 --- a/chat/hexchat/Makefile +++ b/chat/hexchat/Makefile @@ -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" diff --git a/devel/Makefile b/devel/Makefile index 63ff6839087..0d538f36ce3 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -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 diff --git a/devel/at-spi2-atk/Makefile b/devel/at-spi2-atk/Makefile index 3f983901a43..a32db12cf72 100644 --- a/devel/at-spi2-atk/Makefile +++ b/devel/at-spi2-atk/Makefile @@ -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" diff --git a/devel/at-spi2-core/Makefile b/devel/at-spi2-core/Makefile index bfb31fa06ad..74c6bbc5fa5 100644 --- a/devel/at-spi2-core/Makefile +++ b/devel/at-spi2-core/Makefile @@ -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" diff --git a/devel/atk/Makefile b/devel/atk/Makefile index 1149c2c58da..3258472ae7d 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -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.38.0 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" diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index a587843ddb9..ac6a7b414c2 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -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" diff --git a/devel/gdbus-codegen/Makefile b/devel/gdbus-codegen/Makefile index 44b620bc76c..8b44f7de27d 100644 --- a/devel/gdbus-codegen/Makefile +++ b/devel/gdbus-codegen/Makefile @@ -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" diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 85de1b6f1dd..69bbff44bba 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -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" diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index ba3ebb32692..d18da95b8f3 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -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.58.0 .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" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index f92497c644b..981e7faff2b 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -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.12.10 # 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" diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index bd37ded085f..eb71974a73d 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -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-introspection= gobject-introspection>=1.46.0 .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" diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile index a22fb91bd87..2e227614ef8 100644 --- a/editors/gtranslator/Makefile +++ b/editors/gtranslator/Makefile @@ -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_post_install.py .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" diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile index 3343fc4989f..a4aa91b384d 100644 --- a/emulators/snes9x-gtk/Makefile +++ b/emulators/snes9x-gtk/Makefile @@ -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,${DEVOSSAUDIO},g" 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" diff --git a/games/taisei/Makefile b/games/taisei/Makefile index f926e429f25..5afc5ec2d04 100644 --- a/games/taisei/Makefile +++ b/games/taisei/Makefile @@ -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=implicit-function-declaration 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" diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index acf45768d16..769e7af50fe 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -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]*:../../devel/py-mako # 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" diff --git a/graphics/gdk-pixbuf2-xlib/Makefile b/graphics/gdk-pixbuf2-xlib/Makefile index 778d0e7b302..29f0321641f 100644 --- a/graphics/gdk-pixbuf2-xlib/Makefile +++ b/graphics/gdk-pixbuf2-xlib/Makefile @@ -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" diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index df60a6b9643..16595db76ff 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -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" diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile index f0b0d260ab2..53d214f2150 100644 --- a/graphics/gexiv2/Makefile +++ b/graphics/gexiv2/Makefile @@ -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" diff --git a/graphics/girara/Makefile b/graphics/girara/Makefile index b71e51cdfdb..6b28acb1a5f 100644 --- a/graphics/girara/Makefile +++ b/graphics/girara/Makefile @@ -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" diff --git a/graphics/gnome-backgrounds/Makefile b/graphics/gnome-backgrounds/Makefile index 326d1814da8..deb836c316b 100644 --- a/graphics/gnome-backgrounds/Makefile +++ b/graphics/gnome-backgrounds/Makefile @@ -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" diff --git a/graphics/zathura-cb/Makefile b/graphics/zathura-cb/Makefile index 68ed9b238ed..08db738bddf 100644 --- a/graphics/zathura-cb/Makefile +++ b/graphics/zathura-cb/Makefile @@ -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" diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile index 12e8a7fb2b8..db2fd89694c 100644 --- a/graphics/zathura-djvu/Makefile +++ b/graphics/zathura-djvu/Makefile @@ -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" diff --git a/multimedia/gst-plugins1-editing-services/Makefile b/multimedia/gst-plugins1-editing-services/Makefile index aaf0cc46225..1b89273a22e 100644 --- a/multimedia/gst-plugins1-editing-services/Makefile +++ b/multimedia/gst-plugins1-editing-services/Makefile @@ -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}/output/ges 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" diff --git a/multimedia/gst-plugins1-transcoder/Makefile b/multimedia/gst-plugins1-transcoder/Makefile index 1c8ce666a42..aa1766d3aa7 100644 --- a/multimedia/gst-plugins1-transcoder/Makefile +++ b/multimedia/gst-plugins1-transcoder/Makefile @@ -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}/output 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" diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index ed0554db747..59b416724e6 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -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" diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index f098e0cf8bf..4ea3f7b99d4 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -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+= libproxy>=0.3.1 .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" diff --git a/net/gssdp12/Makefile b/net/gssdp12/Makefile index 4247d3344ea..dbe253e5d1b 100644 --- a/net/gssdp12/Makefile +++ b/net/gssdp12/Makefile @@ -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-introspection= build .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" diff --git a/net/gupnp12/Makefile b/net/gupnp12/Makefile index 7470d9b66be..e422956949d 100644 --- a/net/gupnp12/Makefile +++ b/net/gupnp12/Makefile @@ -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>=2.48.0 .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" diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index 586aaa4fdcb..0aef2ffef31 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -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-introspection= build .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" diff --git a/pkgtools/url2pkg/files/url2pkg.py b/pkgtools/url2pkg/files/url2pkg.py index 9de0bdbf70a..5660142f3a1 100644 --- a/pkgtools/url2pkg/files/url2pkg.py +++ b/pkgtools/url2pkg/files/url2pkg.py @@ -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)*$') diff --git a/pkgtools/url2pkg/files/url2pkg_test.py b/pkgtools/url2pkg/files/url2pkg_test.py index 3c06fe8ee37..9cfc561a77f 100644 --- a/pkgtools/url2pkg/files/url2pkg_test.py +++ b/pkgtools/url2pkg/files/url2pkg_test.py @@ -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: 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): diff --git a/print/zathura-pdf-mupdf/Makefile b/print/zathura-pdf-mupdf/Makefile index 900ada3421f..34bb5785826 100644 --- a/print/zathura-pdf-mupdf/Makefile +++ b/print/zathura-pdf-mupdf/Makefile @@ -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" diff --git a/print/zathura-pdf-poppler/Makefile b/print/zathura-pdf-poppler/Makefile index 2ff196663ed..04bb1da314b 100644 --- a/print/zathura-pdf-poppler/Makefile +++ b/print/zathura-pdf-poppler/Makefile @@ -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" diff --git a/print/zathura-ps/Makefile b/print/zathura-ps/Makefile index 25ff4d37c43..97c5e83973f 100644 --- a/print/zathura-ps/Makefile +++ b/print/zathura-ps/Makefile @@ -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" diff --git a/print/zathura/Makefile b/print/zathura/Makefile index fd89ea5182b..ed4e11192ac 100644 --- a/print/zathura/Makefile +++ b/print/zathura/Makefile @@ -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" diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile index 7b4563aaadc..31c3bd15e84 100644 --- a/sysutils/libnotify/Makefile +++ b/sysutils/libnotify/Makefile @@ -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.26.0 .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" diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile index f6327481b51..1a993e74b3a 100644 --- a/textproc/json-glib/Makefile +++ b/textproc/json-glib/Makefile @@ -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" diff --git a/x11/compton/Makefile b/x11/compton/Makefile index f828832164a..7003ff59675 100644 --- a/x11/compton/Makefile +++ b/x11/compton/Makefile @@ -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" |