From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 09:53:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 927E4B68; Wed, 30 Oct 2013 09:53:11 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E9C52241; Wed, 30 Oct 2013 09:53:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9U9rBS9011846; Wed, 30 Oct 2013 09:53:11 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9U9rAjH011841; Wed, 30 Oct 2013 09:53:10 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201310300953.r9U9rAjH011841@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 30 Oct 2013 09:53:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332088 - in head/java/netbeans: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 09:53:11 -0000 Author: gahr Date: Wed Oct 30 09:53:10 2013 New Revision: 332088 URL: http://svnweb.freebsd.org/changeset/ports/332088 Log: - Update to 7.4 Release notes: https://netbeans.org/community/releases/74/relnotes.html Submitted by: Federico Bernoldi Modified: head/java/netbeans/Makefile head/java/netbeans/distinfo head/java/netbeans/files/patch-bin_netbeans (contents, props changed) head/java/netbeans/files/patch-platform-lib_nbexec head/java/netbeans/pkg-plist Modified: head/java/netbeans/Makefile ============================================================================== --- head/java/netbeans/Makefile Wed Oct 30 09:21:21 2013 (r332087) +++ head/java/netbeans/Makefile Wed Oct 30 09:53:10 2013 (r332088) @@ -2,18 +2,18 @@ # $FreeBSD$ PORTNAME= netbeans -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= java devel MASTER_SITES= http://download.netbeans.org/netbeans/${PORTVERSION}/final/zip/ \ http://dlc.sun.com.edgesuite.net/netbeans/${PORTVERSION}/final/zip/ -DISTNAME= netbeans-${PORTVERSION}-201302132200 +DISTNAME= netbeans-${PORTVERSION}-201310111528 MAINTAINER= gahr@FreeBSD.org COMMENT= A full-featured integrated environment for Java USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.7+ NO_BUILD= yes WRKSRC= ${WRKDIR}/netbeans @@ -28,21 +28,19 @@ DESKTOP_ENTRIES="NetBeans" \ "Development;" \ ${FALSE} -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -i "" -e '57s|#||;57s|/path/to/jdk|${JAVA_HOME}|' \ ${WRKSRC}/etc/netbeans.conf - @${REINPLACE_CMD} -i "" -e 's|%%GCONFTOOL2%%|${LOCALBASE}/bin/gconftool-2|g; \ - s|%%GREP%%|${GREP}|g;s|%%SED%%|${SED}|g;s|%%AWK%%|${AWK}|g' \ + @${REINPLACE_CMD} -i "" -e 's|%%GREP%%|${GREP}|g' \ ${WRKSRC}/platform/lib/nbexec @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR}) - @${CHMOD} ${BINMODE} ${DATADIR}/bin/netbeans - @${LN} -sf ${DATADIR}/bin/netbeans ${PREFIX}/bin/${PORTNAME}-${PORTVERSION} + cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} + ${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/bin/netbeans + ${LN} -sf ${DATADIR}/bin/netbeans ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${PORTVERSION} post-install: - @${CHMOD} ${BINMODE} ${DATADIR}/java/maven/bin/mvn + @${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/java/maven/bin/mvn .include Modified: head/java/netbeans/distinfo ============================================================================== --- head/java/netbeans/distinfo Wed Oct 30 09:21:21 2013 (r332087) +++ head/java/netbeans/distinfo Wed Oct 30 09:53:10 2013 (r332088) @@ -1,2 +1,2 @@ -SHA256 (netbeans-7.3-201302132200.zip) = 0c1fbb318086ecb1cda8393f8f501e887a46af1c492776353e1e162bfd3f0559 -SIZE (netbeans-7.3-201302132200.zip) = 281722325 +SHA256 (netbeans-7.4-201310111528.zip) = bd9a7d1faab7c6a45c1b8d2e5ad11453c2ac767d2176836e65a5c7a62d7c365b +SIZE (netbeans-7.4-201310111528.zip) = 302752292 Modified: head/java/netbeans/files/patch-bin_netbeans ============================================================================== --- head/java/netbeans/files/patch-bin_netbeans Wed Oct 30 09:21:21 2013 (r332087) +++ head/java/netbeans/files/patch-bin_netbeans Wed Oct 30 09:53:10 2013 (r332088) @@ -1,6 +1,6 @@ ---- bin/netbeans.orig 2011-04-01 09:49:45.000000000 +0200 -+++ bin/netbeans 2011-04-01 09:51:07.000000000 +0200 -@@ -131,6 +131,10 @@ +--- bin/netbeans.orig 2013-10-11 15:56:12.000000000 +0200 ++++ bin/netbeans 2013-10-30 09:25:19.000000000 +0100 +@@ -163,6 +163,10 @@ mem=`/usr/sbin/sysctl hw.memsize | tr -d [:alpha:][:space:].:` mem=`expr $mem / 1048576` ;; Modified: head/java/netbeans/files/patch-platform-lib_nbexec ============================================================================== --- head/java/netbeans/files/patch-platform-lib_nbexec Wed Oct 30 09:21:21 2013 (r332087) +++ head/java/netbeans/files/patch-platform-lib_nbexec Wed Oct 30 09:53:10 2013 (r332088) @@ -1,603 +1,20 @@ ---- platform/lib/nbexec.orig 1970-01-01 01:00:00.000000000 +0100 -+++ platform/lib/nbexec 2013-02-26 10:40:18.000000000 +0100 -@@ -0,0 +1,600 @@ -+#!/bin/sh -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -+# -+# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved. -+# -+# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -+# Other names may be trademarks of their respective owners. -+# -+# The contents of this file are subject to the terms of either the GNU -+# General Public License Version 2 only ("GPL") or the Common -+# Development and Distribution License("CDDL") (collectively, the -+# "License"). You may not use this file except in compliance with the -+# License. You can obtain a copy of the License at -+# http://www.netbeans.org/cddl-gplv2.html -+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -+# specific language governing permissions and limitations under the -+# License. When distributing the software, include this License Header -+# Notice in each file and include the License file at -+# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the GPL Version 2 section of the License file that -+# accompanied this code. If applicable, add the following below the -+# License Header, with the fields enclosed by brackets [] replaced by -+# your own identifying information: -+# "Portions Copyrighted [year] [name of copyright owner]" -+# -+# Contributor(s): -+# -+# The Original Software is NetBeans. The Initial Developer of the Original -+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2011 Sun -+# Microsystems, Inc. All Rights Reserved. -+# -+# If you wish your version of this file to be governed by only the CDDL -+# or only the GPL Version 2, indicate your decision by adding -+# "[Contributor] elects to include this software in this distribution -+# under the [CDDL or GPL Version 2] license." If you do not indicate a -+# single choice of license, a recipient has the option to distribute -+# your version of this file under either the CDDL, the GPL Version 2 or -+# to extend the choice of license to its licensees as provided above. -+# However, if you add GPL Version 2 code and therefore, elected the GPL -+# Version 2 license, then the option applies only if the new code is -+# made subject to such option by the copyright holder. -+ -+ -+PRG=$0 -+ -+ -+resolve_symlink () { -+ file="$1" -+ while [ -h "$file" ]; do -+ ls=`ls -ld "$file"` -+ link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null` -+ if expr "$link" : '^/' 2> /dev/null >/dev/null; then -+ file="$link" -+ else -+ file=`dirname "$1"`"/$link" -+ fi -+ done -+ echo "$file" -+} -+ -+absolutize_path () { -+ oldpwd=`pwd` -+ cd "$1" -+ abspath=`pwd` -+ cd "${oldpwd}" -+ echo "$abspath" -+} -+ -+PRG=`resolve_symlink "$PRG"` -+progdir=`dirname "$PRG"` -+plathome=`absolutize_path "$progdir/.."` -+ -+jargs=${jreflags} -+jargs="$jargs -Dnetbeans.home=\"$plathome\"" -+ -+args="" -+ -+prefixcp="" -+postfixcp="" -+ -+updater_class=org.netbeans.updater.UpdaterFrame -+ -+# -+# parse arguments -+# -+ -+parse_args() { -+while [ $# -gt 0 ] ; do -+ case "$1" in -+ -h|-\?|-help|--help) cat >&2 < path to Java(TM) 2 SDK, Standard Edition -+ -J pass to JVM -+ -+ --cp:p prepend to classpath -+ --cp:a append to classpath -+EOF -+ # go on and print IDE options as well -+ args="$args --help" -+ ;; -+ --jdkhome) shift; if [ $# -gt 0 ] ; then jdkhome=$1; fi -+ ;; -+ # this has to be here for purposes of updater.jar, but it should be -+ # better to handle this argument inside the java launcher part -+ --userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi -+ ;; -+ -cp|-cp:a|--cp|--cp:a) -+ shift; -+ if [ $# -gt 0 ] ; then -+ if [ ! -z "$postfixcp" ] ; then postfixcp="$postfixcp:" ; fi -+ postfixcp=$postfixcp$1; -+ fi -+ ;; -+ -+ -cp:p|--cp:p) -+ shift; -+ if [ $# -gt 0 ] ; then -+ if [ ! -z "$prefixcp" ] ; then prefixcp="$prefixcp:" ; fi -+ prefixcp=$prefixcp$1; -+ fi -+ ;; -+ --clusters) -+ shift; -+ if [ $# -gt 0 ] ; then -+ clusters="$1" -+ fi -+ ;; -+ -psn*) -+ shift; -+ ;; -+ -J*) jopt=`expr "X-$1" : 'X--J\(.*\)'`; jargs="$jargs '$jopt'";; -+ *) args="$args \"$1\"" ;; -+ esac -+ shift -+done -+} # parse_args() -+ -+# Process arguments given on the command line. -+parse_args "$@" -+ -+# -+# check JDK -+# -+ -+if [ -z "$jdkhome" ] ; then -+ # try to find JDK -+ -+ case "`uname`" in -+ Darwin*) -+ # read Java Preferences -+ if [ -x "/usr/libexec/java_home" ]; then -+ jdkhome=`/usr/libexec/java_home --version 1.7.0_10+ --failfast` -+ if [ -z $jdkhome ]; then -+ jdkhome=`/usr/libexec/java_home --version 1.6 --failfast` -+ fi -+ -+ # JDK1.7 Update 10 as a fallback -+ elif [ -f "/Library/Java/JavaVirtualMachines/jdk1.7.0_10.jdk/Contents/Home/bin/java" ] ; then -+ jdkhome="/Library/Java/JavaVirtualMachines/jdk1.7.0_10.jdk/Contents/Home" -+ -+ # JDK1.6 -+ elif [ -f "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/java" ] ; then -+ jdkhome="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home" -+ elif [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java" ] ; then -+ jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home" -+ elif [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/bin/java" ] ; then -+ jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home" -+ fi -+ echo Found jdkhome=$jdkhome -+ ;; -+ *) javac=`which javac` -+ if [ -z "$javac" ] ; then -+ java=`which java` -+ if [ ! -z "$java" ] ; then -+ java=`resolve_symlink "$java"` -+ jdkhome=`dirname $java`"/.." -+ fi -+ else -+ javac=`resolve_symlink "$javac"` -+ jdkhome=`dirname $javac`"/.." -+ fi -+ ;; -+ esac -+fi -+ -+if [ ! -x "${jdkhome}/bin/java" ] ; then -+ echo "Cannot find java. Please use the --jdkhome switch." >&2 -+ exit 2 -+fi -+ -+# Make sure native code libraries of jdk7 are found -+LD_LIBRARY_PATH=${jdkhome}/jre/lib/amd64:${jdkhome}/jre/lib/i386:${LD_LIBRARY_PATH} -+export LD_LIBRARY_PATH -+ -+# if the Java option for heap dump on OOME is supported enable it -+if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError -cp "${progdir}/boot.jar" org.netbeans.NbExecJavaStartTry > /dev/null 2>&1 ; then -+ jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError" -+ if echo $jargs | /usr/bin/grep -v -- "-XX:HeapDumpPath=" > /dev/null ; then -+ jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\"" -+ fi -+ # rename old heap dump to .old -+ mv "${userdir}/var/log/heapdump.hprof" "${userdir}/var/log/heapdump.hprof.old" > /dev/null 2>&1 -+fi -+ -+jargs_without_clusters="$jargs" -+jargs="-Dnetbeans.dirs=\"${clusters}\" $jargs_without_clusters" -+ -+jdkhome=`absolutize_path "$jdkhome"` -+ -+args="--userdir \"${userdir}\" $args" -+ -+append_jars_to_cp() { -+ dir="$1" -+ subpath="$2" -+ for ex in jar zip ; do -+ if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then -+ for x in "${dir}"/*.$ex ; do -+ subx=`basename "$x"` -+ if echo "$paths" | /usr/bin/grep -v "$subpath$subx" > /dev/null ; then -+ if [ ! -z "$cp" ] ; then cp="$cp:" ; fi -+ cp="$cp$x" -+ if [ ! -z "$paths" ] ; then paths="$paths:" ; fi -+ paths="$paths$subpath$subx" -+ fi -+ done -+ fi -+ done -+} -+ -+construct_cp() { -+ cp="" -+ updatercp="" -+ paths="" -+ -+ build_cp "${userdir}" -+ build_cp "${plathome}" -+ -+ if [ -f "${userdir}/modules/ext/updater.jar" ] ; then -+ updatercp="${userdir}/modules/ext/updater.jar" -+ else -+ if [ -f "${plathome}/modules/ext/updater.jar" ] ; then -+ updatercp="${plathome}/modules/ext/updater.jar" -+ fi -+ fi -+ -+ # JDK tools -+ for x in "${jdkhome}/lib/dt.jar" "${jdkhome}/lib/tools.jar"; do -+ if [ -f "$x" ]; then -+ if [ ! -z "$cp" ] ; then cp="$cp:" ; fi -+ cp="${cp}$x" -+ fi -+ done -+ -+ # user-specified prefix and postfix CLASSPATH -+ -+ if [ ! -z "${prefixcp}" ] ; then -+ cp="${prefixcp}:$cp" -+ fi -+ -+ if [ ! -z "${postfixcp}" ] ; then -+ cp="$cp:${postfixcp}" -+ fi -+ -+ -+ # prepend IDE's classpath to updater's classpath -+ # (just xml-apis.jar and one XML parser would suffice) -+ if [ ! -z "$updatercp" ] ; then -+ updatercp=${cp}:${updatercp} -+ else -+ updatercp=${cp} -+ fi -+} -+ -+build_cp() { -+ base="$1" -+ append_jars_to_cp "${base}/lib/patches" "patches" -+ append_jars_to_cp "${base}/lib" "lib" -+ append_jars_to_cp "${base}/lib/locale" "locale" -+} -+ -+do_run_updater() { -+ eval "\"$jdkhome/bin/java\"" -classpath "\"${updatercp}\"" "$jargs" "-Dnetbeans.user=\"$userdir\"" $updater_class "$args" -+ construct_cp -+} -+ -+look_for_pre_runs() { -+ base="$1" -+ install_new_updater "$1" -+ dir="${base}/update/download" -+ if [ "`echo "${dir}"/*.nbm`" != "${dir}/*.nbm" -o "`echo "${dir}"/*.jar`" != "${dir}/*.jar" ] ; then -+ run_updater=yes -+ else -+ dir="${base}/update/deactivate" -+ if [ -f "${dir}/to_disable.txt" -o -f "${dir}/to_uninstall.txt" ] ; then -+ run_updater=yes -+ fi -+ fi -+} -+ -+look_for_post_runs() { -+ base="$1" -+ install_new_updater "$1" -+ dir="${base}/update/download" -+ if [ \! -f "${dir}/install_later.xml" ] && [ "`echo "${dir}"/*.nbm`" != "${dir}/*.nbm" -o "`echo "${dir}"/*.jar`" != "${dir}/*.jar" ] ; then -+ run_updater=yes -+ else -+ dir="${base}/update/deactivate" -+ if [ \! -f "${dir}/deactivate_later.txt" ] ; then -+ if [ -f "${dir}/to_disable.txt" -o -f "${dir}/to_uninstall.txt" ] ; then -+ run_updater=yes -+ fi -+ fi -+ fi -+} -+ -+look_for_new_clusters() { -+ base="$userdir" -+ dir="${base}/update/download" -+ newclusters="${dir}/netbeans.dirs" -+ if [ -f "${newclusters}" ] ; then -+ clusters=`cat "${newclusters}"` -+ jargs="-Dnetbeans.dirs=\"${clusters}\" $jargs_without_clusters" -+ rm -f "${newclusters}" -+ fi -+} -+ -+delete_new_clusters_file() { -+ base="$userdir" -+ dir="${base}/update/download" -+ newclusters="${dir}/netbeans.dirs" -+ if [ \! -f "${newclusters}" ] ; then -+ rm -f "${newclusters}" -+ fi -+} -+ -+install_new_updater() { -+ base="$1" -+ newUpdaterDir="${base}/update/new_updater" -+ if [ -d "${newUpdaterDir}" ]; then -+ mkdir -p "${base}/modules/ext/" -+ if [ -f "${newUpdaterDir}/updater.jar" ]; then -+ mv -f "${newUpdaterDir}/updater.jar" "${base}/modules/ext/" -+ fi -+ ls -l "${newUpdaterDir}/"updater_*.jar -+ for i in "${newUpdaterDir}/"updater_*.jar; do -+ mkdir -p "${base}/modules/ext/locale/" -+ mv -f "$i" "${base}/modules/ext/locale/" -+ done -+ rmdir "${newUpdaterDir}" -+ fi -+} -+ -+# detect system http proxy setting -+ -+detect_system_proxy () { -+ if [ ! -z "$http_proxy" ]; then -+ http_proxy_tmp=$http_proxy -+ fi -+ return 0 -+} -+ -+detect_gnome_proxy () { -+ gconftool=%%GCONFTOOL2%% -+ if [ -x $gconftool ] ; then -+ proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null` -+ if [ "$proxy_mode" = "manual" ] ; then -+ http_proxy_host=`$gconftool --get /system/http_proxy/host 2>/dev/null` -+ http_proxy_port=`$gconftool --get /system/http_proxy/port 2>/dev/null` -+ http_proxy_tmp=$http_proxy_host:$http_proxy_port -+ http_non_proxy_hosts=`$gconftool --get /system/http_proxy/ignore_hosts 2>/dev/null` -+ if [ $? ] ; then -+ http_non_proxy_hosts=`echo $http_non_proxy_hosts | /usr/bin/sed 's/\]//'` -+ fi -+ socks_proxy_host=`$gconftool --get /system/proxy/socks_host 2>/dev/null` -+ socks_proxy_port=`$gconftool --get /system/proxy/socks_port 2>/dev/null` -+ socks_proxy_tmp=$socks_proxy_host:$socks_proxy_port -+ -+ return 0 -+ else -+ if [ "$proxy_mode" = "none" ] ; then -+ detect_system_proxy -+ if [ -z "$http_proxy_tmp" ]; then -+ http_proxy_tmp="DIRECT" -+ fi -+ return 0 -+ else -+ if [ "$proxy_mode" = "auto" ] ; then -+ detect_system_proxy -+ pac_file=`$gconftool --get /system/proxy/autoconfig_url 2>/dev/null` -+ if [ ! -z "$pac_file" ]; then -+ http_proxy_tmp="PAC "$pac_file -+ fi -+ return 0 -+ fi -+ fi -+ fi -+ fi -+ return 1 -+} -+ -+detect_kde_proxy () { -+ kioslaverc="${HOME}/.kde/share/config/kioslaverc" -+ if [ -f $kioslaverc ] ; then -+ if /usr/bin/grep 'ProxyType=1' "$kioslaverc" >/dev/null 2>&1; then -+ http_proxy_tmp=`/usr/bin/grep 'httpProxy=http://' "$kioslaverc"` -+ if [ $? ] ; then -+ http_proxy_tmp=`echo $http_proxy_tmp | /usr/bin/sed 's/httpProxy=http:\/\///'` -+ return 0 -+ fi -+ http_non_proxy_hosts=`/usr/bin/grep 'NoProxyFor=' "$kioslaverc"` -+ if [ $? ] ; then -+ http_non_proxy_hosts=`echo $http_non_proxy_hosts | /usr/bin/sed 's/NoProxyFor=//'` -+ fi -+ else -+ if /usr/bin/grep 'ProxyType=0' "$kioslaverc" >/dev/null 2>&1; then -+ detect_system_proxy -+ if [ -z "$http_proxy_tmp" ]; then -+ http_proxy_tmp="DIRECT" -+ fi -+ return 0 -+ else -+ if /usr/bin/grep 'ProxyType=2' "$kioslaverc" >/dev/null 2>&1; then -+ pac_file=`/usr/bin/grep "Proxy Config Script=" $kioslaverc | cut -f 2 -d =` -+ http_proxy_tmp="PAC "$pac_file -+ return 0 -+ fi -+ fi -+ fi -+ fi -+ return 1 -+} -+ -+detect_macosx_proxy () { -+ if [ ! -x /usr/sbin/scutil ] ; then -+ return 1 -+ fi -+ -+ scutil_out=/tmp/nb-proxy-detection.$$ -+ cat < ${scutil_out} -+open -+show State:/Network/Global/Proxies -+close -+EOF -+ -+ if /usr/bin/grep "ProxyAuto.*: *1" ${scutil_out} >/dev/null 2>&1; then -+ if /usr/bin/grep "ProxyAutoConfigEnable.*: *1" ${scutil_out} >/dev/null 2>&1; then -+ http_proxy_tmp="PAC `/usr/bin/grep ProxyAutoConfigURLString ${scutil_out} | /usr/bin/awk 'END{print $3}'`" -+ rm ${scutil_out} -+ return 0 -+ fi -+ -+ rm ${scutil_out} -+ return 1 -+ fi -+ -+ if /usr/bin/grep "HTTPEnable *: *1" ${scutil_out} >/dev/null 2>&1; then -+ http_proxy_host=`/usr/bin/grep HTTPProxy ${scutil_out} | /usr/bin/awk 'END{print $3}'` -+ http_proxy_port=`/usr/bin/grep HTTPPort ${scutil_out} | /usr/bin/awk 'END{print $3} '` -+ http_proxy_tmp=$http_proxy_host:$http_proxy_port -+ rm ${scutil_out} -+ return 0 -+ fi -+ -+ http_proxy_tmp="DIRECT" -+ rm ${scutil_out} -+ return 0 -+} -+ -+unset http_proxy_tmp -+ -+if [ `uname` = Darwin ] ; then -+ detect_macosx_proxy -+else -+ if [ "$KDE_FULL_SESSION" = "true" ] ; then -+ detect_kde_proxy -+ else -+ if [ ! -z "$GNOME_DESKTOP_SESSION_ID" ] ; then -+ detect_gnome_proxy -+ fi -+ fi -+fi -+ -+# fall back to the environment-defined http_proxy if nothing found so far -+if [ -z "$http_proxy_tmp" ]; then -+ http_proxy_tmp=$http_proxy -+fi -+ -+if [ ! -z "$http_proxy_tmp" ] ; then -+ jargs="-Dnetbeans.system_http_proxy=\"$http_proxy_tmp\" -Dnetbeans.system_http_non_proxy_hosts=\"$http_non_proxy_hosts\" $jargs" -+fi -+ -+if [ ! -z "$socks_proxy_tmp" ] ; then -+ jargs="-Dnetbeans.system_socks_proxy=\"$socks_proxy_tmp\" $jargs" -+fi -+ -+if [ ! -z "${DEFAULT_USERDIR_ROOT}" ] ; then -+ jargs="-Dnetbeans.default_userdir_root=\"${DEFAULT_USERDIR_ROOT}\" $jargs" -+ unset DEFAULT_USERDIR_ROOT -+fi -+ -+# http://java.sun.com/j2se/1.5.0/docs/guide/2d/flags.html#pixmaps -+J2D_PIXMAPS=shared -+export J2D_PIXMAPS -+ -+# Check DISPLAY variable on non-Mac -+if [ "no$DISPLAY" = "no" -a `uname` != Darwin ]; then -+ echo "$0: WARNING: environment variable DISPLAY is not set" -+fi -+ -+ -+# The Startup Notification Protocol Specification [1] -+# recommends to unset the DESKTOP_STARTUP_ID environment variable -+# to avoid possible reuse by some process started later by this -+# process, e.g. when a browser will be launched by the NetBeans [2]. -+# -+# See: -+# [1] http://standards.freedesktop.org/startup-notification-spec -+# [2] http://netbeans.org/bugzilla/show_bug.cgi?id=76970 -+if [ ! -z "$DESKTOP_STARTUP_ID" ] ; then -+ # Save a value for later using -+ NB_DESKTOP_STARTUP_ID="$DESKTOP_STARTUP_ID"; export NB_DESKTOP_STARTUP_ID -+ -+ unset DESKTOP_STARTUP_ID -+fi -+ -+ -+# -+# main loop -+# -+ -+# clear to prevent loop from ending -+restart="yes" -+first_time_starting="yes" -+restart_file="${userdir}/var/restart" -+ -+while [ "$restart" ] ; do -+ -+ # -+ # build CLASSPATH -+ # -+ construct_cp -+ -+ # First check for pre-run updates. -+ if [ "$first_time_starting" ] ; then -+ run_updater="" -+ look_for_pre_runs "$plathome" -+ save="$IFS" -+ IFS=':' ; for oneCls in $clusters ; do -+ IFS="$save" -+ look_for_pre_runs "$oneCls" -+ done -+ IFS="$save" -+ look_for_pre_runs "$userdir" -+ if [ "$run_updater" ] ; then do_run_updater ; fi -+ # Do not check this after a restart, it makes no sense. -+ first_time_starting="" -+ fi -+ -+ # -+ # let's go -+ # -+ delete_new_clusters_file -+ rm -f "${restart_file}" -+ eval ${_NB_PROFILE_CMD} "\"${jdkhome}/bin/java\"" -Djdk.home="\"${jdkhome}\"" -classpath "\"$cp\"" \ -+ "$jargs" org.netbeans.Main "$args" '<&0' '&' -+ PID=$! -+ trap "kill $PID" EXIT -+ wait $PID -+ exitcode=$? -+ trap '' EXIT -+ look_for_new_clusters -+ # If we should update anything, do it and restart IDE. -+ run_updater="" -+ look_for_post_runs "$plathome" -+ -+ save="$IFS" -+ IFS=':' ; for oneCls in $clusters ; do -+ IFS="$save" -+ look_for_post_runs "$oneCls" -+ done -+ IFS="$save" -+ look_for_post_runs "$userdir" -+ if [ "$run_updater" ] ; then -+ do_run_updater -+ restart="yes" -+ else -+ if [ ! -f "${restart_file}" ] ; then -+ # will fall thru loop and exit -+ restart="" -+ fi -+ fi -+ -+done -+ -+# and we exit. -+exit $exitcode +--- platform/lib/nbexec.orig 2013-10-30 09:45:15.000000000 +0100 ++++ platform/lib/nbexec 2013-10-30 09:45:20.000000000 +0100 +@@ -213,7 +213,7 @@ + # if the Java option for heap dump on OOME is supported enable it + if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError -cp "${progdir}/boot.jar" org.netbeans.NbExecJavaStartTry > /dev/null 2>&1 ; then + jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError" +- if [ -z "`echo $jargs | grep -- "-XX:HeapDumpPath="`" ] ; then ++ if [ -z "`echo $jargs | %%GREP%% -- "-XX:HeapDumpPath="`" ] ; then + jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\"" + fi + # rename old heap dump to .old +@@ -244,7 +244,7 @@ + if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then + for x in "${dir}"/*.$ex ; do + subx=`basename "$x"` +- if [ -z "`echo "$paths" | egrep "$subpath$subx"`" ] ; then ++ if [ -z "`echo "$paths" | %%GREP%% "$subpath$subx"`" ] ; then + if [ ! -z "$cp" ] ; then cp="$cp:" ; fi + cp="$cp$x" + if [ ! -z "$paths" ] ; then paths="$paths:" ; fi Modified: head/java/netbeans/pkg-plist ============================================================================== --- head/java/netbeans/pkg-plist Wed Oct 30 09:21:21 2013 (r332087) +++ head/java/netbeans/pkg-plist Wed Oct 30 09:53:10 2013 (r332088) @@ -460,7 +460,6 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/dlight/config/Modules/org-netbeans-modules-dlight-libs-common.xml %%DATADIR%%/dlight/config/Modules/org-netbeans-modules-dlight-remote-impl.xml %%DATADIR%%/dlight/config/Modules/org-netbeans-modules-dlight-remote.xml -%%DATADIR%%/dlight/config/Modules/org-netbeans-modules-dlight-util.xml %%DATADIR%%/dlight/config/Modules/org-netbeans-modules-remotefs-versioning.xml %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-kit_ja.jar %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-kit_pt_BR.jar @@ -478,10 +477,6 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-remote_pt_BR.jar %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-remote_ru.jar %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-remote_zh_CN.jar -%%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-util_ja.jar -%%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-util_pt_BR.jar -%%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-util_ru.jar -%%DATADIR%%/dlight/modules/locale/org-netbeans-modules-dlight-util_zh_CN.jar %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-remotefs-versioning_ja.jar %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-remotefs-versioning_pt_BR.jar %%DATADIR%%/dlight/modules/locale/org-netbeans-modules-remotefs-versioning_ru.jar @@ -490,13 +485,11 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/dlight/modules/org-netbeans-modules-dlight-libs-common.jar %%DATADIR%%/dlight/modules/org-netbeans-modules-dlight-remote-impl.jar %%DATADIR%%/dlight/modules/org-netbeans-modules-dlight-remote.jar -%%DATADIR%%/dlight/modules/org-netbeans-modules-dlight-util.jar %%DATADIR%%/dlight/modules/org-netbeans-modules-remotefs-versioning.jar %%DATADIR%%/dlight/update_tracking/org-netbeans-modules-dlight-kit.xml %%DATADIR%%/dlight/update_tracking/org-netbeans-modules-dlight-libs-common.xml %%DATADIR%%/dlight/update_tracking/org-netbeans-modules-dlight-remote-impl.xml %%DATADIR%%/dlight/update_tracking/org-netbeans-modules-dlight-remote.xml -%%DATADIR%%/dlight/update_tracking/org-netbeans-modules-dlight-util.xml %%DATADIR%%/dlight/update_tracking/org-netbeans-modules-remotefs-versioning.xml %%DATADIR%%/enterprise/.lastModified %%DATADIR%%/enterprise/VERSION.txt @@ -512,11 +505,14 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/config/Modules/org-netbeans-libs-amazon.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-libs-commons_fileupload.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-libs-elimpl.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-libs-glassfish-sdk.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-libs-glassfish_logging.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-libs-jstl.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-apisupport-restsample.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-cloud-amazon.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-cloud-common.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-el-lexer.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-glassfish-common.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-glassfish-eecommon.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-glassfish-javaee.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-hibernateweb.xml @@ -546,7 +542,10 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-j2eeserver.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-api.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-beanvalidation.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-project.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-resources.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee-specs-support.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-javaee7-api.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-jellytools-enterprise.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-jsp-lexer.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-maven-j2ee.xml @@ -565,7 +564,6 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-el.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-examples.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-freeform.xml -%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-helpset.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jsf-editor.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jsf-icefaces.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jsf-kit.xml @@ -577,13 +575,13 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jsf20.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jsfapi.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jspparser.xml -%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-jstl11.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-kit.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-monitor.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-primefaces.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-project.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-refactoring.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-web-struts.xml +%%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websocket.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websvc-clientapi.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websvc-core.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websvc-customization.xml @@ -610,49 +608,76 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websvc-wsitconf.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websvc-wsitmodelext.xml %%DATADIR%%/enterprise/config/Modules/org-netbeans-modules-websvc-wsstackapi.xml -%%DATADIR%%/enterprise/docs/javaee6-doc-api.zip -%%DATADIR%%/enterprise/docs/jersey-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/jersey-apache-client-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/jersey-atom-abdera-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/jersey-guice-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/jersey-multipart-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/jersey-simple-server-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/jersey-spring-1.13-javadoc.zip +%%DATADIR%%/enterprise/docs/javaee-doc-api.jar %%DATADIR%%/enterprise/docs/jsf-api-docs.zip %%DATADIR%%/enterprise/docs/jsf12-tlddoc.zip -%%DATADIR%%/enterprise/docs/jsr311-api-1.1.1-javadoc.zip %%DATADIR%%/enterprise/docs/jstl11-doc.zip %%DATADIR%%/enterprise/docs/metro-1.4-doc.zip -%%DATADIR%%/enterprise/docs/oauth-client-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/oauth-server-1.13-javadoc.zip -%%DATADIR%%/enterprise/docs/oauth-signature-1.13-javadoc.zip %%DATADIR%%/enterprise/docs/struts-1.3.10-javadoc.zip %%DATADIR%%/enterprise/docs/struts-tags.zip %%DATADIR%%/enterprise/docs/syntaxref20.zip -%%DATADIR%%/enterprise/modules/docs/org-netbeans-modules-j2ee-platform.jar -%%DATADIR%%/enterprise/modules/docs/org-netbeans-modules-tomcat5.jar -%%DATADIR%%/enterprise/modules/docs/org-netbeans-modules-web-helpset.jar -%%DATADIR%%/enterprise/modules/docs/org-netbeans-modules-web-monitor.jar %%DATADIR%%/enterprise/modules/ext/aws-sdk/aws-java-sdk-1.2.1.jar %%DATADIR%%/enterprise/modules/ext/aws-sdk/commons-codec-1.3.jar %%DATADIR%%/enterprise/modules/ext/aws-sdk/commons-logging-1.1.1.jar %%DATADIR%%/enterprise/modules/ext/aws-sdk/httpclient-4.1.1.jar %%DATADIR%%/enterprise/modules/ext/aws-sdk/httpcore-4.1.jar %%DATADIR%%/enterprise/modules/ext/build-ws.xml -%%DATADIR%%/enterprise/modules/ext/commons-fileupload-1.0.jar +%%DATADIR%%/enterprise/modules/ext/commons-fileupload-1.3.jar %%DATADIR%%/enterprise/modules/ext/el-impl.jar -%%DATADIR%%/enterprise/modules/ext/glassfish-jspparser-3.0.jar +%%DATADIR%%/enterprise/modules/ext/glassfish-jspparser-4.0.jar %%DATADIR%%/enterprise/modules/ext/glassfish-logging-2.0.jar +%%DATADIR%%/enterprise/modules/ext/glassfish-tooling-sdk.jar %%DATADIR%%/enterprise/modules/ext/javaee-api-6.0-license.txt %%DATADIR%%/enterprise/modules/ext/javaee-api-6.0.jar +%%DATADIR%%/enterprise/modules/ext/javaee-api-7.0-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee-api-7.0.jar %%DATADIR%%/enterprise/modules/ext/javaee-web-api-6.0-license.txt %%DATADIR%%/enterprise/modules/ext/javaee-web-api-6.0.jar +%%DATADIR%%/enterprise/modules/ext/javaee-web-api-7.0-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee-web-api-7.0.jar %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/javax.annotation-license.txt %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/javax.annotation.jar %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/jaxb-api-osgi-license.txt %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/jaxb-api-osgi.jar %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/webservices-api-osgi-license.txt %%DATADIR%%/enterprise/modules/ext/javaee6-endorsed/webservices-api-osgi.jar +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/javax.annotation-api-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/javax.annotation-api.jar +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/javax.xml.soap-api-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/javax.xml.soap-api.jar +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/jaxb-api-osgi-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/jaxb-api-osgi.jar +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/jaxws-api-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/jaxws-api.jar +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/jsr181-api-license.txt +%%DATADIR%%/enterprise/modules/ext/javaee7-endorsed/jsr181-api.jar +%%DATADIR%%/enterprise/modules/ext/jaxrs-2.0/javax.ws.rs-api-2.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/asm-all-repackaged-2.1.88.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/cglib-2.1.88.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/guava-14.0.1.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/hk2-api-2.1.88.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/hk2-locator-2.1.88.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/hk2-utils-2.1.88.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/javax.annotation-api-1.2.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/javax.inject-2.1.88.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/javax.servlet-api-3.1.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/jaxb-api-2.2.7.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/org.osgi.core-4.2.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/osgi-resource-locator-1.0.1.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/persistence-api-1.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/ext/validation-api-1.1.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jackson-core-asl-1.9.11.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jackson-jaxrs-1.9.11.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jackson-mapper-asl-1.9.11.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jackson-xc-1.9.11.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jersey-media-json-jackson-2.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jersey-media-json-jettison-2.0.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/extensions/jettison-1.3.3.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/jersey-client.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/jersey-common.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/jersey-container-servlet-core.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/jersey-container-servlet.jar +%%DATADIR%%/enterprise/modules/ext/jersey2/jersey-server.jar %%DATADIR%%/enterprise/modules/ext/jsf-1_2/LICENSE-APACHE.txt %%DATADIR%%/enterprise/modules/ext/jsf-1_2/LICENSE.TXT %%DATADIR%%/enterprise/modules/ext/jsf-1_2/THIRDPARTYLICENSEREADME.txt @@ -662,11 +687,12 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/ext/jsf-1_2/commons-logging.jar %%DATADIR%%/enterprise/modules/ext/jsf-1_2/jsf-api.jar %%DATADIR%%/enterprise/modules/ext/jsf-1_2/jsf-impl.jar -%%DATADIR%%/enterprise/modules/ext/jsf-2_1/javax.faces.jar -%%DATADIR%%/enterprise/modules/ext/jsf-2_1/license.txt +%%DATADIR%%/enterprise/modules/ext/jsf-2_2/javax.faces.jar +%%DATADIR%%/enterprise/modules/ext/jsf-2_2/license.txt %%DATADIR%%/enterprise/modules/ext/jsp-parser-ext.jar %%DATADIR%%/enterprise/modules/ext/jsr88javax.jar -%%DATADIR%%/enterprise/modules/ext/jstl.jar +%%DATADIR%%/enterprise/modules/ext/jstl-api.jar +%%DATADIR%%/enterprise/modules/ext/jstl-impl.jar %%DATADIR%%/enterprise/modules/ext/locale/org-netbeans-modules-web-httpmonitor_ja.jar %%DATADIR%%/enterprise/modules/ext/locale/org-netbeans-modules-web-httpmonitor_pt_BR.jar %%DATADIR%%/enterprise/modules/ext/locale/org-netbeans-modules-web-httpmonitor_ru.jar @@ -677,31 +703,9 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/ext/metro/webservices-rt.jar %%DATADIR%%/enterprise/modules/ext/metro/webservices-tools.jar %%DATADIR%%/enterprise/modules/ext/org-netbeans-modules-web-httpmonitor.jar -%%DATADIR%%/enterprise/modules/ext/primefaces/primefaces-3.4.jar -%%DATADIR%%/enterprise/modules/ext/rest/asm-3.1.jar -%%DATADIR%%/enterprise/modules/ext/rest/jackson-core-asl-1.9.2.jar -%%DATADIR%%/enterprise/modules/ext/rest/jackson-jaxrs-1.9.2.jar -%%DATADIR%%/enterprise/modules/ext/rest/jackson-mapper-asl-1.9.2.jar -%%DATADIR%%/enterprise/modules/ext/rest/jackson-xc-1.9.2.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-apache-client-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-atom-abdera-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-client-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-core-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-guice-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-json-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-multipart-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-server-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-servlet-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-simple-server-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jersey-spring-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/jettison-1.1.jar -%%DATADIR%%/enterprise/modules/ext/rest/jsr311-api-1.1.1.jar -%%DATADIR%%/enterprise/modules/ext/rest/oauth-client-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/oauth-server-1.13.jar -%%DATADIR%%/enterprise/modules/ext/rest/oauth-signature-1.13.jar -%%DATADIR%%/enterprise/modules/ext/servlet3.0-jsp2.2-api.jar +%%DATADIR%%/enterprise/modules/ext/primefaces/primefaces-3.5.jar +%%DATADIR%%/enterprise/modules/ext/servlet3.1-jsp2.3-api.jar %%DATADIR%%/enterprise/modules/ext/spring/spring-webmvc-2.5.6.SEC03.jar -%%DATADIR%%/enterprise/modules/ext/standard.jar %%DATADIR%%/enterprise/modules/ext/struts/antlr-2.7.2.jar %%DATADIR%%/enterprise/modules/ext/struts/bsf-2.3.0.jar %%DATADIR%%/enterprise/modules/ext/struts/commons-beanutils-1.8.0.jar @@ -738,10 +742,18 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-elimpl_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-elimpl_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-elimpl_zh_CN.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish-sdk_ja.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish-sdk_pt_BR.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish-sdk_ru.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish-sdk_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish_logging_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish_logging_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish_logging_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-glassfish_logging_zh_CN.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-jstl_ja.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-jstl_pt_BR.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-jstl_ru.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-libs-jstl_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-apisupport-restsample_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-apisupport-restsample_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-apisupport-restsample_ru.jar @@ -758,6 +770,10 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-el-lexer_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-el-lexer_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-el-lexer_zh_CN.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-common_ja.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-common_pt_BR.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-common_ru.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-common_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-eecommon_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-eecommon_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-glassfish-eecommon_ru.jar @@ -874,10 +890,22 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-beanvalidation_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-beanvalidation_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-beanvalidation_zh_CN.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-project_ja.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-project_pt_BR.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-project_ru.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-project_zh_CN.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-resources_ja.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-resources_pt_BR.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-resources_ru.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-resources_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-specs-support_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-specs-support_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-specs-support_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee-specs-support_zh_CN.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee7-api_ja.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee7-api_pt_BR.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee7-api_ru.jar +%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-javaee7-api_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-jellytools-enterprise_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-jellytools-enterprise_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-jellytools-enterprise_ru.jar @@ -950,10 +978,6 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-freeform_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-freeform_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-freeform_zh_CN.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-helpset_ja.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-helpset_pt_BR.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-helpset_ru.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-helpset_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jsf-editor_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jsf-editor_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jsf-editor_ru.jar @@ -998,10 +1022,6 @@ bin/netbeans-%%PORTVERSION%% %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jspparser_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jspparser_ru.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jspparser_zh_CN.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jstl11_ja.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jstl11_pt_BR.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jstl11_ru.jar -%%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-jstl11_zh_CN.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-kit_ja.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-kit_pt_BR.jar %%DATADIR%%/enterprise/modules/locale/org-netbeans-modules-web-kit_ru.jar *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***