From 1386ca7e03125c4dc16acd59089a360cd21b43ac Mon Sep 17 00:00:00 2001 From: abs Date: Mon, 28 Jun 2004 17:28:56 +0000 Subject: [PATCH] Update to bl3. All test built with jdk or sun-jdk14. jakarta-tomcat4 has other issues independant of this - will patch next --- graphics/PanoTools/Makefile | 4 ++-- lang/jasmin/Makefile | 4 ++-- lang/jini/Makefile | 4 ++-- mail/columba/Makefile | 4 ++-- net/airport2basestationconfig/Makefile | 4 ++-- net/airportmodemutility/Makefile | 4 ++-- security/gnu-crypto/Makefile | 4 ++-- textproc/fop/Makefile | 4 ++-- textproc/saxon/Makefile | 4 ++-- textproc/xalan-j/Makefile | 4 ++-- textproc/xerces-j/Makefile | 4 ++-- textproc/xp/Makefile | 4 ++-- textproc/xt/Makefile | 4 ++-- www/hiawatha/Makefile | 4 ++-- www/jakarta-tomcat4/Makefile | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile index e5be517a8b1b..356c71bce512 100644 --- a/graphics/PanoTools/Makefile +++ b/graphics/PanoTools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:18:15 agc Exp $ +# $NetBSD: Makefile,v 1.12 2004/06/28 17:28:56 abs Exp $ # DISTNAME= PanoTools @@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 WRKSRC= ${WRKDIR}/PTLinux USE_JAVA= run -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11= YES NO_BUILD= YES diff --git a/lang/jasmin/Makefile b/lang/jasmin/Makefile index 94006afe5d36..5ee2b5d0d5f8 100644 --- a/lang/jasmin/Makefile +++ b/lang/jasmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/20 12:19:16 agc Exp $ +# $NetBSD: Makefile,v 1.15 2004/06/28 17:28:56 abs Exp $ # DISTNAME= jasmin-1.06 @@ -12,7 +12,7 @@ COMMENT= Java "assembler" interface USE_JAVA= run WRKSRC= ${WRKDIR}/jasmin -USE_BUILDLINK2= # defined +USE_BUILDLINK3= # defined NO_BUILD= # defined post-patch: diff --git a/lang/jini/Makefile b/lang/jini/Makefile index 4c75fd6380b2..8c7d1f676e04 100644 --- a/lang/jini/Makefile +++ b/lang/jini/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/06/03 20:13:03 abs Exp $ +# $NetBSD: Makefile,v 1.17 2004/06/28 17:28:57 abs Exp $ # DISTNAME= jini-${SUN_VERSION}-src @@ -28,7 +28,7 @@ NO_BIN_ON_FTP= ${RESTRICTED} WRKSRC= ${WRKDIR}/jini${SUN_VERSION} VERSION= 1.2.1 SUN_VERSION= ${VERSION:C/\./_/g}_001 -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 jdk13 jdk14 diff --git a/mail/columba/Makefile b/mail/columba/Makefile index 178493b2f169..c3e6e889a884 100644 --- a/mail/columba/Makefile +++ b/mail/columba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/06/03 20:13:03 abs Exp $ +# $NetBSD: Makefile,v 1.8 2004/06/28 17:28:57 abs Exp $ # DISTNAME= columba-unix-1.0_M2-bin @@ -12,7 +12,7 @@ HOMEPAGE= http://columba.sourceforge.net/ COMMENT= Graphical Email Client written in JAVA (TM) NO_BUILD= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_JAVA2= yes PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 jdk13 jdk14 diff --git a/net/airport2basestationconfig/Makefile b/net/airport2basestationconfig/Makefile index 63d54c3d2048..beb2facb5f04 100644 --- a/net/airport2basestationconfig/Makefile +++ b/net/airport2basestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/06/03 20:13:03 abs Exp $ +# $NetBSD: Makefile,v 1.4 2004/06/28 17:28:57 abs Exp $ DISTNAME= configurator_201 PKGNAME= ${BINNAME}-2.0.1 @@ -22,7 +22,7 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} .include "../../mk/bsd.prefs.mk" -USE_BUILDLINK2= # defined +USE_BUILDLINK3= # defined USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 blackdown-jdk13 jdk13 jdk14 diff --git a/net/airportmodemutility/Makefile b/net/airportmodemutility/Makefile index 53a5f27c0727..1a1a4aef08de 100644 --- a/net/airportmodemutility/Makefile +++ b/net/airportmodemutility/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/06/03 20:13:03 abs Exp $ +# $NetBSD: Makefile,v 1.5 2004/06/28 17:28:57 abs Exp $ DISTNAME= ${BINNAME}_20 PKGNAME= ${BINNAME}-2.0 @@ -21,7 +21,7 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} .include "../../mk/bsd.prefs.mk" -USE_BUILDLINK2= # defined +USE_BUILDLINK3= # defined USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 blackdown-jdk13 jdk13 jdk14 diff --git a/security/gnu-crypto/Makefile b/security/gnu-crypto/Makefile index 7568c4ebf4f7..ff11c00349bd 100644 --- a/security/gnu-crypto/Makefile +++ b/security/gnu-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/05/05 16:40:30 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/06/28 17:28:57 abs Exp $ # DISTNAME= gnu-crypto-2.0.1-bin @@ -11,7 +11,7 @@ MAINTAINER= tv@duh.org HOMEPAGE= http://www.gnu.org/software/gnu-crypto/ COMMENT= GPL implementation of the Java Crypto Extensions -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_JAVA2= run do-build: # do nothing diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index 3f413ff2076b..b9f1b7d66a55 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/01/20 12:26:49 agc Exp $ +# $NetBSD: Makefile,v 1.22 2004/06/28 17:28:57 abs Exp $ # # Note: we currently use the pre-built (-bin) distribution of FOP, # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is @@ -22,7 +22,7 @@ COMMENT= The Apache Project's XSL Formatting Objects implementation WRKSRC= ${WRKDIR} USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK3= YES NO_CONFIGURE= NO_BUILD= diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile index 12b4faa15a5b..5037bea5331f 100644 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:50 agc Exp $ +# $NetBSD: Makefile,v 1.12 2004/06/28 17:28:57 abs Exp $ # DISTNAME= saxon @@ -14,7 +14,7 @@ COMMENT= Michael H. Kay's Java XSLT processor WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME} USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK3= YES NO_CONFIGURE= NO_BUILD= diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile index cf0e84ab21da..d9846edd3cc4 100644 --- a/textproc/xalan-j/Makefile +++ b/textproc/xalan-j/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/20 12:26:50 agc Exp $ +# $NetBSD: Makefile,v 1.19 2004/06/28 17:28:57 abs Exp $ # # Note: we currently use the pre-built (-bin) distribution of Xalan-J, # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is @@ -17,7 +17,7 @@ DEPENDS+= xerces-j>=1.2.0:../../textproc/xerces-j WRKSRC= ${WRKDIR} USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK3= YES NO_CONFIGURE= NO_BUILD= diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile index 28827fdb4012..2e46f38b3fb3 100644 --- a/textproc/xerces-j/Makefile +++ b/textproc/xerces-j/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/01/20 12:26:50 agc Exp $ +# $NetBSD: Makefile,v 1.22 2004/06/28 17:28:57 abs Exp $ # # Note: we currently use the pre-built (-bin) distribution of Xerces-J, # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is @@ -15,7 +15,7 @@ COMMENT= The Apache Project's validating XML parser with DOM and SAX support WRKSRC= ${WRKDIR}/xerces-1_2_0 USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK3= YES NO_CONFIGURE= NO_BUILD= diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile index c486c77fb29f..2b68bb66d3dd 100644 --- a/textproc/xp/Makefile +++ b/textproc/xp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/08/23 15:23:00 jschauma Exp $ +# $NetBSD: Makefile,v 1.16 2004/06/28 17:28:58 abs Exp $ # DISTNAME= xp @@ -13,7 +13,7 @@ COMMENT= James Clark's non-validating XML Parser for Java EXTRACT_ONLY= # empty USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK3= YES NO_CONFIGURE= NO_BUILD= diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile index fd66e7545fb4..216a3c575a26 100644 --- a/textproc/xt/Makefile +++ b/textproc/xt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 22:54:56 grant Exp $ +# $NetBSD: Makefile,v 1.15 2004/06/28 17:28:58 abs Exp $ # DISTNAME= xt @@ -15,7 +15,7 @@ DEPENDS+= XP-[0-9]*:../../textproc/xp EXTRACT_ONLY= # empty USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK3= YES NO_CONFIGURE= NO_BUILD= diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index ef8e489d483a..cb0b61ff8085 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:58 agc Exp $ +# $NetBSD: Makefile,v 1.14 2004/06/28 17:28:58 abs Exp $ # DISTNAME= hiawatha @@ -20,7 +20,7 @@ NO_CONFIGURE= NO_BUILD= WRKSRC= ${WRKDIR} -USE_BUILDLINK2= yes +USE_BUILDLINK3= YES USE_JAVA= run USE_PKGINSTALL= yes diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile index f9f4c99fc193..e4bb0c479935 100644 --- a/www/jakarta-tomcat4/Makefile +++ b/www/jakarta-tomcat4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/04/29 16:03:59 erh Exp $ +# $NetBSD: Makefile,v 1.3 2004/06/28 17:28:58 abs Exp $ PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -18,7 +18,7 @@ TOMCAT_VERSION= 4.1.30 USE_JAVA=run USE_JAVA2=yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= YES TOMCAT_LIB= ${PREFIX}/tomcat4