- Update to 6.5

svn path=/head/; revision=223947

java/netbeans/Makefile

@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	netbeans
-PORTVERSION=	6.1
-PORTREVISION=	2
+PORTVERSION=	6.5
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.netbeans.org/netbeans/6.1/final/zip/
-DISTNAME=	netbeans-${PORTVERSION}-200805300101-ml
+MASTER_SITES=	http://download.netbeans.org/netbeans/6.5/final/zip/
+DISTNAME=	netbeans-${PORTVERSION}-200811100001-ml
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
 
 USE_ZIP=	yes
@@ -22,27 +21,14 @@ NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/netbeans
 
-SUB_FILES=	pkg-install pkg-deinstall
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${RM} ${WRKSRC}/etc/netbeans.conf.orig
-	@${REINPLACE_CMD} -e "s@%%GREP%%@${GREP}@" \
-		-e "s@%%GCONFTOOL%%@${LOCALBASE}/bin/gconftool-2@" \
-		${WRKSRC}/platform8/lib/nbexec
-
-do-configure:
-	@${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/etc/netbeans.conf
-	@${RM} ${WRKSRC}/etc/netbeans.conf.bak
+do-patch:
+	@${REINPLACE_CMD} -i "" -e '19s|#||;19s|/path/to/jdk|${JAVA_HOME}|' \
+	    ${WRKSRC}/etc/netbeans.conf
 
 do-install:
-	@${MKDIR} ${PREFIX}/netbeans
-	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
-	@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
-	@(cd ${WRKDIR}; ${FIND} -s netbeans -not -type d) >> ${TMPPLIST}
-	@(cd ${WRKDIR}; ${FIND} -s -d netbeans -type d) | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
-	@(cd ${WRKDIR}; ${FIND} -s -d netbeans -type d -empty) | ${SED} -ne 's,^,@exec mkdir -p %D/,p' >> ${TMPPLIST}
+	@${MKDIR} ${PREFIX}/netbeans65
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${PREFIX}/netbeans65)
+	@${CHMOD} ${BINMODE} ${PREFIX}/netbeans65/bin/netbeans
+	@${LN} -sf ${PREFIX}/netbeans65/bin/netbeans ${PREFIX}/bin/netbeans65
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

java/netbeans/distinfo

@@ -1,3 +1,3 @@
-MD5 (netbeans-6.1-200805300101-ml.zip) = e6f03cf7584250231507a2bd557029e5
-SHA256 (netbeans-6.1-200805300101-ml.zip) = 961fcd385efb90d571b5ff1dff4454f2e2336cb066e9120065afab8e79e0be8f
-SIZE (netbeans-6.1-200805300101-ml.zip) = 196079547
+MD5 (netbeans-6.5-200811100001-ml.zip) = 9ae35f7e434f031bb52f41e50edd143d
+SHA256 (netbeans-6.5-200811100001-ml.zip) = 24d1236c59d3c359729452afba0f749093ce856dd04e695156a1831fbd021bda
+SIZE (netbeans-6.5-200811100001-ml.zip) = 220740750

java/netbeans/files/patch-bin_netbeans

@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- bin/netbeans.orig
-+++ bin/netbeans
-@@ -132,6 +132,10 @@
-         mem=`expr $mem / 1048576`
-         cms_options=""
-         ;;
-+    FreeBSD*)
-+        mem=`/sbin/sysctl hw.physmem | tr -d [:alpha:][:space:].:`
-+        mem=`expr $mem / 1048576`
-+        ;;
-         *) 
-         ;;
-     esac

java/netbeans/files/patch-etc_netbeans.conf

@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- etc/netbeans.conf.orig
-+++ etc/netbeans.conf
-@@ -13,7 +13,7 @@
- # (see http://wiki.netbeans.org/wiki/view/FaqGCPauses)
- 
- # Default location of JDK, can be overridden by using --jdkhome <dir>:
--#netbeans_jdkhome="/path/to/jdk"
-+netbeans_jdkhome="%%JAVA_HOME%%"
- 
- # Additional module clusters, using ${path.separator} (';' on Windows or ':' on Unix):
- #netbeans_extraclusters="/absolute/path/to/cluster1:/absolute/path/to/cluster2"

java/netbeans/files/patch-harness_run.xml

@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- harness/run.xml.orig
-+++ harness/run.xml
-@@ -151,7 +151,7 @@
-             <arg line="${run.args}"/>
-             <arg line="${run.args.extra}"/>
-         </exec>
--        <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
-+        <exec os="FreeBSD Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
-             <arg value="${run.sh}"/>
-             <arg value="--jdkhome"/>
-             <arg file="${run.jdkhome}"/>

java/netbeans/files/patch-platform8_lib_nbexec

@@ -1,56 +0,0 @@
-
-$FreeBSD$
-
---- platform8/lib/nbexec.orig
-+++ platform8/lib/nbexec
-@@ -270,7 +270,7 @@
- # detect system http proxy setting
- 
- detect_gnome_proxy () {
--    gconftool=/usr/bin/gconftool-2
-+    gconftool=%%GCONFTOOL%%
-     if [ -x  $gconftool ] ; then
-         proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
-         if [ "$proxy_mode" = "manual" ] ; then
-@@ -299,18 +299,18 @@
- detect_kde_proxy () {
-     kioslaverc="${HOME}/.kde/share/config/kioslaverc"
-     if [ -f $kioslaverc ] ; then
--        if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
--            http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
-+        if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
-+            http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
-             if [ $? ] ; then
-                 http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
-                 return 0
-             fi
--            http_non_proxy_hosts=`/bin/grep 'NoProxyFor=' "$kioslaverc"`
-+            http_non_proxy_hosts=`%%GREP%% 'NoProxyFor=' "$kioslaverc"`
-             if [ $? ] ; then
-                 http_non_proxy_hosts=`echo $http_non_proxy_hosts | /bin/sed 's/NoProxyFor=//'`
-             fi
-         else
--            if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
-+            if %%GREP%% -q 'ProxyType=0' "$kioslaverc" ; then
-                 http_proxy_tmp="DIRECT"
-                 return 0
-             fi
-@@ -331,14 +331,14 @@
- close
- EOF
- 
--    if /usr/bin/grep -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
-+    if %%GREP%% -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
-         rm ${scutil_out}
-         return 1
-     fi
- 
--    if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; then
--	http_proxy_host=`/usr/bin/grep HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
--	http_proxy_port=`/usr/bin/grep HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
-+    if %%GREP%% -q "HTTPEnable *: *1" ${scutil_out} ; then
-+	http_proxy_host=`%%GREP%% HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
-+	http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
-         http_proxy_tmp=$http_proxy_host:$http_proxy_port
-         rm ${scutil_out}
-         return 0

java/netbeans/files/pkg-deinstall.in

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case "$2" in
-    DEINSTALL)
-	rm -f %%PREFIX%%/bin/netbeans
-	;;
-esac
-
-exit 0

java/netbeans/files/pkg-install.in

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case "$2" in
-    POST-INSTALL)
-	ln -sf %%PREFIX%%/netbeans/bin/netbeans %%PREFIX%%/bin/netbeans
-	;;
-esac
-
-exit 0