From owner-freebsd-java@FreeBSD.ORG Wed Oct 1 11:21:41 2003 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3CE516A4B3 for ; Wed, 1 Oct 2003 11:21:41 -0700 (PDT) Received: from mgr5.xmission.com (mgr5.xmission.com [198.60.22.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBDB543FAF for ; Wed, 1 Oct 2003 11:21:39 -0700 (PDT) (envelope-from glewis@eyesbeyond.com) Received: from mail by mgr5.xmission.com with spam-scanned (Exim 3.35 #1) id 1A4lbW-0001NF-05 for java@freebsd.org; Wed, 01 Oct 2003 12:21:39 -0600 Received: from [207.135.128.145] (helo=misty.eyesbeyond.com) by mgr5.xmission.com with esmtp (Exim 3.35 #1) id 1A4lbR-0001KE-05; Wed, 01 Oct 2003 12:21:34 -0600 Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) h91IM2jG011212; Wed, 1 Oct 2003 12:22:03 -0600 (MDT) (envelope-from glewis@eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.12.9p1/8.12.9/Submit) id h91ILx85011211; Wed, 1 Oct 2003 12:21:59 -0600 (MDT) X-Authentication-Warning: misty.eyesbeyond.com: glewis set sender to glewis@eyesbeyond.com using -f Date: Wed, 1 Oct 2003 12:21:59 -0600 From: Greg Lewis To: Ernst de Haan Message-ID: <20031001182159.GA11190@misty.eyesbeyond.com> References: <1062706874.886.27.camel@hunter.muc.eu.mscsoftware.com> <20031001011519.GB6490@misty.eyesbeyond.com> <200310010918.53967.ernst.dehaan@nl.wanadoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="C7zPtVaVf+AK4Oqc" Content-Disposition: inline In-Reply-To: <200310010918.53967.ernst.dehaan@nl.wanadoo.com> User-Agent: Mutt/1.4.1i X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on mgr5.xmission.com X-Spam-Status: No, hits=-0.0 required=8.0 tests=BAYES_40 autolearn=no version=2.60 X-Spam-Level: cc: java@freebsd.org cc: "Georg-W. Koltermann" Subject: Re: Native jdk1.4.1 working X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Oct 2003 18:21:41 -0000 --C7zPtVaVf+AK4Oqc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Oct 01, 2003 at 09:18:53AM +0200, Ernst de Haan wrote: > > Argh, thats what I was missing. I need to put them in jre! Ernst, I > > think I can come up with a patch for this. > > What can I say? This is great. I'm looking forward to your patch. Look forward no longer... Here 'tis :). I have a similar patch for the native port which I'll run by Alexey if you think this one is ok. It may also be worthwhile adding something similar to both linux-blackdown-jdk14 and linux-ibm-jdk14. I'll try and figure out if they need it (I'm sure Blackdown does, not so sure about IBM). -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org --C7zPtVaVf+AK4Oqc Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="prefs.diff" Index: Makefile =================================================================== RCS file: /var/fcvs/ports/java/linux-sun-jdk14/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- Makefile 30 Sep 2003 23:42:51 -0000 1.36 +++ Makefile 1 Oct 2003 18:16:39 -0000 @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${INSTALL_JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -71,6 +71,11 @@ ${RM} -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack; \ fi \ done + +post-install: ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}" + ${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g" \ + < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Index: pkg-plist =================================================================== RCS file: /var/fcvs/ports/java/linux-sun-jdk14/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- pkg-plist 4 Sep 2003 15:09:56 -0000 1.15 +++ pkg-plist 1 Oct 2003 17:15:45 -0000 @@ -883,6 +883,8 @@ %%T%%/include/jvmpi.h %%T%%/include/linux/jawt_md.h %%T%%/include/linux/jni_md.h +%%T%%/jre/.systemPrefs/.system.lock +%%T%%/jre/.systemPrefs/.systemRootModFile %%T%%/jre/CHANGES %%T%%/jre/COPYRIGHT %%T%%/jre/ControlPanel.html @@ -1589,6 +1591,7 @@ @dirrm %%T%%/jre/javaws/resources @dirrm %%T%%/jre/javaws @dirrm %%T%%/jre/bin +@dirrm %%T%%/jre/.systemPrefs @dirrm %%T%%/jre @dirrm %%T%%/include/linux @dirrm %%T%%/include Index: files/pkg-install.in =================================================================== RCS file: files/pkg-install.in diff -N files/pkg-install.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-install.in 1 Oct 2003 17:16:00 -0000 @@ -0,0 +1,19 @@ +#!/bin/sh + +# System preference location +PREFS_LOCATION=%%JRE_HOME%% + +# Set up system preferences during post install +if [ "$2" = "POST-INSTALL" ]; then + if [ ! -d "${PREFS_LOCATION}/.systemPrefs" ] ; then + mkdir -m 755 "${PREFS_LOCATION}/.systemPrefs" + fi + if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.system.lock" ] ; then + touch "${PREFS_LOCATION}/.systemPrefs/.system.lock" + chmod 644 "${PREFS_LOCATION}/.systemPrefs/.system.lock" + fi + if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then + touch "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + chmod 644 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" + fi +fi --C7zPtVaVf+AK4Oqc--