From c304fb63fde8798039df1ccc0bc5024c79dbaa0d Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 8 Jun 2017 06:50:00 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20a=20few=20lib/pkgconfig=20=E2=86=92=20lib?=
 =?UTF-8?q?data/pkgconfig=20that=20crept=20in=20between=20the=20exp-run=20?=
 =?UTF-8?q?and=20the=20commit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported by:	antoine
Sponsored by:	Absolight
---
 Mk/Uses/meson.mk      | 14 --------------
 devel/cltune/Makefile |  4 ----
 math/clblast/Makefile |  4 ----
 3 files changed, 22 deletions(-)

diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk
index 94245bd19e39..b3d4e0aca837 100644
--- a/Mk/Uses/meson.mk
+++ b/Mk/Uses/meson.mk
@@ -65,18 +65,4 @@ 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)
diff --git a/devel/cltune/Makefile b/devel/cltune/Makefile
index 8ace145c135d..1d216a7a3898 100644
--- a/devel/cltune/Makefile
+++ b/devel/cltune/Makefile
@@ -26,8 +26,4 @@ PLIST_FILES=	include/cltune.h \
 		lib/libcltune.so \
 		libdata/pkgconfig/cltune.pc
 
-post-install:
-	@${MV} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/cltune.pc ${STAGEDIR}/${PREFIX}/libdata/pkgconfig/cltune.pc
-	@${RM} -r ${STAGEDIR}/${PREFIX}/lib/pkgconfig
-
 .include <bsd.port.mk>
diff --git a/math/clblast/Makefile b/math/clblast/Makefile
index 6718d3f6e8b1..6b97274f8557 100644
--- a/math/clblast/Makefile
+++ b/math/clblast/Makefile
@@ -22,8 +22,4 @@ GH_PROJECT=	CLBlast
 USE_LDCONFIG=	yes
 USES=		cmake
 
-post-install:
-	@${MV} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/clblast.pc ${STAGEDIR}/${PREFIX}/libdata/pkgconfig/clblast.pc
-	@${RM} -r ${STAGEDIR}/${PREFIX}/lib/pkgconfig
-
 .include <bsd.port.mk>