Remove stale files and use JAVA_HOME.

6 files changed, 24 insertions, 3 deletions

diff --git a/java/netbeans4/Makefile b/java/netbeans4/Makefile
index 3e96230..a1f2e69 100644
--- a/java/netbeans4/Makefile
+++ b/java/netbeans4/Makefile
@@ -30,6 +30,13 @@ DOWNLOAD_URL?=	http://www.netbeans.info/downloads/download.php?p=1&a=bd&os=1&lan
 IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
+post-patch:
+	@${RM} ${WRKSRC}/etc/netbeans.conf.orig
+
+do-configure:
+	@${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf
+	@${RM} ${WRKSRC}/etc/netbeans.conf.bak
+
 do-install:
 	@${MKDIR} ${PREFIX}/netbeans4
 	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans4
diff --git a/java/netbeans4/files/patch-etc_netbeans.conf b/java/netbeans4/files/patch-etc_netbeans.conf
index 0c8d486..402b5a8 100644
--- a/java/netbeans4/files/patch-etc_netbeans.conf
+++ b/java/netbeans4/files/patch-etc_netbeans.conf
@@ -8,7 +8,7 @@ $FreeBSD$
  
  # default location of J2SE JDK, can be overridden by using --jdkhome <dir> 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/netbeans5/Makefile b/java/netbeans5/Makefile
index 3e96230..a1f2e69 100644
--- a/java/netbeans5/Makefile
+++ b/java/netbeans5/Makefile
@@ -30,6 +30,13 @@ DOWNLOAD_URL?=	http://www.netbeans.info/downloads/download.php?p=1&a=bd&os=1&lan
 IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
+post-patch:
+	@${RM} ${WRKSRC}/etc/netbeans.conf.orig
+
+do-configure:
+	@${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf
+	@${RM} ${WRKSRC}/etc/netbeans.conf.bak
+
 do-install:
 	@${MKDIR} ${PREFIX}/netbeans4
 	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans4
diff --git a/java/netbeans5/files/patch-etc_netbeans.conf b/java/netbeans5/files/patch-etc_netbeans.conf
index 0c8d486..402b5a8 100644
--- a/java/netbeans5/files/patch-etc_netbeans.conf
+++ b/java/netbeans5/files/patch-etc_netbeans.conf
@@ -8,7 +8,7 @@ $FreeBSD$
  
  # default location of J2SE JDK, can be overridden by using --jdkhome <dir> 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/netbeans55/Makefile b/java/netbeans55/Makefile
index 3e96230..a1f2e69 100644
--- a/java/netbeans55/Makefile
+++ b/java/netbeans55/Makefile
@@ -30,6 +30,13 @@ DOWNLOAD_URL?=	http://www.netbeans.info/downloads/download.php?p=1&a=bd&os=1&lan
 IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
+post-patch:
+	@${RM} ${WRKSRC}/etc/netbeans.conf.orig
+
+do-configure:
+	@${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf
+	@${RM} ${WRKSRC}/etc/netbeans.conf.bak
+
 do-install:
 	@${MKDIR} ${PREFIX}/netbeans4
 	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans4
diff --git a/java/netbeans55/files/patch-etc_netbeans.conf b/java/netbeans55/files/patch-etc_netbeans.conf
index 0c8d486..402b5a8 100644
--- a/java/netbeans55/files/patch-etc_netbeans.conf
+++ b/java/netbeans55/files/patch-etc_netbeans.conf
@@ -8,7 +8,7 @@ $FreeBSD$
  
  # default location of J2SE JDK, can be overridden by using --jdkhome <dir> 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"