Trivially use buildlink2 and use java.mk.

6 files changed, 17 insertions, 9 deletions

diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index c26e1f1d552..f753508a393 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/07/29 22:23:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/18 21:37:52 jlam 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
@@ -16,6 +16,7 @@ COMMENT=	the Apache Project's XSLT implementation
 DEPENDS+=	xerces-j>=1.2.0:../../textproc/xerces-j
 
 USE_JAVA=	run
+USE_BUILDLINK2=
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
@@ -30,4 +31,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan
 	cd ${WRKSRC}/samples && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xalan
 
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xalan-j/PLIST b/textproc/xalan-j/PLIST
index d703b816f6f..27b0d4523a5 100644
--- a/textproc/xalan-j/PLIST
+++ b/textproc/xalan-j/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/18 21:37:52 jlam Exp $
 lib/java/bsf.jar
 lib/java/xalan.jar
 share/doc/java/xalan/apidocs/allclasses-frame.html
@@ -552,3 +552,4 @@ share/examples/java/xalan/xalansamples.jar
 @dirrm share/doc/java/xalan/apidocs/org
 @dirrm share/doc/java/xalan/apidocs
 @dirrm share/doc/java/xalan
+@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 887f7492613..6c1b627bf72 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/07/29 22:23:28 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/10/18 21:36:53 jlam 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
@@ -13,12 +13,12 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://xml.apache.org/xerces-j/
 COMMENT=	the Apache Project's validating XML parser with DOM and SAX support
 
+USE_JAVA=	run
+USE_BUILDLINK2=
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
 
-USE_JAVA=	run
-
 WRKSRC=		${WRKDIR}/xerces-1_2_0
 
 do-install:
@@ -30,4 +30,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces
 	cd ${WRKSRC}/data && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xerces
 
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xerces-j/PLIST b/textproc/xerces-j/PLIST
index d87e1edb258..33b04d89024 100644
--- a/textproc/xerces-j/PLIST
+++ b/textproc/xerces-j/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/18 21:36:53 jlam Exp $
 lib/java/xerces.jar
 share/doc/java/xerces/apiDocs/allclasses-frame.html
 share/doc/java/xerces/apiDocs/deprecated-list.html
@@ -570,3 +570,4 @@ share/examples/java/xerces/xercesSamples.jar
 @dirrm share/doc/java/xerces/apiDocs/index-files
 @dirrm share/doc/java/xerces/apiDocs
 @dirrm share/doc/java/xerces
+@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 3107b61872a..1bf491ecb27 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/29 22:23:28 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/18 21:40:07 jlam Exp $
 #
 
 DISTNAME=	xp
@@ -13,8 +13,9 @@ COMMENT=	James Clark's non-validating XML Parser for Java
 
 DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
-EXTRACT_ONLY=
+EXTRACT_ONLY=	# empty
 USE_JAVA=	run
+USE_BUILDLINK2=
 NO_PATCH=
 NO_CONFIGURE=
 NO_BUILD=
@@ -29,4 +30,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xp
 	cd ${WRKDIR}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/xp
 
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xp/PLIST b/textproc/xp/PLIST
index b87c58f55d4..1b84c09c1ed 100644
--- a/textproc/xp/PLIST
+++ b/textproc/xp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:22 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/18 21:40:07 jlam Exp $
 lib/java/xp.jar
 share/doc/java/xp/index.html
 share/doc/java/xp/copying.txt
@@ -110,3 +110,4 @@ share/doc/java/xp/api/Package-com.jclark.xml.tok.html
 @dirrm share/doc/java/xp/api/images
 @dirrm share/doc/java/xp/api
 @dirrm share/doc/java/xp
+@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}