From 5c3abe2afe7e839a72d63db5e5364479391b976d Mon Sep 17 00:00:00 2001
From: jwise <jwise@pkgsrc.org>
Date: Tue, 9 May 2000 20:53:18 +0000
Subject: Bring into line with the new java world order.

---
 www/jssi/Makefile | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'www/jssi/Makefile')

diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 49366a5c085..7fb5411f07c 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/01/20 05:03:34 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2000/05/09 20:53:18 jwise Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -16,25 +16,21 @@ DEPENDS+=	jsdk-2.0:../../www/jsdk20
 USE_JAVA=
 USE_GMAKE=
 NO_CONFIGURE=
-NO_MTREE=
-MAKE_ENV+=	CLASSPATH=${CLASSPATH}:${JSDK_HOME}/lib/jsdk.jar
 WRKSRC=		${WRKDIR}/ApacheJSSI-1.1.2/src/java
+MAKE_ENV+=	CLASSPATH=${CLASSPATH}
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-build:
-	(cd ${WRKSRC}/../../docs && \
-		CLASSPATH=${CLASSPATH}:${JSDK_HOME}/lib/jsdk.jar \
-		${SH} generate_javadoc)
-	${SED} -e 's,@JSDK_HOME@,${JSDK_HOME},g' \
-		< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
+	(cd ${WRKSRC}/../../docs && CLASSPATH=${CLASSPATH} ${SH} generate_javadoc)
+	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${JSDK_HOME}/lib
-	${MKDIR} ${JSDK_HOME}/doc/jssi
+	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
+	${MKDIR} ${PREFIX}/share/doc/java/jssi
 	(cd ${WRKSRC}/../../docs ; ${GTAR} pcf - .) | \
-		(cd ${JSDK_HOME}/doc/jssi ; ${GTAR} pxvf -)
+		(cd ${PREFIX}/share/doc/java/jssi ; ${GTAR} pxvf -)
 
 .include "../../mk/bsd.pkg.mk"
-JSDK_HOME=	${JAVA_HOME}/jsdk
-BUILD_DEFS+=	JSDK_HOME
-PREFIX:=	${JSDK_HOME}
+
+# This must be after bsd.pkg.mk is brought in
+CLASSPATH:=${CLASSPATH}:${PREFIX}/lib/java/jsdk.jar:.
-- 
cgit v1.2.3