Trivially use buildlink2 and use java.mk.

6 files changed, 27 insertions, 12 deletions

diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index 805f75bbcdb..c22fc36cb31 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/10 01:01:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/18 21:05:28 jlam Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -14,9 +14,11 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	Apache Project's Java-Based make(1) replacement
 
-USE_JAVA=	yes
 DEPENDS+=	crimson>=1.1.3:../../textproc/crimson
 
+USE_BUILDLINK2=	# defined
+USE_JAVA=	# defined
+
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 post-extract:
@@ -40,5 +42,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant
 
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
+
 CLASSPATH:=	${CLASSPATH}:${LOCALBASE}/lib/java/crimson.jar
diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile
index aa01ae1da10..b05987d5a32 100644
--- a/devel/javadeps/Makefile
+++ b/devel/javadeps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/31 19:33:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/18 21:10:02 jlam Exp $
 #
 
 DISTNAME=	javadeps-1.1
@@ -10,11 +10,18 @@ MAINTAINER=	ben@wongs.net
 HOMEPAGE=	http://www.vet.com.au/java/javadeps/
 COMMENT=	Automatic dependency tracking for Java
 
+USE_BUILDLINK2=	# defined
 USE_JAVA=	run
 
 WRKSRC=		${WRKDIR}/JavaDeps-1.1
 
-NO_BUILD=	yes
+do-build:
+	cd ${WRKSRC}; for file in jdeps; do				\
+		${SED}	-e "s|@PREFIX@|${PREFIX}|g"			\
+			-e "s|@JAVA_HOME@|${PKG_JAVA_HOME}|g"		\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
 
 do-install:
 	${CP} ${WRKSRC}/jdeps ${PREFIX}/bin
@@ -24,4 +31,5 @@ do-install:
 	cd ${WRKSRC}/doc; ${PAX} -rwpe . ${PREFIX}/share/doc/jdeps
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/jdeps ${PREFIX}/share/doc/jdeps
 
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/javadeps/distinfo b/devel/javadeps/distinfo
index bf3683a90e3..1bc59eb9bcd 100644
--- a/devel/javadeps/distinfo
+++ b/devel/javadeps/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/17 12:32:17 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/10/18 21:10:03 jlam Exp $
 
 SHA1 (javadeps-1.1.zip) = 7ded1f1a0ec5d8bc7c1c6cf78f252cffc22025fb
 Size (javadeps-1.1.zip) = 146544 bytes
-SHA1 (patch-aa) = 94b21c396d5a4ae30135fc0c13be3ef5e57cdd60
+SHA1 (patch-aa) = ed9df1b28acd53f188af85a16bdeda980fb629ba
diff --git a/devel/javadeps/patches/patch-aa b/devel/javadeps/patches/patch-aa
index 9ef5ca495e7..ba99434310d 100644
--- a/devel/javadeps/patches/patch-aa
+++ b/devel/javadeps/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/17 12:32:17 agc Exp $
+$NetBSD: patch-aa,v 1.2 2002/10/18 21:10:04 jlam Exp $
 
 --- jdeps.orig	Sun May 17 00:49:57 1998
 +++ jdeps
@@ -9,16 +9,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/17 12:32:17 agc Exp $
 -# Change the value after the equals sign to the full path of the jar file.
 -jarFile=jdeps.jar
 +# The full path of the jar file.
-+jarFile=/usr/pkg/share/jdeps/jdeps.jar
++jarFile=@PREFIX@/share/jdeps/jdeps.jar
  
 -# Change the value after the equals sign to the full pathname of your java
 -# binary, if it is not on your PATH.
 -java=java
-+# Check if java is in the user's PATH. If not, guess /usr/pkg/java/bin.
++# Check if java is in the user's PATH.
 +if type java 1>/dev/null 2>&1; then
 +    java=java
 +else
-+    java=/usr/pkg/java/bin/java
++    java=@JAVA_HOME@/bin/java
 +fi
  
  # For win95, all kinds of weird things happen with make & bash if
diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
index c54aa2366aa..882b5d936b0 100644
--- a/textproc/crimson/Makefile
+++ b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/29 22:23:27 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/18 20:58:31 jlam Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between jakarta-ant and crimson, each of which
@@ -15,6 +15,7 @@ COMMENT=	Apache.org implementation of JAXP, SAX, and DOM
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_JAVA=	run
+USE_BUILDLINK2=	
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
@@ -27,4 +28,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/crimson
 	cd ${WRKSRC}/examples && ${PAX} -rwpp * ${PREFIX}/share/examples/java/crimson
 
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/crimson/PLIST b/textproc/crimson/PLIST
index 9383dd63315..f7ea81d0015 100644
--- a/textproc/crimson/PLIST
+++ b/textproc/crimson/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/13 20:58:53 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/18 20:58:32 jlam Exp $
 lib/java/crimson.jar
 share/doc/java/crimson/api/org/w3c/dom/class-use/NodeList.html
 share/doc/java/crimson/api/org/w3c/dom/class-use/EntityReference.html
@@ -178,3 +178,4 @@ share/examples/java/crimson/index.html
 @dirrm share/doc/java/crimson/api/javax
 @dirrm share/doc/java/crimson/api
 @dirrm share/doc/java/crimson
+@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}