6 files changed, 59 insertions, 77 deletions

diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 544c845dd6d0..ebaee4b494ac 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -8,13 +8,11 @@
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/174/:src \
-		http://gridengine.sunsource.net/download/SGE62/:bin \
-		${MASTER_SITE_LOCAL}:src,bin
+MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/181/:src \
+		${MASTER_SITE_LOCAL}:src
 MASTER_SITE_SUBDIR=	brooks
 DISTNAME=	ge-V${SGE_RELEASE:S/.//}_TAG-src
-DISTFILES=	${DISTNAME}.tar.gz:src \
-		ge-${SGE_RELEASE}-common.tar.gz:bin
+DISTFILES=	${DISTNAME}.tar.gz:src
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	brooks@FreeBSD.org
@@ -29,11 +27,10 @@ DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
 OPTIONS=	BDB "Use DB based spooler" on \
-		JAVA "Support Java DRMAA API" on \
 		X11 "Qmon X11 GUI" on \
 		QSH "Enable qsh (requires xterm on exec hosts)" on
 
-LATEST_LINK=	sge61
+LATEST_LINK=	sge62
 CONFLICTS=	sge-6.[013-9]* sge-5* sgeee-[0-9]* sge-0.*
 
 NOT_FOR_ARCHS=	alpha
@@ -47,7 +44,7 @@ SGE_BASE?=	sge
 SGE_ROOT=	${PREFIX}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_BUILD_ARCH=	FREEBSD_${ARCH:U}
-SGE_RELEASE=	6.2beta
+SGE_RELEASE=	6.2
 SGE_VERSION=	${SGE_RELEASE:S/u/./:S/beta/.b/}
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
@@ -104,14 +101,6 @@ AIMK_ARGS+=	-spool-classic
 PLIST_SUB+=	BDB_SPOOL="@comment "
 .endif
 
-.if defined(WITH_JAVA)
-USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-PLIST_SUB+=	DRMAA=
-CATEGORIES+=	java
-.else
-PLIST_SUB+=	DRMAA="@comment "
-.endif
 AIMK_ARGS+=	-no-java -no-jni
 
 .if defined(WITH_X11)
@@ -124,14 +113,6 @@ PLIST_SUB+=	QMON="@comment "
 QMON=		noqmon
 .endif
 
-post-extract:
-	@cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/ge-${SGE_RELEASE}-common.tar.gz \*.jar
-	@${MKDIR} ${WRKSRC}/classes/juti
-	@${CP} ${WRKDIR}/lib/drmaa.jar ${WRKSRC}/classes/
-	@${CP} ${WRKDIR}/lib/juti.jar ${WRKSRC}/classes/juti/
-	@${MKDIR} ${WRKSRC}/libs/jgdi/build
-	@${CP} ${WRKDIR}/lib/jgdi.jar ${WRKSRC}/libs/jgdi/build/
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
@@ -225,7 +206,7 @@ release-tar: build
 
 # Build a pkg-plist and Makefile.man
 build-plist: build
-.if defined(WITHOUT_BDB) || defined(WITHOUT_JAVA) || defined(WITHOUT_X11)
+.if defined(WITHOUT_BDB) || defined(WITHOUT_X11)
 	@echo "ERROR: All OPTIONS must be enabled to build plist!" && ${FALSE}
 .endif
 	@${FIND} ${TMP_SGE_ROOT}/* -name man -prune -o \
diff --git a/sysutils/sge62/Makefile.man b/sysutils/sge62/Makefile.man
index 8762b3e44b48..a852310b675e 100644
--- a/sysutils/sge62/Makefile.man
+++ b/sysutils/sge62/Makefile.man
@@ -101,11 +101,10 @@ MAN5+=sgepasswd.5
 MAN5+=share_tree.5
 MAN5+=user.5
 MAN5+=access_list.5
-MAN8+=sge_st.8
+MAN8+=sge_qmaster.8
 MAN8+=sge_ca.8
 MAN8+=sge_execd.8
-MAN8+=sge_qmaster.8
-MAN8+=sge_schedd.8
+MAN8+=SGE_Helper_Service.exe.8
 MAN8+=sge_shadowd.8
 MAN8+=sge_shepherd.8
-MAN8+=SGE_Helper_Service.exe.8
+MAN8+=sge_st.8
diff --git a/sysutils/sge62/distinfo b/sysutils/sge62/distinfo
index ccea6e3a7354..ad16030d7c7e 100644
--- a/sysutils/sge62/distinfo
+++ b/sysutils/sge62/distinfo
@@ -1,6 +1,3 @@
-MD5 (ge-V62beta_TAG-src.tar.gz) = a76665b635d4f559c2a7386c68e3c070
-SHA256 (ge-V62beta_TAG-src.tar.gz) = c84356e10c757acb8e6a21867a17fcf17decf776b0fe8578e105779829d86d4a
-SIZE (ge-V62beta_TAG-src.tar.gz) = 8917831
-MD5 (ge-6.2beta-common.tar.gz) = b84333e699e17db31f4317202cb18fca
-SHA256 (ge-6.2beta-common.tar.gz) = 774e32ea2822a77e8c38ed680ff8d68949267093e7625056332e56956fab1cb7
-SIZE (ge-6.2beta-common.tar.gz) = 3162240
+MD5 (ge-V62_TAG-src.tar.gz) = 36e47fba0454d25e4126324384cec221
+SHA256 (ge-V62_TAG-src.tar.gz) = b1dc1dd5da32fde4af3d62a7e215e1d93223c4f4ca151b53d3b91b253d71e2ba
+SIZE (ge-V62_TAG-src.tar.gz) = 9000709
diff --git a/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c b/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c
index 3363bb1ecf47..824864e36714 100644
--- a/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c
+++ b/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c
@@ -12,29 +12,3 @@ $FreeBSD$
  #  include <termios.h>
  #  include <sys/ttycom.h>
  #  include <sys/ioctl.h>
-@@ -192,19 +192,19 @@
-     *  indication until the terminal is closed."
-     */
-    if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
--      sigset(SIGHUP, signal_handler);
-+      signal(SIGHUP, signal_handler);
-    }
-    if (signal(SIGINT, SIG_IGN) != SIG_IGN) {
--      sigset(SIGINT, signal_handler);
-+      signal(SIGINT, signal_handler);
-    }
-    if (signal(SIGQUIT, SIG_IGN) != SIG_IGN) {
--      sigset(SIGQUIT, signal_handler);
-+      signal(SIGQUIT, signal_handler);
-    }
-    if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
--      sigset(SIGTERM, signal_handler);
-+      signal(SIGTERM, signal_handler);
-    }
--   sigset(SIGWINCH, window_change_handler);
--   sigset(SIGPIPE,  broken_pipe_handler);
-+   signal(SIGWINCH, window_change_handler);
-+   signal(SIGPIPE,  broken_pipe_handler);
- }
- 
- /****** client_check_window_change() *******************************************
diff --git a/sysutils/sge62/files/patch-scripts_distinst b/sysutils/sge62/files/patch-scripts_distinst
index e93a4ed1d305..5a2d678e843a 100644
--- a/sysutils/sge62/files/patch-scripts_distinst
+++ b/sysutils/sge62/files/patch-scripts_distinst
@@ -54,17 +54,51 @@ $FreeBSD$
  
  echo
  
-@@ -749,6 +737,9 @@
+@@ -749,6 +737,12 @@
           instmpi=true
           instcommon=true
           ;;
++      nodrmaa)
++         instdrmaa=false
++         ;;
 +      noqmon)
 +         instqmon=false
 +         ;;
        qmontree)
           instqmon=true
           instcommon=true
-@@ -1002,19 +993,6 @@
+@@ -942,18 +936,18 @@
+          Execute cp $f $DEST_SGE_ROOT/include
+       done
+ 
+-      for filename in $DRMAAJ_FILES $JUTIJ_FILES $JGDIJ_FILES; do
+-         filename="${filename}.jar"
+-         if [ -f $filename ]; then
+-            echo Installing `basename $filename`
+-            Execute rm -f $DEST_SGE_ROOT/lib/`basename $filename`
+-            MakeDir lib
+-            Install 0.0 644 $filename $DEST_SGE_ROOT/lib/`basename $filename`
+-         elif [ $exit_on_error = true ]; then
+-            echo "\"$filename\" not found. Installation failed."
+-            exit 1
+-         fi
+-      done
++#      for filename in $DRMAAJ_FILES $JUTIJ_FILES $JGDIJ_FILES; do
++#         filename="${filename}.jar"
++#         if [ -f $filename ]; then
++#            echo Installing `basename $filename`
++#            Execute rm -f $DEST_SGE_ROOT/lib/`basename $filename`
++#            MakeDir lib
++#            Install 0.0 644 $filename $DEST_SGE_ROOT/lib/`basename $filename`
++#         elif [ $exit_on_error = true ]; then
++#            echo "\"$filename\" not found. Installation failed."
++#            exit 1
++#         fi
++#      done
+ 
+       Cleanup include
+    fi
+@@ -1003,19 +997,6 @@
           Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
        done
  
@@ -84,16 +118,16 @@ $FreeBSD$
        Cleanup mpi
     fi
  
-@@ -1162,7 +1140,7 @@
+@@ -1163,7 +1144,7 @@
  
        for prog in $PROG; do
           case $prog in
 -            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|qmontree|common|distcommon|utilbin|arco)
-+            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|noqmon|pvm|qmontree|common|distcommon|utilbin|arco)
++            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|nodrmaa|noqmon|pvm|qmontree|common|distcommon|utilbin|arco)
                 : 
                 ;;
              qmake)
-@@ -1277,6 +1255,8 @@
+@@ -1278,6 +1259,8 @@
                       InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
                    elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
                       InstallProg $BERKELEYDBBASE/bin/$prog
@@ -102,7 +136,7 @@ $FreeBSD$
                    fi
                 fi
              elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
-@@ -1407,6 +1387,8 @@
+@@ -1408,6 +1391,8 @@
                    libname="$lib.$shlibext"
                 elif [ $DSTARCH = darwin-ppc -o $DSTARCH = darwin-x86 ];  then
                    libname="$lib.$OPENSSLSOVERSION.$shlibext"
@@ -111,7 +145,7 @@ $FreeBSD$
                 else
                    libname="$lib.$shlibext.$OPENSSLSOVERSION"
                 fi
-@@ -1421,7 +1403,7 @@
+@@ -1422,7 +1407,7 @@
                    InstallProg $libname
                    if [ $DSTARCH = tru64 ]; then
                       :
diff --git a/sysutils/sge62/pkg-plist b/sysutils/sge62/pkg-plist
index 0ecc4c5ccf2d..76f73c336f41 100644
--- a/sysutils/sge62/pkg-plist
+++ b/sysutils/sge62/pkg-plist
@@ -130,7 +130,6 @@
 %%SGE_BASE%%/catman/cat/cat8/sge_ca.8
 %%SGE_BASE%%/catman/cat/cat8/sge_execd.8
 %%SGE_BASE%%/catman/cat/cat8/sge_qmaster.8
-%%SGE_BASE%%/catman/cat/cat8/sge_schedd.8
 %%SGE_BASE%%/catman/cat/cat8/sge_shadowd.8
 %%SGE_BASE%%/catman/cat/cat8/sge_shepherd.8
 %%SGE_BASE%%/catman/cat/cat8/sge_st.8
@@ -180,7 +179,6 @@
 %%SGE_BASE%%/inst_sge
 %%SGE_BASE%%/install_execd
 %%SGE_BASE%%/install_qmaster
-%%SGE_BASE%%/lib/drmaa.jar
 %%QMON%%%%SGE_BASE%%/lib/%%SGE_ARCH%%/libXltree.so
 %%SGE_BASE%%/lib/%%SGE_ARCH%%/libcrypto.so
 %%SGE_BASE%%/lib/%%SGE_ARCH%%/libdrmaa.so
@@ -189,8 +187,6 @@
 %%BDB_SPOOL%%%%SGE_BASE%%/lib/%%SGE_ARCH%%/libspoolb.so
 %%BDB_SPOOL%%%%SGE_BASE%%/lib/%%SGE_ARCH%%/libspoolc.so
 %%SGE_BASE%%/lib/%%SGE_ARCH%%/libssl.so
-%%SGE_BASE%%/lib/jgdi.jar
-%%SGE_BASE%%/lib/juti.jar
 %%SGE_BASE%%/mpi/README
 %%SGE_BASE%%/mpi/README.atm
 %%SGE_BASE%%/mpi/hostname
@@ -229,6 +225,7 @@
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/21cal.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/21cal_ins.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/aclask.xpm
+%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/ar.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_ar.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_browser.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_calendar.xpm
@@ -368,7 +365,6 @@
 %%SGE_BASE%%/util/install_modules/inst_schedd_normal.conf
 %%SGE_BASE%%/util/install_modules/inst_st.sh
 %%SGE_BASE%%/util/install_modules/inst_template.conf
-%%SGE_BASE%%/util/install_modules/inst_update.sh
 %%SGE_BASE%%/util/jaas.config.template
 %%SGE_BASE%%/util/java.policy.template
 %%SGE_BASE%%/util/jmxremote.access
@@ -466,11 +462,13 @@
 %%SGE_BASE%%/util/sgeSMF/sge_smf_support.sh
 %%SGE_BASE%%/util/sgeSMF/shadowd_template.xml
 %%SGE_BASE%%/util/sgeST/sge_st
-%%SGE_BASE%%/util/sgeST/sge_st_settings.sh
 %%SGE_BASE%%/util/sgeST/st_settings.sh
 %%SGE_BASE%%/util/sge_aliases
 %%SGE_BASE%%/util/sge_request
 %%SGE_BASE%%/util/sgeremoterun
+%%SGE_BASE%%/util/upgrade_modules/inst_upgrade.sh
+%%SGE_BASE%%/util/upgrade_modules/load_sge_config.sh
+%%SGE_BASE%%/util/upgrade_modules/save_sge_config.sh
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/authuser
 %%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/berkeley_db_svc
@@ -506,11 +504,8 @@
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/spoolinit
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/testsuidroot
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/uidgid
-%%PORTDOCS%%%%DOCSDIR%%/README-Autoinstall.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-Update-60u2.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-Upgrade.txt
 %%PORTDOCS%%%%DOCSDIR%%/compatibility_test.html
 %%PORTDOCS%%%%DOCSDIR%%/devel/adoc.html
 %%PORTDOCS%%%%DOCSDIR%%/devel/c-header
@@ -530,6 +525,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/EvaluationExpressionSupport.wiki
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/ResourceLimitationRulesSpecification.html
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/ResourceQuotaSpecification.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/SMFSupportSpecification.htm
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/auto_user.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/bapl.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/cluster_queue.txt
@@ -834,6 +830,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/logfile-trimming.asc
 @dirrm %%SGE_BASE%%/utilbin/%%SGE_ARCH%%
 @dirrm %%SGE_BASE%%/utilbin
+@dirrm %%SGE_BASE%%/util/upgrade_modules
 @dirrm %%SGE_BASE%%/util/sgeST
 @dirrm %%SGE_BASE%%/util/sgeSMF
 @dirrm %%SGE_BASE%%/util/sgeCA