Hook sysutils/sge62 up post repocopy and upgrade to SGE 6.2beta.

Repocopy by:	marcus

13 files changed, 245 insertions, 40 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 74e657ac57b5..153fb0071a10 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -644,6 +644,7 @@
     SUBDIR += sformat
     SUBDIR += sge60
     SUBDIR += sge61
+    SUBDIR += sge62
     SUBDIR += shlock
     SUBDIR += sjog
     SUBDIR += skill
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 6d2b4ff1b635..544c845dd6d0 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/169/:src \
-		http://gridengine.sunsource.net/download/SGE61/:bin \
+MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/174/:src \
+		http://gridengine.sunsource.net/download/SGE62/:bin \
 		${MASTER_SITE_LOCAL}:src,bin
 MASTER_SITE_SUBDIR=	brooks
 DISTNAME=	ge-V${SGE_RELEASE:S/.//}_TAG-src
@@ -35,7 +34,7 @@ OPTIONS=	BDB "Use DB based spooler" on \
 		QSH "Enable qsh (requires xterm on exec hosts)" on
 
 LATEST_LINK=	sge61
-CONFLICTS=	sge-6.[02-9]* sge-5* sgeee-[0-9]* sge-0.*
+CONFLICTS=	sge-6.[013-9]* sge-5* sgeee-[0-9]* sge-0.*
 
 NOT_FOR_ARCHS=	alpha
 
@@ -48,8 +47,8 @@ SGE_BASE?=	sge
 SGE_ROOT=	${PREFIX}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_BUILD_ARCH=	FREEBSD_${ARCH:U}
-SGE_RELEASE=	6.1u4
-SGE_VERSION=	${SGE_RELEASE:S/u/./}
+SGE_RELEASE=	6.2beta
+SGE_VERSION=	${SGE_RELEASE:S/u/./:S/beta/.b/}
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
 PLIST_SUB+=	SGE_BASE=${SGE_BASE}
@@ -70,7 +69,6 @@ INST_PROGS=	man common \
 		sge_qmaster \
 		sge_execd \
 		sge_shadowd \
-		sge_schedd \
 		sge_shepherd \
 		sge_coshepherd \
 		qstat \
@@ -128,8 +126,8 @@ QMON=		noqmon
 
 post-extract:
 	@cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/ge-${SGE_RELEASE}-common.tar.gz \*.jar
-	@${CP} ${WRKDIR}/lib/drmaa.jar ${WRKSRC}/classes/
 	@${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/
diff --git a/sysutils/sge62/Makefile.man b/sysutils/sge62/Makefile.man
index 05b2c6febc7f..8762b3e44b48 100644
--- a/sysutils/sge62/Makefile.man
+++ b/sysutils/sge62/Makefile.man
@@ -58,7 +58,10 @@ MAN1+=qmod.1
 MAN1+=qmon.1
 MAN1+=qping.1
 MAN1+=qquota.1
+MAN1+=qrdel.1
 MAN1+=qrls.1
+MAN1+=qrstat.1
+MAN1+=qrsub.1
 MAN1+=qselect.1
 MAN1+=qstat.1
 MAN1+=qtcsh.1
@@ -98,9 +101,11 @@ MAN5+=sgepasswd.5
 MAN5+=share_tree.5
 MAN5+=user.5
 MAN5+=access_list.5
-MAN8+=SGE_Helper_Service.exe.8
+MAN8+=sge_st.8
+MAN8+=sge_ca.8
 MAN8+=sge_execd.8
 MAN8+=sge_qmaster.8
 MAN8+=sge_schedd.8
 MAN8+=sge_shadowd.8
 MAN8+=sge_shepherd.8
+MAN8+=SGE_Helper_Service.exe.8
diff --git a/sysutils/sge62/distinfo b/sysutils/sge62/distinfo
index 763d80dc598c..ccea6e3a7354 100644
--- a/sysutils/sge62/distinfo
+++ b/sysutils/sge62/distinfo
@@ -1,6 +1,6 @@
-MD5 (ge-V61u4_TAG-src.tar.gz) = d47aee70a978ab59e6a74c3e96c47dd8
-SHA256 (ge-V61u4_TAG-src.tar.gz) = 8c423b8a1aca3856e7596f59956a1e8b87cea07679e6e4b976f31c57eee25a6d
-SIZE (ge-V61u4_TAG-src.tar.gz) = 8571338
-MD5 (ge-6.1u4-common.tar.gz) = 8eacc1f7d324afd47d738fed19defcae
-SHA256 (ge-6.1u4-common.tar.gz) = 9583c13f940dd0a296c5fb58649e5b53f8f1944c4f287d20e9e8944640256a1c
-SIZE (ge-6.1u4-common.tar.gz) = 3531475
+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
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index c16574e2e682..2dd05c825fb9 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- aimk.orig
 +++ aimk
-@@ -222,7 +222,7 @@
+@@ -226,7 +226,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
  else
@@ -12,7 +12,7 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1065,12 +1065,12 @@
+@@ -1077,24 +1077,24 @@
        set OFLAG = "-O"
     endif
     set ARFLAGS  = rcv
@@ -27,10 +27,13 @@ $FreeBSD$
 +   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
-    set LIBS     = "$LIBS -lkvm"
-@@ -1080,9 +1080,9 @@
+-   set LIBS     = "$LIBS -lkvm"
++   set LIBS     = "$LIBS -lkvm -lutil"
+    set SHAREDLD = $CC
+    set SHARED_CFLAGS = "-fPIC"
+    set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
     set AUTHLIBS = "-lcrypt -lpam"
-    
+  
     set XMTDEF   = ""
 -   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
 +   set XINCD    = "$XMTINCD $XINCD -I${LOCALBASE}/include"
@@ -40,7 +43,7 @@ $FreeBSD$
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"
-@@ -1728,6 +1728,7 @@
+@@ -1774,6 +1774,7 @@
     if ("$JAVA_ARCH" != "") then
        set CORE_INCLUDE = "$CORE_INCLUDE -I${JAVA_HOME}/${JAVA_INCL}/${JAVA_ARCH}"
        switch ($buildarch)
@@ -48,7 +51,7 @@ $FreeBSD$
           case lx24-x86:
           case ulx24-x86:
           case lx26-x86:
-@@ -1745,6 +1746,7 @@
+@@ -1791,6 +1792,7 @@
           case usol-sparc:
               set JAVA_LIB_ARCH = sparc
               breaksw
diff --git a/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c b/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c
new file mode 100644
index 000000000000..3363bb1ecf47
--- /dev/null
+++ b/sysutils/sge62/files/patch-clients_common_sge__client__ijs.c
@@ -0,0 +1,40 @@
+
+$FreeBSD$
+
+--- clients/common/sge_client_ijs.c.orig
++++ clients/common/sge_client_ijs.c
+@@ -36,7 +36,7 @@
+ #include <signal.h>
+ #include <string.h>
+ 
+-#if defined(DARWIN)
++#if defined(DARWIN) || defined(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-clients_qsh_qsh.c b/sysutils/sge62/files/patch-clients_qsh_qsh.c
new file mode 100644
index 000000000000..9c070919feee
--- /dev/null
+++ b/sysutils/sge62/files/patch-clients_qsh_qsh.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- clients/qsh/qsh.c.orig
++++ clients/qsh/qsh.c
+@@ -85,7 +85,7 @@
+ 
+ #include "gdi/sge_gdi_ctx.h"
+ 
+-#if defined(DARWIN)
++#if defined(DARWIN) || defined(FREEBSD)
+ #  include <termios.h>
+ #  include <sys/ttycom.h>
+ #  include <sys/ioctl.h>
diff --git a/sysutils/sge62/files/patch-daemons_shepherd_sge__shepherd__ijs.c b/sysutils/sge62/files/patch-daemons_shepherd_sge__shepherd__ijs.c
new file mode 100644
index 000000000000..92d02f45209f
--- /dev/null
+++ b/sysutils/sge62/files/patch-daemons_shepherd_sge__shepherd__ijs.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- daemons/shepherd/sge_shepherd_ijs.c.orig
++++ daemons/shepherd/sge_shepherd_ijs.c
+@@ -45,7 +45,7 @@
+ #include <sys/timeb.h>
+ #include <sys/resource.h>
+ 
+-#if defined(DARWIN)
++#if defined(DARWIN) || defined(FREEBSD)
+ #  include <termios.h>
+ #  include <sys/ttycom.h>
+ #  include <sys/ioctl.h>
diff --git a/sysutils/sge62/files/patch-daemons_shepherd_shepherd.c b/sysutils/sge62/files/patch-daemons_shepherd_shepherd.c
new file mode 100644
index 000000000000..5678521dee1c
--- /dev/null
+++ b/sysutils/sge62/files/patch-daemons_shepherd_shepherd.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- daemons/shepherd/shepherd.c.orig
++++ daemons/shepherd/shepherd.c
+@@ -108,7 +108,7 @@
+ #include "windows_gui.h"
+ #endif
+ 
+-#if defined(DARWIN)
++#if defined(DARWIN) || defined(FREEBSD)
+ #  include <termios.h>
+ #  include <sys/ttycom.h>
+ #  include <sys/ioctl.h>    
+@@ -214,7 +214,7 @@
+    memset(tmpbuf, 0, sizeof(tmpbuf));
+ 
+    /* TODO: Why do we ingore SIGWINCH here? Why do we ignore only SIGWINCH here?*/
+-   sigignore(SIGWINCH);
++   signal(SIGWINCH, SIG_IGN);
+ 
+    /* close parents end of out copy of the pipe */
+    shepherd_trace("Child: closing parents end of the pipe");
diff --git a/sysutils/sge62/files/patch-dist_util_create__settings.sh b/sysutils/sge62/files/patch-dist_util_create__settings.sh
index 398a8a705e0e..535ebec429eb 100644
--- a/sysutils/sge62/files/patch-dist_util_create__settings.sh
+++ b/sysutils/sge62/files/patch-dist_util_create__settings.sh
@@ -3,20 +3,20 @@ $FreeBSD$
 
 --- dist/util/create_settings.sh.orig
 +++ dist/util/create_settings.sh
-@@ -102,6 +102,7 @@
- echo 'switch ($ARCH)'                                            >> $SP_CSH
+@@ -106,6 +106,7 @@
  #ENFORCE_SHLIBPATH#echo 'case "sol*":'                           >> $SP_CSH
  #ENFORCE_SHLIBPATH#echo 'case "lx*":'                            >> $SP_CSH
+ #ENFORCE_SHLIBPATH#echo 'case "hp11-64":'                        >> $SP_CSH
 +#ENFORCE_SHLIBPATH#echo 'case "fbsd-*":'                         >> $SP_CSH
  #ENFORCE_SHLIBPATH#echo '   breaksw'                             >> $SP_CSH
  echo 'case "*":'                                                 >> $SP_CSH
  echo "   set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`"       >> $SP_CSH
-@@ -154,7 +155,7 @@
+@@ -160,7 +161,7 @@
  
  echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
  echo 'case $ARCH in'                                                >> $SP_SH
--#ENFORCE_SHLIBPATH#echo 'sol*|lx*)'                                 >> $SP_SH
-+#ENFORCE_SHLIBPATH#echo 'sol*|lx*|fbsd-*)'                          >> $SP_SH
+-#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64)'                         >> $SP_SH
++#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64|fbsd-*)'                  >> $SP_SH
  #ENFORCE_SHLIBPATH#echo '   ;;'                                     >> $SP_SH
  echo '*)'                                                           >> $SP_SH
  echo "   shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`"             >> $SP_SH
diff --git a/sysutils/sge62/files/patch-libs_uti_sge__pty.c b/sysutils/sge62/files/patch-libs_uti_sge__pty.c
new file mode 100644
index 000000000000..8652053c9493
--- /dev/null
+++ b/sysutils/sge62/files/patch-libs_uti_sge__pty.c
@@ -0,0 +1,83 @@
+
+$FreeBSD$
+
+--- libs/uti/sge_pty.c.orig
++++ libs/uti/sge_pty.c
+@@ -40,7 +40,7 @@
+ #include <string.h>
+ #include <pwd.h>
+ 
+-#if defined(DARWIN) || defined(INTERIX)
++#if defined(DARWIN) || defined(FREEBSD) || defined(INTERIX)
+ #  include <termios.h>
+ #  include <sys/ioctl.h>
+ #  include <grp.h>
+@@ -58,6 +58,10 @@
+ #  include <termio.h>
+ #endif
+ 
++#if defined(FREEBSD)
++#  include <libutil.h>
++#endif
++
+ #include "sgermon.h"
+ #include "sge_unistd.h"
+ #include "sge_uidgid.h"
+@@ -125,7 +129,7 @@
+    }
+    return -1;  /* out of pty devices */
+ }
+-#else
++#elif !defined(FREEBSD)
+ int ptym_open(char *pts_name)
+ {
+    char *ptr;
+@@ -205,7 +209,7 @@
+    }
+    return fds;
+ }
+-#else
++#elif !defined(FREEBSD)
+ int ptys_open(int fdm, char *pts_name)
+ {
+    int      fds;
+@@ -271,6 +275,31 @@
+ *  SEE ALSO
+ *     pty/fork_no_pty
+ *******************************************************************************/
++#if defined(FREEBSD)
++pid_t fork_pty(int *ptrfdm, int *fd_pipe_err, dstring *err_msg)
++{
++   pid_t pid;
++   uid_t old_euid;
++
++   /* 
++    * We run this either as root with euid="sge admin user" or as an unprivileged 
++    * user.  If we are root with euid="sge admin user", we must change our
++    * euid back to root for this function.
++    */
++   old_euid = geteuid();
++   if (getuid() == SGE_SUPERUSER_UID) {
++      seteuid(SGE_SUPERUSER_UID);
++   }
++
++   if((pid = forkpty(*ptrfdm, NULL, NULL, NULL)) < 0) {
++      sge_dstring_sprintf(err_msg, "error in forkpty(): %d, %s",
++                          errno, strerror(errno));
++   }
++   seteuid(old_euid);
++
++   return pid;
++}
++#else
+ pid_t fork_pty(int *ptrfdm, int *fd_pipe_err, dstring *err_msg)
+ {
+    pid_t pid;
+@@ -364,6 +393,7 @@
+       return pid;    /* parent returns pid of child */
+    }
+ }
++#endif
+ 
+ /****** sge_pty/fork_no_pty() **************************************************
+ *  NAME
diff --git a/sysutils/sge62/files/patch-scripts_distinst b/sysutils/sge62/files/patch-scripts_distinst
index f40b6a7d5acd..e93a4ed1d305 100644
--- a/sysutils/sge62/files/patch-scripts_distinst
+++ b/sysutils/sge62/files/patch-scripts_distinst
@@ -24,7 +24,7 @@ $FreeBSD$
  BERKELEYDB_SHARED_LIBRARIES="libdb-4.4"
 @@ -75,11 +74,11 @@
  # The last number listed here will be the verson linked from libdrmaa.so
- DRMAA_SHARED_LIB_VERSIONS="0.95 1.0"
+ DRMAA_SHARED_LIB_VERSIONS="1.0"
  DRMAA_HEADER_FILES="libs/japi/drmaa.h"
 -DRMAAJ_FILES="CLASSES/drmaa"
 +DRMAAJ_FILES="classes/drmaa"
@@ -64,7 +64,7 @@ $FreeBSD$
        qmontree)
           instqmon=true
           instcommon=true
-@@ -1024,19 +1015,6 @@
+@@ -1002,19 +993,6 @@
           Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
        done
  
@@ -84,7 +84,7 @@ $FreeBSD$
        Cleanup mpi
     fi
  
-@@ -1184,7 +1162,7 @@
+@@ -1162,7 +1140,7 @@
  
        for prog in $PROG; do
           case $prog in
@@ -93,7 +93,7 @@ $FreeBSD$
                 : 
                 ;;
              qmake)
-@@ -1299,6 +1277,8 @@
+@@ -1277,6 +1255,8 @@
                       InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
                    elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
                       InstallProg $BERKELEYDBBASE/bin/$prog
@@ -102,16 +102,16 @@ $FreeBSD$
                    fi
                 fi
              elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
-@@ -1429,6 +1409,8 @@
+@@ -1407,6 +1387,8 @@
                    libname="$lib.$shlibext"
                 elif [ $DSTARCH = darwin-ppc -o $DSTARCH = darwin-x86 ];  then
-                   libname="$lib.0.9.7.$shlibext"
+                   libname="$lib.$OPENSSLSOVERSION.$shlibext"
 +               elif [ ${DSTARCH%%-*} = fbsd ]; then
 +                  libname="$OPENSSLBASE/lib/$lib.$shlibext"
                 else
-                   libname="$lib.$shlibext.0.9.7"
+                   libname="$lib.$shlibext.$OPENSSLSOVERSION"
                 fi
-@@ -1443,7 +1425,7 @@
+@@ -1421,7 +1403,7 @@
                    InstallProg $libname
                    if [ $DSTARCH = tru64 ]; then
                       :
diff --git a/sysutils/sge62/pkg-plist b/sysutils/sge62/pkg-plist
index 597f52ad83aa..0ecc4c5ccf2d 100644
--- a/sysutils/sge62/pkg-plist
+++ b/sysutils/sge62/pkg-plist
@@ -23,7 +23,6 @@
 %%SGE_BASE%%/bin/%%SGE_ARCH%%/sge_coshepherd
 %%SGE_BASE%%/bin/%%SGE_ARCH%%/sge_execd
 %%SGE_BASE%%/bin/%%SGE_ARCH%%/sge_qmaster
-%%SGE_BASE%%/bin/%%SGE_ARCH%%/sge_schedd
 %%SGE_BASE%%/bin/%%SGE_ARCH%%/sge_shadowd
 %%SGE_BASE%%/bin/%%SGE_ARCH%%/sge_shepherd
 %%SGE_BASE%%/bin/%%SGE_ARCH%%/sgepasswd
@@ -44,9 +43,12 @@
 %%QMON%%%%SGE_BASE%%/catman/cat/cat1/qmon.1
 %%SGE_BASE%%/catman/cat/cat1/qping.1
 %%SGE_BASE%%/catman/cat/cat1/qquota.1
+%%SGE_BASE%%/catman/cat/cat1/qrdel.1
 %%SGE_BASE%%/catman/cat/cat1/qresub.1
 %%SGE_BASE%%/catman/cat/cat1/qrls.1
 %%SGE_BASE%%/catman/cat/cat1/qrsh.1
+%%SGE_BASE%%/catman/cat/cat1/qrstat.1
+%%SGE_BASE%%/catman/cat/cat1/qrsub.1
 %%SGE_BASE%%/catman/cat/cat1/qselect.1
 %%SGE_BASE%%/catman/cat/cat1/qsh.1
 %%SGE_BASE%%/catman/cat/cat1/qstat.1
@@ -125,11 +127,13 @@
 %%SGE_BASE%%/catman/cat/cat5/user.5
 %%SGE_BASE%%/catman/cat/cat5/usermapping.5
 %%SGE_BASE%%/catman/cat/cat8/SGE_Helper_Service.exe.8
+%%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
 %%SGE_BASE%%/ckpt/README.cpr
 %%SGE_BASE%%/ckpt/README.cray
 %%SGE_BASE%%/ckpt/checkpoint_command
@@ -163,7 +167,6 @@
 %%SGE_BASE%%/examples/drmaa/howto5.c
 %%SGE_BASE%%/examples/drmaa/howto6.c
 %%SGE_BASE%%/examples/jobs/array_submitter.sh
-%%SGE_BASE%%/examples/jobs/hello.bat
 %%SGE_BASE%%/examples/jobs/jobnet_submitter.sh
 %%SGE_BASE%%/examples/jobs/pascal.sh
 %%SGE_BASE%%/examples/jobs/pminiworm.sh
@@ -171,19 +174,16 @@
 %%SGE_BASE%%/examples/jobs/sleeper.sh
 %%SGE_BASE%%/examples/jobs/step_A_array_submitter.sh
 %%SGE_BASE%%/examples/jobs/step_B_array_submitter.sh
-%%SGE_BASE%%/examples/jobs/worker.exe
 %%SGE_BASE%%/examples/jobs/worker.sh
 %%SGE_BASE%%/examples/jobsbin/%%SGE_ARCH%%/work
 %%SGE_BASE%%/include/drmaa.h
 %%SGE_BASE%%/inst_sge
 %%SGE_BASE%%/install_execd
 %%SGE_BASE%%/install_qmaster
-%%SGE_BASE%%/lib/drmaa-0.5.jar
 %%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
-%%SGE_BASE%%/lib/%%SGE_ARCH%%/libdrmaa.so.0.95
 %%SGE_BASE%%/lib/%%SGE_ARCH%%/libdrmaa.so.1.0
 %%SGE_BASE%%/lib/%%SGE_ARCH%%/libjuti.so
 %%BDB_SPOOL%%%%SGE_BASE%%/lib/%%SGE_ARCH%%/libspoolb.so
@@ -229,6 +229,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/big/toolbar_ar.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_browser.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_calendar.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_ckpt.xpm
@@ -311,6 +312,7 @@
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/stdoutput_ins.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/str.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/time.xpm
+%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_ar.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_browser.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_calendar.xpm
 %%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_ckpt.xpm
@@ -364,9 +366,16 @@
 %%SGE_BASE%%/util/install_modules/inst_schedd_high.conf
 %%SGE_BASE%%/util/install_modules/inst_schedd_max.conf
 %%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
+%%SGE_BASE%%/util/jmxremote.password
 %%SGE_BASE%%/util/logchecker.sh
+%%SGE_BASE%%/util/logging.properties.template
+%%SGE_BASE%%/util/management.properties.template
 %%SGE_BASE%%/util/qtask
 %%SGE_BASE%%/util/rctemplates/darwin_template
 %%SGE_BASE%%/util/rctemplates/sgebdb_template
@@ -435,18 +444,30 @@
 %%SGE_BASE%%/util/resources/pe/make.sge_pqs_api
 %%SGE_BASE%%/util/resources/schemas/qhost/qhost.xsd
 %%SGE_BASE%%/util/resources/schemas/qquota/qquota.xsd
+%%SGE_BASE%%/util/resources/schemas/qrstat/qrstat.xsd
 %%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
 %%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
 %%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
 %%SGE_BASE%%/util/resources/starter_methods/settaskid.sh
+%%SGE_BASE%%/util/resources/usersets/arusers
 %%SGE_BASE%%/util/resources/usersets/deadlineusers
 %%SGE_BASE%%/util/resources/usersets/defaultdepartment
+%%SGE_BASE%%/util/rmiconsole.policy
 %%SGE_BASE%%/util/setfileperm.sh
 %%SGE_BASE%%/util/sgeCA/renew_all_certs.csh
 %%SGE_BASE%%/util/sgeCA/sge_ca
 %%SGE_BASE%%/util/sgeCA/sge_ca.cnf
 %%SGE_BASE%%/util/sgeCA/sge_ssl.cnf
 %%SGE_BASE%%/util/sgeCA/sge_ssl_template.cnf
+%%SGE_BASE%%/util/sgeSMF/bdb_template.xml
+%%SGE_BASE%%/util/sgeSMF/execd_template.xml
+%%SGE_BASE%%/util/sgeSMF/qmaster_template.xml
+%%SGE_BASE%%/util/sgeSMF/sge_smf.sh
+%%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
@@ -813,10 +834,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/logfile-trimming.asc
 @dirrm %%SGE_BASE%%/utilbin/%%SGE_ARCH%%
 @dirrm %%SGE_BASE%%/utilbin
+@dirrm %%SGE_BASE%%/util/sgeST
+@dirrm %%SGE_BASE%%/util/sgeSMF
 @dirrm %%SGE_BASE%%/util/sgeCA
 @dirrm %%SGE_BASE%%/util/resources/usersets
 @dirrm %%SGE_BASE%%/util/resources/starter_methods
 @dirrm %%SGE_BASE%%/util/resources/schemas/qstat
+@dirrm %%SGE_BASE%%/util/resources/schemas/qrstat
 @dirrm %%SGE_BASE%%/util/resources/schemas/qquota
 @dirrm %%SGE_BASE%%/util/resources/schemas/qhost
 @dirrm %%SGE_BASE%%/util/resources/schemas