svn commit: r423994 - in branches/2016Q4/devel/tbb: . files

[Ganael LAPLANCHE]

Author: martymac
Date: Fri Oct 14 21:18:03 2016
New Revision: 423994
URL: https://svnweb.freebsd.org/changeset/ports/423994

Log:
  MFH: r423934
  
  - Add pkgconfig file [1]
  - Do not use absolute paths for shlibs links
  
  PR:		213373 [1]
  Submitted by:	rozhuk.im at gmail.com [1]
  
  Approved by:	ports-secteam

Added:
  branches/2016Q4/devel/tbb/files/tbb.pc.in
     - copied unchanged from r423934, head/devel/tbb/files/tbb.pc.in
Modified:
  branches/2016Q4/devel/tbb/Makefile
  branches/2016Q4/devel/tbb/pkg-plist
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/devel/tbb/Makefile
==============================================================================
--- branches/2016Q4/devel/tbb/Makefile	Fri Oct 14 21:07:02 2016	(r423993)
+++ branches/2016Q4/devel/tbb/Makefile	Fri Oct 14 21:18:03 2016	(r423994)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tbb
 PORTVERSION=	4.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
 		LOCAL/martymac
@@ -13,6 +14,12 @@ COMMENT=	Library that provides thread bu
 
 LICENSE=	GPLv2
 
+SUB_FILES=	tbb.pc
+SUB_LIST=	prefix="${PREFIX}" \
+		name="${PORTNAME}" \
+		description="${COMMENT}" \
+		version="${PORTVERSION}"
+
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
@@ -45,15 +52,18 @@ do-install:
 	cd ${WRKSRC}; \
 	${INSTALL_LIB} build/FreeBSD*release/libtbb.so \
 		${STAGEDIR}${PREFIX}/lib/libtbb.so.4; \
-	${LN} -sf ${PREFIX}/lib/libtbb.so.4 \
+	${LN} -sf libtbb.so.4 \
 		${STAGEDIR}${PREFIX}/lib/libtbb.so; \
 	${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \
 		${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.4; \
-	${LN} -sf ${PREFIX}/lib/libtbbmalloc.so.4 \
+	${LN} -sf libtbbmalloc.so.4 \
 		${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/tbb/; \
 	cd include/tbb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/tbb/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/tbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+
 .include <bsd.port.post.mk>

Copied: branches/2016Q4/devel/tbb/files/tbb.pc.in (from r423934, head/devel/tbb/files/tbb.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/devel/tbb/files/tbb.pc.in	Fri Oct 14 21:18:03 2016	(r423994, copy of r423934, head/devel/tbb/files/tbb.pc.in)
@@ -0,0 +1,10 @@
+prefix=%%prefix%%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: %%name%%
+Description: %%description%%
+Version: %%version%%
+Libs: -L${libdir} -ltbb
+Cflags: -I${includedir}

Modified: branches/2016Q4/devel/tbb/pkg-plist
==============================================================================
--- branches/2016Q4/devel/tbb/pkg-plist	Fri Oct 14 21:07:02 2016	(r423993)
+++ branches/2016Q4/devel/tbb/pkg-plist	Fri Oct 14 21:18:03 2016	(r423994)
@@ -103,3 +103,4 @@ lib/libtbb.so
 lib/libtbb.so.4
 lib/libtbbmalloc.so
 lib/libtbbmalloc.so.4
+libdata/pkgconfig/tbb.pc