convert to use test target from bsd.pkg.mk

addresses PR pkg/19416

22 files changed, 46 insertions, 91 deletions

diff --git a/converters/p5-Jcode/Makefile b/converters/p5-Jcode/Makefile
index db0b59288fc..1f1068d6e93 100644
--- a/converters/p5-Jcode/Makefile
+++ b/converters/p5-Jcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/27 20:48:56 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/17 15:27:58 dillo Exp $
 #
 
 DISTNAME=	Jcode-0.82
@@ -15,12 +15,10 @@ DEPENDS+=	p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
 
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Jcode/.packlist
+TEST_TARGET=		test
 
 pre-configure:
 	@cd ${WRKSRC}; ${RM} -f mac_install.pl win_install.pl
 
-test:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index c753f0599d6..291746f2e31 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/01/29 22:05:33 kleink Exp $
+# $NetBSD: Makefile,v 1.53 2003/02/17 15:27:59 dillo Exp $
 
 DISTNAME=	openldap-2.0.27
 PKGREVISION=	2
@@ -17,6 +17,7 @@ USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
+TEST_TARGET=		test
 
 # unfortunately, --enable-phonetic cannot be disabled by runtime configuration
 GNU_CONFIGURE=		YES
@@ -95,10 +96,6 @@ post-install:
 		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
 	done
 
-test:
-	-@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
-
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index b226259ecb9..a13228be14a 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2002/09/29 07:34:30 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2003/02/17 15:27:59 dillo Exp $
 #
 
 DISTNAME=	ddd-3.3
@@ -14,6 +14,7 @@ USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
+TEST_TARGET=		check
 
 CONFIGURE_ARGS+=	--with-ncurses=no
 
@@ -45,9 +46,6 @@ post-install:
 	${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd-paper.ps
 	${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd.ps
 
-test:
-	(cd ${WRKSRC} ; ${MAKE_PROGRAM} check)
-
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/motif.buildlink2.mk"
 
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 6819dcbb589..7f9817e73f9 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/10 08:44:19 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/02/17 15:27:59 dillo Exp $
 #
 
 .include "../libtool/Makefile.common"
@@ -10,8 +10,7 @@ COMMENT=	Generic shared library support script (the script itself)
 
 CONFLICTS+=	libtool<=1.3.5nb11
 
-test: build
-	cd ${WRKSRC} && ${MAKE} check
+TEST_TARGET=	check
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/ruby-bsearch/Makefile b/devel/ruby-bsearch/Makefile
index 805263b9464..04f83b58313 100644
--- a/devel/ruby-bsearch/Makefile
+++ b/devel/ruby-bsearch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/05 15:58:32 taca Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/17 15:28:00 dillo Exp $
 
 DISTNAME=	ruby-bsearch-${VERSION}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}bsearch-${VERSION}
@@ -14,6 +14,8 @@ DIST_SUBDIR=	ruby
 USE_RUBY_RD=	# defined
 NO_PATCH=	# defined
 NO_CONFIGURE=	# defined
+TEST_DIRS=	${WRKSRC}/tests
+TEST_TARGET=	check
 
 RD_SRCS=	bsearch.en.rd bsearch.ja.rd
 DOCS=		${RD_SRCS} bsearch.en.html bsearch.ja.html bsearch.png
@@ -30,9 +32,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/bsearch
 .endfor
 
-test:
-	cd ${WRKSRC}/tests; make
-
 .include "../../textproc/ruby-rdtool/Makefile.common"
 .include "../../lang/ruby-base/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 5994badf1ab..45df1ce6cba 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/12/20 17:54:27 fredb Exp $
+# $NetBSD: Makefile,v 1.47 2003/02/17 15:28:00 dillo Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
@@ -19,6 +19,7 @@ COMMENT=	Library for manipulating PNG images
 
 USE_BUILDLINK2=	yes
 USE_LIBTOOL=	yes
+TEST_TARGET=	test
 
 LIBPNG_SO_MAJOR=	3
 LIBPNG_SO_MINOR=	1
@@ -35,8 +36,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/man/man5
 
-test: build
-	@cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} test
-
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
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"
diff --git a/mail/p5-razor-agents/Makefile b/mail/p5-razor-agents/Makefile
index 33622bdd878..df1c50c279e 100644
--- a/mail/p5-razor-agents/Makefile
+++ b/mail/p5-razor-agents/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/06 04:10:24 heinz Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/17 15:28:02 dillo Exp $
 
 DISTNAME=	razor-agents-2.14
 PKGNAME=	p5-${DISTNAME}
@@ -19,12 +19,10 @@ DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 # because Net::Ping, Getopt::Long, File::Copy are needed
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0
 USE_BUILDLINK2=		YES
+TEST_TARGET=		test
 
 PERL5_CONFIGURE=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/razor-agents/.packlist
 
-test: build
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} test
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index d7b00678de2..aa50e135eff 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/06 02:37:56 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/17 15:28:02 dillo Exp $
 #
 
 DISTNAME=		Net-DNS-0.29
@@ -18,12 +18,10 @@ DEPENDS+=		p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
 
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0
 USE_BUILDLINK2=		YES
+TEST_TARGET=		test
 
 PERL5_CONFIGURE=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/DNS/.packlist
 
-test: build
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} test
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 6a73fc130e8..02a3278e138 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/27 20:48:58 seb Exp $
+# $NetBSD: Makefile,v 1.14 2003/02/17 15:28:02 dillo Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
 #
 
@@ -13,6 +13,7 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl5 module for interfacing to the UCD SNMP library
 
 USE_BUILDLINK2=	YES
+TEST_TARGET=	test
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 
 # Until the source catches up to the current Perl API, we need PERL_POLLUTE
@@ -30,9 +31,6 @@ post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p5-SNMP
 	@for i in ${PLFILES} ; do ${INSTALL_SCRIPT} ${WRKDIR}/$$i ${PREFIX}/share/examples/p5-SNMP/$$i ; done
 
-test:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test
-
 .include "../../lang/perl5/module.mk"
 .include "../../net/ucd-snmp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 4a3779ced00..304578077e5 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/06 03:07:03 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/17 15:28:02 dillo Exp $
 #
 
 DISTNAME=	Digest-Nilsimsa-0.06
@@ -15,12 +15,10 @@ COMMENT=	perl5 extension module for Nilsimsa signatures
 # with 5.6.1 :-/
 BUILDLINK_DEPENDS.perl=	perl>=5.6.1
 USE_BUILDLINK2=		YES
+TEST_TARGET=		test
 
 PERL5_CONFIGURE=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Digest/Nilsimsa/.packlist
 
-test: build
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} test
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index ee34303953c..80da99d9b2e 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/28 22:59:59 seb Exp $
+# $NetBSD: Makefile,v 1.11 2003/02/17 15:28:02 dillo Exp $
 #
 
 DISTNAME=	icu-1.7
@@ -14,6 +14,7 @@ WRKSRC=		${WRKDIR}/icu/source
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_BUILDLINK2=	YES
+TEST_TARGET=	check
 
 .include "../../mk/endian.mk"
 
@@ -32,7 +33,4 @@ CONFIGURE_ARGS+= --disable-threads
 pre-configure:
 	${CHMOD} u+rx ${WRKSRC}/configure
 
-test: build
-	cd ${WRKSRC} && ${MAKE_PROGRAM} check
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index aff847d0746..d43103e8ae8 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/08 11:34:39 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/17 15:28:03 dillo Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
 DISTNAME=	namazu-2.0.12
@@ -38,6 +38,7 @@ USE_PERL5=		# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
+TEST_TARGET=		check
 
 CONFLICTS+=	namazu-[0-9]*
 
@@ -56,9 +57,6 @@ post-install:
 	@${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
 	@${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-test:
-	@cd ${WRKSRC}; make check
-
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wml/Makefile b/www/wml/Makefile
index b6b912f2bcb..5ca05a8bf44 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/24 13:36:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/02/17 15:28:03 dillo Exp $
 #
 
 DISTNAME=	wml-2.0.3
@@ -23,6 +23,7 @@ CONFIGURE_ARGS=	--with-perl=${PERL5} \
 		--with-tidy=${LOCALBASE}/bin/tidy
 
 USE_BUILDLINK2=	yes
+TEST_TARGET=	test
 
 USE_NCURSES=	# redrawwin()
 
@@ -40,9 +41,6 @@ post-install:
 	    ${MV} $${i}.7 $${i}.0 ; \
 	done
 
-test:
-	@cd ${WRKSRC} && ${MAKE} test
-
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 5e97d360425..f8c7c7acc1e 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/11/25 18:58:36 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2003/02/17 15:28:03 dillo Exp $
 #
 
 DISTNAME=	fltk-1.0.11-source
@@ -23,13 +23,10 @@ USE_X11BASE=		# defined
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 USE_BUILDLINK2=		# defined
+TEST_TARGET=		test
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-libtool=${PKGLIBTOOL}
 
-test:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
-
 .include "../../graphics/Mesa/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
index d0a2692db43..108538bed4d 100644
--- a/x11/tk-Tix/Makefile
+++ b/x11/tk-Tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:46 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/17 15:28:03 dillo Exp $
 #
 
 DISTNAME=	tix8.2.0b1
@@ -19,9 +19,7 @@ CONFIGURE_ARGS+=	--enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
 			--disable-stubs
 MAKE_ENV+=		TCL_DIR=${BUILDLINK_PREFIX.tcl}
 MAKE_ENV+=		TK_DIR=${BUILDLINK_PREFIX.tk}
-
-test:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test
+TEST_TARGET=		test
 
 .include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index c2e7acf3edf..989020f2979 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/08/25 18:40:48 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/02/17 15:28:04 dillo Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -18,6 +18,7 @@ MAKE_ENV+=		TOUCH="${TOUCH}"
 USE_X11=		yes
 USE_LIBTOOL=		yes
 USE_BUILDLINK2=		yes
+TEST_TARGET=		test
 
 # Initially install the man pages into ${WRKDIR}/man, as we need a staged
 # install to avoid overwriting existing manpages in ${PREFIX}/man.
@@ -83,8 +84,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
-test:
-	cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test
-
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"