Date: Sat, 13 May 2017 08:37:29 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440761 - in head: Mk/Uses graphics/graphene Message-ID: <201705130837.v4D8bTiI023601@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat May 13 08:37:29 2017 New Revision: 440761 URL: https://svnweb.freebsd.org/changeset/ports/440761 Log: Move the meson generated pkg-config files to libdata/pkg-config, this makes ports build by meson respect the current policy regarding pkg-config files. I picked this solution over hacking meson itself, and potential breaking more. Bump graphics/graphene due to this change. Obtained from: Code copied from ports/218067 by mat@ Modified: head/Mk/Uses/meson.mk head/graphics/graphene/Makefile head/graphics/graphene/pkg-plist Modified: head/Mk/Uses/meson.mk ============================================================================== --- head/Mk/Uses/meson.mk Sat May 13 07:48:39 2017 (r440760) +++ head/Mk/Uses/meson.mk Sat May 13 08:37:29 2017 (r440761) @@ -65,4 +65,18 @@ MESON_BUILD_DIR?= _build # Add meson build dir at the end. CONFIGURE_ARGS+= ${MESON_BUILD_DIR} +# Add this workaround copied from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=218067 +# to make sure meson installs the pkg-config in the current correct place +.if !target(fixup-lib-pkgconfig) +_USES_install+= 601:fixup-lib-pkgconfig +fixup-lib-pkgconfig: + @if [ -d ${STAGEDIR}${PREFIX}/lib/pkgconfig ]; then \ + if [ -z "$$(${FIND} ${STAGEDIR}${PREFIX}/lib/pkgconfig -maxdepth 0 -empty)" ]; then \ + ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \ + ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/* ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \ + fi; \ + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig; \ + fi +.endif + .endif #!defined(_INCLUDE_USES_MESON_MK) Modified: head/graphics/graphene/Makefile ============================================================================== --- head/graphics/graphene/Makefile Sat May 13 07:48:39 2017 (r440760) +++ head/graphics/graphene/Makefile Sat May 13 08:37:29 2017 (r440761) @@ -2,6 +2,7 @@ PORTNAME= graphene PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= GNOME Modified: head/graphics/graphene/pkg-plist ============================================================================== --- head/graphics/graphene/pkg-plist Sat May 13 07:48:39 2017 (r440760) +++ head/graphics/graphene/pkg-plist Sat May 13 08:37:29 2017 (r440761) @@ -28,8 +28,8 @@ lib/graphene-1.0/include/graphene-config lib/libgraphene-1.0.so lib/libgraphene-1.0.so.0 lib/libgraphene-1.0.so.0.600.0 -lib/pkgconfig/graphene-1.0.pc -lib/pkgconfig/graphene-gobject-1.0.pc +libdata/pkgconfig/graphene-1.0.pc +libdata/pkgconfig/graphene-gobject-1.0.pc share/gir-1.0/Graphene-1.0.gir %%GTKDOC%%share/gtk-doc/html/graphene/annotation-glossary.html %%GTKDOC%%share/gtk-doc/html/graphene/api-index.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705130837.v4D8bTiI023601>