convert to use test target from bsd.pkg.mk

addresses PR pkg/19416

6 files changed, 13 insertions, 26 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 3b2501567dc..0078ca22750 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2002/12/23 16:20:49 cjep Exp $
+# $NetBSD: Makefile,v 1.60 2003/02/17 15:28:00 dillo Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
 CONFIGURE_ARGS+=	-Dcc="${CC:T}"
 CONFIGURE_ARGS+=	-Uusemymalloc
 CONFIGURE_ARGS+=	-Uinstallusrbinperl
+TEST_TARGET=		test
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -165,8 +166,4 @@ post-install:
 		echo PERL5_ARCHLIB=$$installarchlib >>${WRKDIR}/bsd.perl.mk
 	${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk
 
-test:
-	-@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index acec815b063..3be24c95770 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/23 16:21:20 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/17 15:28:00 dillo Exp $
 
 .include "Makefile.common"
 
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
 CONFIGURE_ARGS+=	-Dcc="${CC:T}"
 CONFIGURE_ARGS+=	-Uusemymalloc
 CONFIGURE_ARGS+=	-Uinstallusrbinperl
+TEST_TARGET=		test
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -192,10 +193,6 @@ post-install:
 		echo PERL5_ARCHLIB=$$installarchlib >>${WRKDIR}/bsd.perl.mk
 	${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk
 
-test:
-	-@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
-
 .if ${MACHINE_ARCH} == "alpha"
 .  include "../../lang/gcc/buildlink2.mk"
 .endif
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index 710cb978d4c..9baba7587cc 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/06 14:56:59 taca Exp $
+# $NetBSD: Makefile,v 1.10 2003/02/17 15:28:01 dillo Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	--enable-shared
 MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby.1
+TEST_TARGET=	test
 
 DOCS=		ChangeLog README README.EXT README.EXT.ja README.ja ToDo \
 		doc/NEWS doc/forwardable.rd doc/forwardable.rd.ja \
@@ -98,7 +99,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
 .endfor
 
-test:
-	@(cd ${WRKSRC}; make test)
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 24bcb67c619..551ce2d3dd2 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/10 11:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/02/17 15:28:01 dillo Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -16,6 +16,7 @@ USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared --with-tcl=${PREFIX}/lib --enable-tk=NO
+TEST_TARGET=		test
 
 CONFIGURE_ENV+=		\
 	PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4"
@@ -47,8 +48,5 @@ post-install:
 pre-clean:
 	@cd ../../lang/tcl && ${MAKE} clean
 
-test:
-	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} test)
-
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index ad43e09db87..d9a082d5709 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/08/25 18:39:28 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/02/17 15:28:01 dillo Exp $
 #
 
 DISTNAME=		tcl8.3.4
@@ -18,6 +18,7 @@ CONFLICTS+=		tclman80-[0-9]*
 WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		TOUCH="${TOUCH}"
+TEST_TARGET=		test
 
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
@@ -83,7 +84,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/../generic/tclPort.h ${PREFIX}/include/tcl/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tclRegexp.h ${PREFIX}/include/tcl/generic
 
-test:
-	cd ${WRKSRC} && ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index 2bd74f2d508..98fc09e98e2 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/12/23 17:32:45 bjoern Exp $
+# $NetBSD: Makefile,v 1.10 2003/02/17 15:28:01 dillo Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -19,6 +19,8 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared --with-tcl=${PREFIX}/lib \
 			--with-tk=${PREFIX}/lib
+TEST_DIRS=		${WRKSRC}/../tk/unix
+TEST_TARGET=		test
 
 CONFIGURE_ENV+=		\
 	PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4" \
@@ -65,7 +67,4 @@ post-install:
 # we don't want to modify the man page, as it is also used by ../tk-tclX,
 # so...
 
-test:
-	@(cd ${WRKSRC}/../tk/unix; ${MAKE_ENV} ${MAKE} test)
-
 .include "../../mk/bsd.pkg.mk"