From 864f75846e90a173d90879291abfb5a66a7dee29 Mon Sep 17 00:00:00 2001 From: olgeni Date: Mon, 20 Mar 2006 19:32:56 +0000 Subject: Automatically detect netbeans_jdkhome. Submitted by: hq --- java/netbeans/Makefile | 3 +++ java/netbeans/files/patch-etc_netbeans.conf | 2 +- java/netbeans61/Makefile | 3 +++ java/netbeans61/files/patch-etc_netbeans.conf | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile index 41afc35d98ec..2fc4dcb3a44a 100644 --- a/java/netbeans/Makefile +++ b/java/netbeans/Makefile @@ -30,6 +30,9 @@ DOWNLOAD_URL?= http://www.netbeans.info/downloads/download.php?type=5.0&p=1&a=bs IGNORE= you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif +do-configure: + @${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf + do-install: @${MKDIR} ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans diff --git a/java/netbeans/files/patch-etc_netbeans.conf b/java/netbeans/files/patch-etc_netbeans.conf index 0c8d486cb9e2..402b5a82a203 100644 --- a/java/netbeans/files/patch-etc_netbeans.conf +++ b/java/netbeans/files/patch-etc_netbeans.conf @@ -8,7 +8,7 @@ $FreeBSD$ # default location of J2SE JDK, can be overridden by using --jdkhome switch -#netbeans_jdkhome="/path/to/jdk" -+netbeans_jdkhome="/usr/local/jdk1.4.2" ++netbeans_jdkhome="%%JAVA_HOME%%" # clusters' paths separated by path.separator (semicolon on Windows, colon on Unices) #netbeans_extraclusters="/absolute/path/to/cluster1:/absolute/path/to/cluster2" diff --git a/java/netbeans61/Makefile b/java/netbeans61/Makefile index 41afc35d98ec..2fc4dcb3a44a 100644 --- a/java/netbeans61/Makefile +++ b/java/netbeans61/Makefile @@ -30,6 +30,9 @@ DOWNLOAD_URL?= http://www.netbeans.info/downloads/download.php?type=5.0&p=1&a=bs IGNORE= you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif +do-configure: + @${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf + do-install: @${MKDIR} ${PREFIX}/netbeans @${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans diff --git a/java/netbeans61/files/patch-etc_netbeans.conf b/java/netbeans61/files/patch-etc_netbeans.conf index 0c8d486cb9e2..402b5a82a203 100644 --- a/java/netbeans61/files/patch-etc_netbeans.conf +++ b/java/netbeans61/files/patch-etc_netbeans.conf @@ -8,7 +8,7 @@ $FreeBSD$ # default location of J2SE JDK, can be overridden by using --jdkhome switch -#netbeans_jdkhome="/path/to/jdk" -+netbeans_jdkhome="/usr/local/jdk1.4.2" ++netbeans_jdkhome="%%JAVA_HOME%%" # clusters' paths separated by path.separator (semicolon on Windows, colon on Unices) #netbeans_extraclusters="/absolute/path/to/cluster1:/absolute/path/to/cluster2" -- cgit