svn commit: r398768 - in head: Mk/Uses ftp/curl

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Oct  7 16:19:43 2015
New Revision: 398768
URL: https://svnweb.freebsd.org/changeset/ports/398768

Log:
  Do not provide empty do-test target for perl5-using ports
  
  perl5's do-test: target should only be enabled when USE_PERL5=configure
  or USE_PERL5=modbuild* are used, otherwise it'll end up being empty
  and will prevent other tests from running.
  
  Remove NO_PERL5_TEST as it isn't really needed after this fix.
  
  Approved by:	mat, sunpoet
  Differential Revision:	D3830

Modified:
  head/Mk/Uses/perl5.mk
  head/ftp/curl/Makefile

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Wed Oct  7 15:00:46 2015	(r398767)
+++ head/Mk/Uses/perl5.mk	Wed Oct  7 16:19:43 2015	(r398768)
@@ -308,7 +308,7 @@ fix-perl-things:
 	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || :
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || :
 
-.if !target(do-test) && !defined(NO_PERL5_TEST)
+.if !target(do-test) && (${USE_PERL5:Mmodbuild*} || ${USE_PERL5:Mconfigure})
 TEST_TARGET?=	test
 TEST_WRKSRC?=	${BUILD_WRKSRC}
 do-test:

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Wed Oct  7 15:00:46 2015	(r398767)
+++ head/ftp/curl/Makefile	Wed Oct  7 16:19:43 2015	(r398768)
@@ -48,7 +48,6 @@ CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
 		ac_cv_func_SSLv2_client_method=no
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-NO_PERL5_TEST=	yes
 TEST_ENV=	${MAKE_ENV} LC_ALL=C
 TEST_TARGET=	test
 USE_PERL5=	build