cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the meson generated pkg-config files to libdata/pkg-config, this

Browse Source 
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@
This commit is contained in:
Koop Mast 2017-05-13 08:37:29 +00:00
parent 08c2c84c2e
commit 9088dc0801
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=440761
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Mk/Uses/meson.mk
View File

@ -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)

1
graphics/graphene/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= graphene
PORTVERSION= 1.6.0
PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= GNOME

4
graphics/graphene/pkg-plist
View File

@ -28,8 +28,8 @@ lib/graphene-1.0/include/graphene-config.h
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