CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 15 08:58:39 UTC 2018

Modified Files:
        pkgsrc/devel/py-meson: build.mk
        pkgsrc/net/glib-networking: Makefile

Log Message:
py-meson: Centralise meson_post_install.py handling.

This appears to be a common problem across packages that use meson,
though it's unclear at this time why this doesn't seem to be a problem
for anyone else.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-meson/build.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/glib-networking/Makefile

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

Modified files:

Index: pkgsrc/devel/py-meson/build.mk
diff -u pkgsrc/devel/py-meson/build.mk:1.4 pkgsrc/devel/py-meson/build.mk:1.5
--- pkgsrc/devel/py-meson/build.mk:1.4  Sat Mar 17 11:39:01 2018
+++ pkgsrc/devel/py-meson/build.mk      Tue May 15 08:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.4 2018/03/17 11:39:01 tnn Exp $
+# $NetBSD: build.mk,v 1.5 2018/05/15 08:58:39 jperkin Exp $
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
 
@@ -14,6 +14,9 @@ meson-build:
 
 do-install: meson-install
 meson-install:
+       if [ -f ${WRKSRC}/meson_post_install.py ]; then         \
+               ${CHMOD} +x ${WRKSRC}/meson_post_install.py;    \
+       fi
        cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ninja -C output install
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/net/glib-networking/Makefile
diff -u pkgsrc/net/glib-networking/Makefile:1.36 pkgsrc/net/glib-networking/Makefile:1.37
--- pkgsrc/net/glib-networking/Makefile:1.36    Mon May 14 09:44:01 2018
+++ pkgsrc/net/glib-networking/Makefile Tue May 15 08:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/05/14 09:44:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2018/05/15 08:58:39 jperkin Exp $
 
 DISTNAME=      glib-networking-2.56.0
 PKGREVISION=   3
@@ -19,9 +19,6 @@ USE_TOOLS+=   pkg-config gmake gettext
 REPLACE_PYTHON+=       find-ca-certificates
 REPLACE_PYTHON+=       meson_post_install.py
 
-pre-install:
-       ${CHMOD} +x ${WRKSRC}/meson_post_install.py
-
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.56.0
 .include "../../devel/glib2/modules.mk"
 BUILDLINK_API_DEPENDS.libproxy+=       libproxy>=0.3.1