svn commit: r355077 - in head/devel: atf kyua-atf-compat kyua-cli kyua-testers lutok shtk

[Julio Merino]

Author: jmmv (src committer)
Date: Sat May 24 20:11:05 2014
New Revision: 355077
URL: http://svnweb.freebsd.org/changeset/ports/355077
QAT: https://qat.redports.org/buildarchive/r355077/

Log:
  Change ports that use the ATF libraries to depend on devel/atf.
  
  As part of this, make it possible to install devel/atf independently of
  the presence of ATF in the base system.  This is so that we can turn the
  ATF libraries in base into private libraries.
  
  Note that this should have no effect on prebuilt binary packages because
  these changes only apply when the TEST option is selected, and this option
  is not yet the default.
  
  Approved by:	eadler (ports)

Modified:
  head/devel/atf/Makefile
  head/devel/kyua-atf-compat/Makefile
  head/devel/kyua-cli/Makefile
  head/devel/kyua-testers/Makefile
  head/devel/lutok/Makefile
  head/devel/shtk/Makefile

Modified: head/devel/atf/Makefile
==============================================================================
--- head/devel/atf/Makefile	Sat May 24 20:04:42 2014	(r355076)
+++ head/devel/atf/Makefile	Sat May 24 20:11:05 2014	(r355077)
@@ -16,10 +16,6 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		libtool
 
-.if exists(/usr/lib/libatf-c.a)
-IGNORE=	is already in the base system
-.endif
-
 OPTIONS_DEFINE=	DOCS TEST
 
 .include <bsd.port.options.mk>

Modified: head/devel/kyua-atf-compat/Makefile
==============================================================================
--- head/devel/kyua-atf-compat/Makefile	Sat May 24 20:04:42 2014	(r355076)
+++ head/devel/kyua-atf-compat/Makefile	Sat May 24 20:11:05 2014	(r355077)
@@ -3,6 +3,7 @@
 
 PORTNAME=	kyua-atf-compat
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
@@ -21,6 +22,8 @@ OPTIONS_DEFINE=	DOCS TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
+TEST_BUILD_DEPENDS=	${PREFIX}/bin/atf-sh:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/kyua-cli/Makefile
==============================================================================
--- head/devel/kyua-cli/Makefile	Sat May 24 20:04:42 2014	(r355076)
+++ head/devel/kyua-cli/Makefile	Sat May 24 20:11:05 2014	(r355077)
@@ -3,6 +3,7 @@
 
 PORTNAME=	kyua-cli
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
@@ -29,6 +30,9 @@ OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
+TEST_BUILD_DEPENDS=	${PREFIX}/bin/atf-sh:${PORTSDIR}/devel/atf
+TEST_LIB_DEPENDS=	libatf-c++.so:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/kyua-testers/Makefile
==============================================================================
--- head/devel/kyua-testers/Makefile	Sat May 24 20:04:42 2014	(r355076)
+++ head/devel/kyua-testers/Makefile	Sat May 24 20:11:05 2014	(r355077)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kyua-testers
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
@@ -19,6 +19,8 @@ OPTIONS_DEFINE=	DOCS TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
+TEST_LIB_DEPENDS=	libatf-c.so:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/lutok/Makefile
==============================================================================
--- head/devel/lutok/Makefile	Sat May 24 20:04:42 2014	(r355076)
+++ head/devel/lutok/Makefile	Sat May 24 20:11:05 2014	(r355077)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lutok
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -21,6 +21,9 @@ OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
+TEST_BUILD_DEPENDS=	${PREFIX}/bin/atf-sh:${PORTSDIR}/devel/atf
+TEST_LIB_DEPENDS=	libatf-c++.so:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/shtk/Makefile
==============================================================================
--- head/devel/shtk/Makefile	Sat May 24 20:04:42 2014	(r355076)
+++ head/devel/shtk/Makefile	Sat May 24 20:11:05 2014	(r355077)
@@ -2,6 +2,7 @@
 
 PORTNAME=	shtk
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/jmmv
@@ -12,12 +13,13 @@ COMMENT=	Application toolkit for POSIX-c
 LICENSE=	BSD
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--without-atf
 
 MAKE_ARGS=      pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 OPTIONS_DEFINE=		TEST
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
+TEST_BUILD_DEPENDS=	${PREFIX}/bin/atf-sh:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
 
 .include <bsd.port.mk>