svn commit: r442907 - in head: Mk/Uses devel/cltune math/clblast

[Mathieu Arnold]

Author: mat
Date: Thu Jun  8 06:50:00 2017
New Revision: 442907
URL: https://svnweb.freebsd.org/changeset/ports/442907

Log:
  Fix a few lib/pkgconfig → libdata/pkgconfig that crept in between the
  exp-run and the commit.
  
  Reported by:	antoine
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/meson.mk
  head/devel/cltune/Makefile   (contents, props changed)
  head/math/clblast/Makefile   (contents, props changed)

Modified: head/Mk/Uses/meson.mk
==============================================================================
--- head/Mk/Uses/meson.mk	Thu Jun  8 03:22:39 2017	(r442906)
+++ head/Mk/Uses/meson.mk	Thu Jun  8 06:50:00 2017	(r442907)
@@ -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)

Modified: head/devel/cltune/Makefile
==============================================================================
--- head/devel/cltune/Makefile	Thu Jun  8 03:22:39 2017	(r442906)
+++ head/devel/cltune/Makefile	Thu Jun  8 06:50:00 2017	(r442907)
@@ -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>

Modified: head/math/clblast/Makefile
==============================================================================
--- head/math/clblast/Makefile	Thu Jun  8 03:22:39 2017	(r442906)
+++ head/math/clblast/Makefile	Thu Jun  8 06:50:00 2017	(r442907)
@@ -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>