Upgrade to Grid Engine 6.2u2_1, the latest release from Sun.

In this update I haven't tried to make the GUI installer build.  I'm not
very interested in it and it would add a dependency on Java.

5 files changed, 33 insertions, 9 deletions

diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 4aaf79056e05..3044ef2f2a75 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
 PORTREVISION=	1
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/190/:src \
+MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/197/:src \
 		${MASTER_SITE_LOCAL}:src
 MASTER_SITE_SUBDIR=	brooks
 DISTNAME=	ge-V${SGE_RELEASE:S/.//}_TAG-src
@@ -37,8 +37,8 @@ SGE_BASE?=	sge
 SGE_ROOT=	${PREFIX}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_BUILD_ARCH=	FREEBSD_${ARCH:U}
-SGE_RELEASE=	6.2u1
-SGE_VERSION=	${SGE_RELEASE:S/u/./:S/beta/.b/}
+SGE_RELEASE=	6.2u2_1
+SGE_VERSION=	${SGE_RELEASE:S/u/./:S/_/./:S/beta/.b/}
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
 PLIST_SUB+=	SGE_BASE=${SGE_BASE}
@@ -98,7 +98,7 @@ AIMK_ARGS+=	-spool-classic
 PLIST_SUB+=	BDB_SPOOL="@comment "
 .endif
 
-AIMK_ARGS+=	-no-java -no-jni
+AIMK_ARGS+=	-no-java -no-jni -no-gui-inst
 
 .if defined(WITH_X11)
 USE_MOTIF=	yes
@@ -202,7 +202,7 @@ release-tar: build
 #########################################################################
 
 # Build a pkg-plist and Makefile.man
-build-plist: build
+build-plist:
 .if defined(WITHOUT_BDB) || defined(WITHOUT_X11)
 	@echo "ERROR: All OPTIONS must be enabled to build plist!" && ${FALSE}
 .endif
diff --git a/sysutils/sge62/Makefile.man b/sysutils/sge62/Makefile.man
index a852310b675e..2f169cdb4024 100644
--- a/sysutils/sge62/Makefile.man
+++ b/sysutils/sge62/Makefile.man
@@ -11,7 +11,6 @@ MLINKS+=submit.1 qrsh.1
 MLINKS+=submit.1 qsh.1
 MLINKS+=submit.1 qsub.1
 MLINKS+=hostnameutils.1 gethostbyaddr.1
-MLINKS+=drmaa_wait.3 drmaa_wtermsig.3
 MLINKS+=drmaa_jobcontrol.3 drmaa_control.3
 MLINKS+=drmaa_jobtemplate.3 drmaa_delete_job_template.3
 MLINKS+=drmaa_session.3 drmaa_exit.3
@@ -45,9 +44,11 @@ MLINKS+=drmaa_wait.3 drmaa_wexitstatus.3
 MLINKS+=drmaa_wait.3 drmaa_wifaborted.3
 MLINKS+=drmaa_wait.3 drmaa_wifexited.3
 MLINKS+=drmaa_wait.3 drmaa_wifsignaled.3
+MLINKS+=drmaa_wait.3 drmaa_wtermsig.3
 MLINKS+=drmaa_jobtemplate.3 drmaa_allocate_job_template.3
 MAN1+=submit.1
 MAN1+=hostnameutils.1
+MAN1+=jsv.1
 MAN1+=qacct.1
 MAN1+=qconf.1
 MAN1+=qdel.1
@@ -69,6 +70,7 @@ MAN1+=sge_ckpt.1
 MAN1+=sge_intro.1
 MAN1+=sge_types.1
 MAN1+=sgepasswd.1
+MAN3+=jsv_script_interface.3
 MAN3+=drmaa_attributes.3
 MAN3+=drmaa_jobcontrol.3
 MAN3+=drmaa_jobtemplate.3
diff --git a/sysutils/sge62/distinfo b/sysutils/sge62/distinfo
index da7e790634de..6cf54bf8e7f0 100644
--- a/sysutils/sge62/distinfo
+++ b/sysutils/sge62/distinfo
@@ -1,3 +1,3 @@
-MD5 (ge-V62u1_TAG-src.tar.gz) = 9ba9fbdfa3568bc278ba53db8b52223c
-SHA256 (ge-V62u1_TAG-src.tar.gz) = b630b5abb886c33cc766a7b89840f613a374740b33a09b787bf6d60248486f4c
-SIZE (ge-V62u1_TAG-src.tar.gz) = 9014129
+MD5 (ge-V62u2_1_TAG-src.tar.gz) = 5340a5f6c260a819ba224ad5fe3cba45
+SHA256 (ge-V62u2_1_TAG-src.tar.gz) = b6e156e21de289a601f2fa115409fa8993ed763de681cdc20ac87b377c070131
+SIZE (ge-V62u2_1_TAG-src.tar.gz) = 9462032
diff --git a/sysutils/sge62/files/distinst.private b/sysutils/sge62/files/distinst.private
index 8f1d8d56efa8..2e0d4d128035 100644
--- a/sysutils/sge62/files/distinst.private
+++ b/sysutils/sge62/files/distinst.private
@@ -3,3 +3,5 @@ OPENSSLBASE=%%OPENSSLBASE%%
 BERKELEYDBBASE=%%LOCALBASE%%
 BDB_LIB_SUFFIX="-4.2"
 DRMAAJ05BASE=%%WRKDIR%%/lib
+
+instguiinst=false
diff --git a/sysutils/sge62/pkg-plist b/sysutils/sge62/pkg-plist
index 76f73c336f41..0bd98eb8148b 100644
--- a/sysutils/sge62/pkg-plist
+++ b/sysutils/sge62/pkg-plist
@@ -31,6 +31,7 @@
 %%SGE_BASE%%/catman/cat/cat1/gethostname.1
 %%SGE_BASE%%/catman/cat/cat1/getservbyname.1
 %%SGE_BASE%%/catman/cat/cat1/hostnameutils.1
+%%SGE_BASE%%/catman/cat/cat1/jsv.1
 %%SGE_BASE%%/catman/cat/cat1/qacct.1
 %%SGE_BASE%%/catman/cat/cat1/qalter.1
 %%SGE_BASE%%/catman/cat/cat1/qconf.1
@@ -101,6 +102,7 @@
 %%SGE_BASE%%/catman/cat/cat3/drmaa_wifexited.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_wifsignaled.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_wtermsig.3
+%%SGE_BASE%%/catman/cat/cat3/jsv_script_interface.3
 %%SGE_BASE%%/catman/cat/cat5/access_list.5
 %%SGE_BASE%%/catman/cat/cat5/accounting.5
 %%SGE_BASE%%/catman/cat/cat5/bootstrap.5
@@ -428,6 +430,12 @@
 %%SGE_BASE%%/util/resources/centry/virtual_free
 %%SGE_BASE%%/util/resources/centry/virtual_total
 %%SGE_BASE%%/util/resources/centry/virtual_used
+%%SGE_BASE%%/util/resources/jsv/JSV.pm
+%%SGE_BASE%%/util/resources/jsv/jsv.pl
+%%SGE_BASE%%/util/resources/jsv/jsv.sh
+%%SGE_BASE%%/util/resources/jsv/jsv.tcl
+%%SGE_BASE%%/util/resources/jsv/jsv_include.sh
+%%SGE_BASE%%/util/resources/jsv/jsv_include.tcl
 %%SGE_BASE%%/util/resources/loadsensors/calendar.sh
 %%SGE_BASE%%/util/resources/loadsensors/ibm-loadsensor
 %%SGE_BASE%%/util/resources/loadsensors/interix-loadsensor.sh
@@ -484,6 +492,7 @@
 %%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_stat
 %%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_upgrade
 %%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_verify
+%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/echo_raw
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/filestat
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/fstype
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/gethostbyaddr
@@ -495,6 +504,7 @@
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/now
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/openssl
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/qrsh_starter
+%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/read_raw
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/rlogin
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/rsh
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/rshd
@@ -533,7 +543,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/event_mirror.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/job_category.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/job_class.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/job_submission_verifier.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/maui.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/non-multiplied-pe-requests.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/policy_module.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/priority_class.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/profiling.txt
@@ -549,6 +561,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/gethostname.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/getservbyname.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/hostnameutils.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/jsv.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qacct.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qalter.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qconf.html
@@ -561,9 +574,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qmon.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qping.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qquota.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrdel.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qresub.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrls.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrsh.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrstat.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrsub.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qselect.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qsh.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qstat.html
@@ -618,6 +634,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_wifexited.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_wifsignaled.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_wtermsig.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/jsv_script_interface.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/lAddElemStr.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/lAddList.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/lAddSubStr.html
@@ -754,12 +771,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/user.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/usermapping.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/SGE_Helper_Service.exe.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_ca.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_commd.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_execd.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_qmaster.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_schedd.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_shadowd.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_shepherd.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_st.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sgecommdcntl.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/index.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/manuals.html
@@ -843,6 +862,7 @@
 @dirrm %%SGE_BASE%%/util/resources/schemas
 @dirrm %%SGE_BASE%%/util/resources/pe
 @dirrm %%SGE_BASE%%/util/resources/loadsensors
+@dirrm %%SGE_BASE%%/util/resources/jsv
 @dirrm %%SGE_BASE%%/util/resources/centry
 @dirrm %%SGE_BASE%%/util/resources/calendars
 @dirrm %%SGE_BASE%%/util/resources