Upgrade to SGE 6.0 Update4.

There are significant conceptual differences between SGE 5 and SGE
6 so potential upgraders should beware.  At the file level the two
are entierly incompatable so SGE 5 must be removed before SGE 6 is
installed.

The port has seen limited testing so beware.

16 files changed, 336 insertions, 112 deletions

diff --git a/sysutils/sge61/files/aimk.private b/sysutils/sge61/files/aimk.private
new file mode 100644
index 000000000000..ed153420e88b
--- /dev/null
+++ b/sysutils/sge61/files/aimk.private
@@ -0,0 +1,5 @@
+# $FreeBSD$
+set OPENSSL_HOME = %%OPENSSLBASE%%
+set BERKELEYDB_HOME = %%LOCALBASE%%
+set BDB_INCLUDE_SUBDIR = db42
+set BDB_LIB_SUFFIX = -4.2
diff --git a/sysutils/sge61/files/distinst.private b/sysutils/sge61/files/distinst.private
new file mode 100644
index 000000000000..6035aebf60dc
--- /dev/null
+++ b/sysutils/sge61/files/distinst.private
@@ -0,0 +1,3 @@
+# $FreeBSD$
+OPENSSLBASE=%%OPENSSLBASE%%
+BERKELEYDBBASE=%%LOCALBASE%%
diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk
index 276eecaeb1dd..90b307c388a6 100644
--- a/sysutils/sge61/files/patch-aimk
+++ b/sysutils/sge61/files/patch-aimk
@@ -1,23 +1,18 @@
 
 $FreeBSD$
 
---- aimk.orig	Tue Jan 20 16:26:10 2004
-+++ aimk	Tue Jan 20 16:50:43 2004
-@@ -256,11 +256,11 @@
+--- aimk.orig
++++ aimk
+@@ -397,7 +397,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
-    set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
+    set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
  else
--   set INP_CFLAGS = ""
-+   set INP_CFLAGS = "%%CFLAGS%%"
+-   set INP_CFLAGS    = ""
++   set INP_CFLAGS    = "%%CFLAGS%%"
  endif
  
- set   CFLAGS       = "$INP_CFLAGS"
--set   CXXFLAGS     = "$CFLAGS"
-+set   CXXFLAGS     = "%%CXXFLAGS%%"
- set   CORE_INCLUDE = "-I../security/sec -I../common -I../libs/uti -I../libs/gdi -I../libs/cull -I../libs/rmon -I../libs/comm -I../libs/sched -I../daemons/common -I../daemons/commd -I../daemons/qmaster -I../daemons/execd -I../daemons/schedd -I../clients/common -I."
- 
- set   ADD_COPYRIGHT     = 0
-@@ -1058,8 +1058,8 @@
+ # Default build targets for which we have seperate make files
+@@ -1171,8 +1171,8 @@
     set MAKE = gmake
     set OFLAG = "-O"
     set ARFLAGS     = rcv
@@ -28,3 +23,12 @@ $FreeBSD$
     set DLLIB	= ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
+@@ -1191,7 +1191,7 @@
+    set XLFLAGS  = "$XLIBD"
+    set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
+    set RM	= "rm -f"
+-   set JAVA_ARCH = ""
++   set JAVA_ARCH = "freebsd"
+    breaksw 
+ 
+ case NETBSD_*:
diff --git a/sysutils/sge61/files/patch-aimk.site b/sysutils/sge61/files/patch-aimk.site
deleted file mode 100644
index 4df3e37d3f80..000000000000
--- a/sysutils/sge61/files/patch-aimk.site
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- aimk.site.orig	Thu Mar 25 07:00:59 2004
-+++ aimk.site	Tue Mar 30 13:03:37 2004
-@@ -34,7 +34,7 @@
- # OPENSSL_HOME the directory where the include and lib directory of openssl
- # is installed
- #
--set OPENSSL_HOME = /vol2/tools/SW/openssl-0.9.7d-static/$buildarch
-+set OPENSSL_HOME = /usr
- 
- # 
- # KRB_HOME the directory where the include and lib directory of kerberos is
diff --git a/sysutils/sge61/files/patch-dist_inst__sge b/sysutils/sge61/files/patch-dist_inst__sge
index 012824f59776..9e02407187e2 100644
--- a/sysutils/sge61/files/patch-dist_inst__sge
+++ b/sysutils/sge61/files/patch-dist_inst__sge
@@ -1,14 +1,23 @@
 
 $FreeBSD$
 
---- dist/inst_sge.orig	Tue Jan 20 16:27:05 2004
-+++ dist/inst_sge	Tue Jan 20 16:50:19 2004
-@@ -2247,7 +2247,7 @@
-       SetCellDependentVariables
-    fi
- 
+--- dist/inst_sge.orig
++++ dist/inst_sge
+@@ -270,7 +270,7 @@
+    GetCell
+    GetQmasterSpoolDir $euid
+    SetCellDependentVariables
 -   SetPermissions
 +#   SetPermissions
-    MakeDirsMaster
     SelectHostNameResolving
-    AddConfiguration
+    SetProductMode
+    MakeDirsMaster
+@@ -344,7 +344,7 @@
+  GetQmasterSpoolDir $euid
+  SetCellDependentVariables
+  WindowsSupport
+- SetPermissions
++# SetPermissions
+  SelectHostNameResolving
+  SetProductMode
+  MakeDirsMaster
diff --git a/sysutils/sge61/files/patch-dist_pvm_src_aimk b/sysutils/sge61/files/patch-dist_pvm_src_aimk
index d9e9e0fdd7f1..c5dc9586d7ba 100644
--- a/sysutils/sge61/files/patch-dist_pvm_src_aimk
+++ b/sysutils/sge61/files/patch-dist_pvm_src_aimk
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- dist/pvm/src/aimk.orig	Fri Jul 20 01:20:20 2001
-+++ dist/pvm/src/aimk	Tue Jan 20 16:50:19 2004
-@@ -66,6 +66,8 @@
-    exit 1
- endif
+--- dist/pvm/src/aimk.orig
++++ dist/pvm/src/aimk
+@@ -73,6 +73,8 @@
+ 
+ setenv ARCH `$SGE_ROOT/util/arch`
  
 +set ARCH = `$SGE_ROOT/util/arch`
 +
  # common compiler and linker settings 
  #
  unsetenv LD_LIBRARY_PATH
-@@ -73,9 +75,9 @@
+@@ -80,9 +82,9 @@
  set MAKE       = make
  set MAKEFILE   = ../Makefile
  set SDIR       = ".."
@@ -24,17 +24,8 @@ $FreeBSD$
  set LIBS       = ""
  set PVM_ROOT   = "$PVM_ROOT"
  set PVM_ARCH   = "$PVM_ARCH"
-@@ -133,8 +135,6 @@
- set CTOR = ""
- set DTOR = ""
- 
--set ARCH = `$SGE_ROOT/util/arch`
--
- switch ($ARCH)
- 
- case aix41:
-@@ -193,6 +193,16 @@
- case linux:
+@@ -171,6 +173,16 @@
+ case lx24-x86:
     set CC = gcc
     set CFLAGS = "-O -Wall -Werror -Wstrict-prototypes -DLINUX $DEBUG_FLAG $CFLAGS"
 +   set LFLAGS = "$DEBUG_FLAG $LFLAGS"
diff --git a/sysutils/sge61/files/patch-dist_util_arch__variables b/sysutils/sge61/files/patch-dist_util_arch__variables
index 48292e96cff6..7a75f9d6d92d 100644
--- a/sysutils/sge61/files/patch-dist_util_arch__variables
+++ b/sysutils/sge61/files/patch-dist_util_arch__variables
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- dist/util/arch_variables.orig	Tue Jan 20 16:27:10 2004
-+++ dist/util/arch_variables	Tue Jan 20 16:51:45 2004
-@@ -156,14 +156,14 @@
+--- dist/util/arch_variables.orig
++++ dist/util/arch_variables
+@@ -181,14 +181,14 @@
     AWK=/usr/bin/awk
     ECHO="/bin/echo"
     RC_FILE=freebsd
 -   RC_PREFIX=/usr/local/etc/rc.d
-+   RC_PREFIX=%%PREFIX%%/etc/rc.d
++   RC_PREFIX=%%LOCALBASE%%/etc/rc.d
     RC_SUFFIX=.sh
 -   XTERM=/usr/X11R6/bin/xterm
 +   XTERM=%%X11BASE%%/bin/xterm
@@ -18,6 +18,6 @@ $FreeBSD$
     RLOGIN_DAEMON=/usr/libexec/rlogind
 -   GETTEXT=/usr/local/bin/gettext
 +   GETTEXT=%%LOCALBASE%%/bin/gettext
+    RSH_DAEMON=undef
     ROOTGROUP=wheel
-    ;;
-  darwin)
+    LOADSENSOR_COMMAND=undef
diff --git a/sysutils/sge61/files/patch-dist_util_install__modules_inst__common.sh b/sysutils/sge61/files/patch-dist_util_install__modules_inst__common.sh
new file mode 100644
index 000000000000..4487e583f433
--- /dev/null
+++ b/sysutils/sge61/files/patch-dist_util_install__modules_inst__common.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- dist/util/install_modules/inst_common.sh.orig
++++ dist/util/install_modules/inst_common.sh
+@@ -1169,8 +1169,9 @@
+       Execute cp $SGE_STARTUP_FILE $RC_PREFIX/$STARTUP_FILE_NAME
+       /usr/sbin/update-rc.d $STARTUP_FILE_NAME defaults 95 03
+    elif [ "$RC_FILE" = "freebsd" ]; then
+-      echo  cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
+-      Execute cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
++# XXX: should add the rc.subr script to the main distribution
++#      echo  cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
++#      Execute cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
+    elif [ "$RC_FILE" = "SGE" ]; then
+       echo  mkdir -p "$RC_PREFIX/$RC_DIR"
+       Execute mkdir -p "$RC_PREFIX/$RC_DIR"
+@@ -1902,8 +1903,8 @@
+       Execute rm $SGE_STARTUP_FILE $RC_PREFIX/$STARTUP_FILE_NAME
+       /sbin/insserv -r $RC_PREFIX/$STARTUP_FILE_NAME
+    elif [ "$RC_FILE" = "freebsd" ]; then
+-      echo  rm $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
+-      Execute rm $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
++      #echo  rm $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
++      #Execute rm $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
+    elif [ "$RC_FILE" = "SGE" ]; then
+       if [ $hosttype = "master" ]; then
+         DARWIN_GEN_REPLACE="#GENMASTERRC"
diff --git a/sysutils/sge61/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h b/sysutils/sge61/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h
new file mode 100644
index 000000000000..0cbbab1cdf91
--- /dev/null
+++ b/sysutils/sge61/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libs/spool/flatfile/sge_spooling_flatfile_scanner.h.orig
++++ libs/spool/flatfile/sge_spooling_flatfile_scanner.h
+@@ -32,6 +32,7 @@
+  ************************************************************************/
+ /*___INFO__MARK_END__*/       
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ 
+ typedef enum {
diff --git a/sysutils/sge61/files/patch-scripts_distinst b/sysutils/sge61/files/patch-scripts_distinst
index 3c548d80e120..0701a86f8ecb 100644
--- a/sysutils/sge61/files/patch-scripts_distinst
+++ b/sysutils/sge61/files/patch-scripts_distinst
@@ -1,22 +1,50 @@
 
 $FreeBSD$
 
---- scripts/distinst.orig	Tue Jan 20 16:28:32 2004
-+++ scripts/distinst	Wed Jan 21 14:52:27 2004
-@@ -49,7 +49,7 @@
- fi
+--- scripts/distinst.orig
++++ scripts/distinst
+@@ -35,7 +35,7 @@
  
+ umask 022
+ 
+-TOPFILES="3rd_party bin catman ckpt doc examples include inst_sge \
++TOPFILES="3rd_party bin ckpt doc examples include inst_sge \
+           install_execd install_qmaster lib man mpi pvm qmon util utilbin"
  
--HASDIR="ckpt doc examples/jobs locale mpi pvm qmon/PIXMAPS/big"
-+HASDIR="ckpt doc examples/jobs mpi pvm qmon/PIXMAPS/big"
  HASARCHDIR="bin lib examples/jobsbin utilbin"
+@@ -66,9 +66,9 @@
+ 
+ QMON_SHARED_LIBRARIES="libXbae libXicon libXmt libXspin libXtab"
+ QMON_NEED_SHARED_LIBRARIES="libXltree"
+-OPENSSL_SHARED_LIBRARIES="libcrypto libssl"
++#OPENSSL_SHARED_LIBRARIES="libcrypto libssl"
+ 
+-BERKELEYDB_SHARED_LIBRARIES="libdb-4.2"
++#BERKELEYDB_SHARED_LIBRARIES="libdb-4.2"
+ 
+ DRMAA_SHARED_LIBRARIES="libdrmaa"
+ DRMAA_HEADER_FILES="libs/japi/drmaa.h"
+@@ -420,6 +420,15 @@
+ }
+ 
+ #-------------------------------------------------------------------------
++# Symlink a program inplace rather then installing it.  Useful for
++# using OS versions of systems like OpenSSL.
++LinkFile()
++{
++	echo Linking $1
++	ln -s $1 $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH/`basename $1`
++}
++
++#-------------------------------------------------------------------------
+ # MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN MAIN
  
- DEFAULTPROG="sge_qmaster sge_execd sge_shadowd sge_commd sge_schedd \
-@@ -543,17 +543,6 @@
- echo "    Installing:" $PROG
- echo " Architectures:" $ARCH
- echo "Base directory:" $DEST_SGE_ROOT
--echo "   OK [Y/N][Y]: "
+ # How else I can find out that I'm user root?
+@@ -730,17 +739,6 @@
+ echo   "    Installing:" $PROG
+ echo   " Architectures:" $ARCH
+ echo   "Base directory:" $DEST_SGE_ROOT
+-printf "   OK [Y/N][Y]: "
 -
 -read ans
 -if [ "$ans" = y -o "$ans" = Y -o "$ans" = "" ]; then
@@ -30,22 +58,82 @@ $FreeBSD$
  
  echo
  
-@@ -663,12 +652,12 @@
-          Execute chmod 755 $DEST_SGE_ROOT/inst_sge
-          Execute sed 's/PREFIX/sge/' dist/install_qmaster > $DEST_SGE_ROOT/install_qmaster
-          Execute sed 's/PREFIX/sge/' dist/install_execd > $DEST_SGE_ROOT/install_execd
--         if [ "$SGE_PRODUCT_MODE" = ge ]; then
--             :
--            (cd $DEST_SGE_ROOT; ln -s inst_sge inst_sgeee)
--            Execute cp dist/README.inst_sgeee $DEST_SGE_ROOT
--            Execute chmod 644 $DEST_SGE_ROOT/README.inst_sgeee
--         fi
-+	 #if [ "$SGE_PRODUCT_MODE" = ge ]; then
-+	 #    :
-+	 #   (cd $DEST_SGE_ROOT; ln -s inst_sge inst_sgeee)
-+	 #   Execute cp dist/README.inst_sgeee $DEST_SGE_ROOT
-+	 #   Execute chmod 644 $DEST_SGE_ROOT/README.inst_sgeee
-+	 #fi
-       else
-          echo Installing \"inst_sge\" as \"inst_sgeee\"
-          Execute cp dist/inst_sge $DEST_SGE_ROOT/inst_sgeee
+@@ -803,6 +801,9 @@
+          instqmon=true
+          instcommon=true
+          ;;
++      noqmon)
++         instqmon=false
++         ;;
+       sec)
+          instsec=true
+          instcommon=true
+@@ -1006,25 +1007,25 @@
+          Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
+       done
+ 
+-      HPCBASE=mpi/SunHPCT5
+-      Execute mkdir -p $DEST_SGE_ROOT/$HPCBASE
+-      
+-      for f in $SUNHPCTIGHT_FILES; do
+-         Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
+-         Execute chmod 644 $DEST_SGE_ROOT/$HPCBASE/$f
+-      done
+-   
+-      for f in $SUNHPCTIGHT_SCRIPTS; do
+-         Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
+-         Execute chmod 755 $DEST_SGE_ROOT/$HPCBASE/$f
+-      done
++#      HPCBASE=mpi/SunHPCT5
++#      Execute mkdir -p $DEST_SGE_ROOT/$HPCBASE
++#      
++#      for f in $SUNHPCTIGHT_FILES; do
++#         Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
++#         Execute chmod 644 $DEST_SGE_ROOT/$HPCBASE/$f
++#      done
++#   
++#      for f in $SUNHPCTIGHT_SCRIPTS; do
++#         Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
++#         Execute chmod 755 $DEST_SGE_ROOT/$HPCBASE/$f
++#      done
+ 
+       Cleanup mpi
+    fi
+ 
+    if [ $instman = true ]; then
+       echo Installing \"man/\" and \"catman/\"
+-      Execute rm -rf $DEST_SGE_ROOT/man $DEST_SGE_ROOT/catman
++##      Execute rm -rf $DEST_SGE_ROOT/man $DEST_SGE_ROOT/catman
+       Execute cp -r MANSBUILD_$MANSRCDIR/SEDMAN/man $DEST_SGE_ROOT
+ 
+       if [ -d MANSBUILD_$MANSRCDIR/ASCMAN/catman ]; then
+@@ -1146,7 +1147,7 @@
+ 
+       for prog in $PROG; do
+          case $prog in
+-            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|qmontree|common|distcommon|utilbin)
++            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|noqmon|qmontree|common|distcommon|utilbin)
+                : 
+                ;;
+             qmake)
+@@ -1224,18 +1225,12 @@
+          echo "---------------------------"
+          for prog in $UTILITYBINARIES; do
+             if [ $prog = openssl ]; then
+-               if [ -f $OPENSSLBASE/$DSTARCH/bin/openssl ]; then
+-                  InstallProg $OPENSSLBASE/$DSTARCH/bin/openssl
+-               elif [ -f $OPENSSLBASE/bin/openssl ]; then
+-                  InstallProg $OPENSSLBASE/bin/openssl
+-               else
+-                  echo \"openssl\" binary not found
+-               fi
++               LinkFile $OPENSSLBASE/bin/openssl
+             elif [ $prog = testsuidroot ]; then
+                InstallProgSUID $prog
+             elif [ $prog = berkeley_db_svc -o $prog = db_archive -o $prog = db_checkpoint -o $prog = db_deadlock -o $prog = db_dump -o $prog = db_load -o $prog = db_printlog -o $prog = db_recover -o $prog = db_stat -o $prog = db_upgrade -o $prog = db_verify ]; then
+                if [ "$DSTARCH" != "win32-x86" ]; then
+-                  InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
++                  LinkFile $BERKELEYDBBASE/bin/${prog}-4.2
+                fi
+             elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
+                if [ $instclassictargets = false ]; then
diff --git a/sysutils/sge61/files/patch-scripts_distinst.site b/sysutils/sge61/files/patch-scripts_distinst.site
index f976ee9501c7..8ccda77fcd24 100644
--- a/sysutils/sge61/files/patch-scripts_distinst.site
+++ b/sysutils/sge61/files/patch-scripts_distinst.site
@@ -1,11 +1,15 @@
 
 $FreeBSD$
 
---- scripts/distinst.site.orig	Thu Mar 25 07:01:00 2004
-+++ scripts/distinst.site	Tue Mar 30 13:04:21 2004
-@@ -34,4 +34,4 @@
- BASEDIR=/dist/OS-SGEDIST
+--- scripts/distinst.site.orig
++++ scripts/distinst.site
+@@ -31,7 +31,7 @@
+ #___INFO__MARK_END__
  
- # Base directory where the openssl binary resides
--OPENSSL_HOME=/vol2/tools/SW/openssl-0.9.7d-static
-+OPENSSL_HOME=/usr
+ # Base directory where the openssl binary and libraries reside
+-OPENSSLBASE=/vol2/tools/SW/openssl-0.9.7e
++OPENSSLBASE=%%OPENSSLBASE%%
+ 
+ # Base directory where BDB resides
+-BERKELEYDBBASE=/vol2/SW/db-4.2.52
++BERKELEYDBBASE=%%LOCALBASE%%
diff --git a/sysutils/sge61/files/patch-utilbin_infotext.c b/sysutils/sge61/files/patch-utilbin_infotext.c
deleted file mode 100644
index bd5cb521812e..000000000000
--- a/sysutils/sge61/files/patch-utilbin_infotext.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- utilbin/infotext.c.orig	Tue Mar 30 16:50:40 2004
-+++ utilbin/infotext.c	Tue Mar 30 16:51:20 2004
-@@ -1035,7 +1035,7 @@
-    DPRINTF(("pass 4\n"));
-    {
-       if (real_args > 0) {
--#if defined(ALPHA) || defined(ALPHA5) || defined(ALINUX) || defined(HP11) || defined(HP10) || __GNUC__ == 3
-+#if defined(ALPHA) || defined(ALPHA5) || defined(ALINUX) || defined(HP11) || defined(HP10) || defined(FREEBSD_ALPHA) || __GNUC__ == 3
-       for(i=0;i<real_args;i++) {
- /*      printf("argument[%d]: \"%s\"\n",i,argv[first_arg +i]); */
-          sge_dstring_copy_string(&buffer, sge_infotext_string_replace(&tmp_buf, (char*)sge_dstring_get_string(&buffer2),"%s",argv[first_arg +i],1));
diff --git a/sysutils/sge61/files/pkg-install.in b/sysutils/sge61/files/pkg-install.in
new file mode 100644
index 000000000000..118e3eecd914
--- /dev/null
+++ b/sysutils/sge61/files/pkg-install.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+u=sgeadmin
+g=sgeadmin
+ugid=103
+homedir=/nonexistent
+shell=/sbin/nologin
+comment="Sun Grid Engine Admin"
+
+case $2 in
+POST-INSTALL)
+	if pw group show "${g}" >/dev/null 2>&1; then
+		echo "Using existing group \"${g}\"."
+	else
+		echo "Creating group \"${g}\", (gid: ${ugid})."
+		pw groupadd ${g} -g ${ugid}
+		if [ $? != 0 ]; then
+			echo "Failed to add group \"${g}\"."
+			exit 1
+		fi
+	fi
+	if pw user show "${u}" >/dev/null 2>&1; then
+		echo "Using existing user \"${u}\"."
+	else
+		echo "Creating user \"${u}\", (uid: ${ugid})."
+		pw useradd ${u} -u ${ugid} -g ${ugid} -h - \
+		    -d ${homedir} -s ${shell} -c "${comment}"
+		if [ $? != 0 ]; then
+			echo "Failed to add user \"${u}\"."
+			exit 1
+		fi
+	fi
+	chown ${u}:${g} %%PREFIX%%/%%SGE_BASE%%
+	;;
+esac
diff --git a/sysutils/sge61/files/pkg-message.in b/sysutils/sge61/files/pkg-message.in
index c6e76c317bae..e321f19aefd6 100644
--- a/sysutils/sge61/files/pkg-message.in
+++ b/sysutils/sge61/files/pkg-message.in
@@ -3,11 +3,17 @@ After installation, you need to set up SGE.  Go to
 
 	%%PREFIX%%/%%SGE_BASE%%
 
-and run 'install_qmaster' to set up the master node of the cluster and
-run 'install_execd' for the back-end compute nodes.
+and run './install_qmaster' to set up the master node of the cluster and
+run './install_execd' for the back-end compute nodes.
+
+Before doing so, you should add sge_qmaster and sge_execd services to
+/etc/services or the appropriate network directory service.  Any free
+port numbers may be used.
+
 
 If you desire extra security, add the -csp flag to your qmaster install.
 
+
 If you wish to run PVM applications with SGE you will need to build a
 couple of binaries.  Go to
 
@@ -15,3 +21,4 @@ couple of binaries.  Go to
 
 and type './aimk' followed by './install.sh'.  See the documentation for
 how to set up a pvm environment.
+
diff --git a/sysutils/sge61/files/pthread-types.diff b/sysutils/sge61/files/pthread-types.diff
new file mode 100644
index 000000000000..6f2bbc2b9acc
--- /dev/null
+++ b/sysutils/sge61/files/pthread-types.diff
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libs/uti/sge_profiling.h.orig
++++ libs/uti/sge_profiling.h
+@@ -35,7 +35,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ #include <sys/times.h>
+-
++#include <pthread.h>
+ 
+ #include "basis_types.h"
+ 
diff --git a/sysutils/sge61/files/sge.sh.in b/sysutils/sge61/files/sge.sh.in
new file mode 100644
index 000000000000..f7e29e487aa0
--- /dev/null
+++ b/sysutils/sge61/files/sge.sh.in
@@ -0,0 +1,51 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: sge
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# rc.conf variables:
+#
+# sge_cell		The SGE_CELL for this machine (default=default).
+# sge_qmaster_enable	Start the qmaster and scheduler (default=NO).
+# sge_execd_enable	Start the exec daemon (default=NO).
+
+. %%RC_SUBR%%
+
+SGE_ROOT=%%PREFIX%%/%%SGE_BASE%%
+
+name="sge"
+start_cmd="sge_start"
+stop_cmd="sge_stop"
+
+sge_start()
+{
+	if checkyesno sge_qmaster_enable; then
+		${sgemaster_script} start
+	fi
+	if checkyesno sge_execd_enable; then
+		${sgeexecd_script} start
+	fi
+}
+
+sge_stop()
+{
+	if checkyesno sge_execd_enable; then
+		${sgeexecd_script} stop
+	fi
+	if checkyesno sge_qmaster_enable; then
+		${sgemaster_script} stop
+	fi
+}
+
+load_rc_config $name
+
+sge_qmaster_enable=${sge_qmaster_enable-NO}
+sge_execd_enable=${sge_execd_enable-NO}
+sge_cell=${sge_cell:-default}
+sgemaster_script=${SGE_ROOT}/${sge_cell}/common/sgemaster
+sgeexecd_script=${SGE_ROOT}/${sge_cell}/common/sgeexecd
+
+run_rc_command $*