Install files in proper location, now that we have sorted out the whole

JAVA situation.  Also adjust MASTER_SITES and HOMEPAGE and add a license
("single-user-license"), as the software has specific restrictions on the
usage.

This fixes the problem pointed out during Huberts most recent bulk-build.

3 files changed, 24 insertions, 15 deletions

diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index a061e0055c3..b2f10941f96 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,21 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2002/08/01 02:37:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/07 17:28:56 jschauma Exp $
 #
 
 DISTNAME=	unix_jb35foundation
 PKGNAME=	jbuilder-jit-1.2.15
+PKGREVISION=	1
 CATEGORIES=     lang
-MASTER_SITES=	http://www.vit.edu.tw/borland/JBuilder35Foundation/
+MASTER_SITES=	http://ftp.cdut.edu.cn/pub2/linux/develop/jbuilder/ \
+				http://python.planetmirror.com/ftp/jbuilder/foundation/3.5/linux/ \
+				http://planetmirror.com.au/ftp/jbuilder/foundation/3.5/linux/ \
+				http://www.au.horde.org/pub/jbuilder/foundation/3.5/linux/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.inprise.com/jbuilder/foundation/linux.html
+HOMEPAGE=	http://www.borland.com
 COMMENT=	Just-In-Time compiler for Linux Java Virtual Machine
 
 USE_JAVA=	run
 PKG_JVM=	sun-jdk13 # works with both 1.2.2 and 1.3 JVMs
+PLIST_SUBST+=	JAVADIR=${JAVA_HOME:C|${PREFIX}/||}
 
 WRKSRC=		${WRKDIR}/javacomp-1.2.15
-EXTRACT_ELEMENTS= LinuxJIT/javacomp-1.2.15.tar.gz
+EXTRACT_ELEMENTS=	LinuxJIT/javacomp-1.2.15.tar.gz
 
+LICENSE=	single-user-license
 RESTRICTED=	"Redistribution of binaries not permitted"
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_CDROM=${RESTRICTED}
@@ -39,9 +45,10 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libjavacomp.so ${WRKSRC}/libjavacomp_g.so \
-		${PREFIX}/jre/lib/i386/
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/jre/README.javacomp
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${PREFIX}/jre/LICENSE.javacomp
+		${JAVA_HOME}/lib/i386/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jbuilder-jit
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/jbuilder-jit/README.javacomp
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${PREFIX}/share/doc/jbuilder-jit/LICENSE.javacomp
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/jbuilder-jit/PLIST b/lang/jbuilder-jit/PLIST
index 3da846027f9..cfb431e4e48 100644
--- a/lang/jbuilder-jit/PLIST
+++ b/lang/jbuilder-jit/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:49 zuntum Exp $
-jre/lib/i386/libjavacomp.so
-jre/lib/i386/libjavacomp_g.so
-jre/README.javacomp
-jre/LICENSE.javacomp
+@comment $NetBSD: PLIST,v 1.2 2002/08/07 17:28:56 jschauma Exp $
+${JAVADIR}/lib/i386/libjavacomp.so
+${JAVADIR}/lib/i386/libjavacomp_g.so
+share/doc/jbuilder-jit/README.javacomp
+share/doc/jbuilder-jit/LICENSE.javacomp
+@dirrm share/doc/jbuilder-jit
+@unexec ${RMDIR} %D/sun-1.3.1/lib/i386 2>/dev/null || ${TRUE}
diff --git a/lang/jbuilder-jit/distinfo b/lang/jbuilder-jit/distinfo
index c91b265683d..70f81952db4 100644
--- a/lang/jbuilder-jit/distinfo
+++ b/lang/jbuilder-jit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/10/31 14:43:22 tv Exp $
+$NetBSD: distinfo,v 1.3 2002/08/07 17:28:56 jschauma Exp $
 
-SHA1 (unix_jb35foundation.tar.gz) = ebb343362f77973d53cc601ff62202ff5b2f827f
-Size (unix_jb35foundation.tar.gz) = 13893970 bytes
+SHA1 (unix_jb35foundation.tar.gz) = 011a3ff4018fcb51e0db6c3ded3eb27cd9fcea33
+Size (unix_jb35foundation.tar.gz) = 13961587 bytes