Upgrade to 6.0u8. No major changes in SGE, but a few port

infrastructure changes:
 - Don't manually include bsd.java.mk since it's no longer necessicary. [1]
 - Fix BDB spooling support[2] and enable it by default.

PR:		ports/99615 [1], ports/99839 [2]
Submitted by:	hq[1], Davide Cittaro <daweonline at gmail>[2]

1 files changed, 45 insertions, 77 deletions

diff --git a/sysutils/sge62/files/patch-scripts_distinst b/sysutils/sge62/files/patch-scripts_distinst
index 3a23c9e8bfbb..45f59ab1fd46 100644
--- a/sysutils/sge62/files/patch-scripts_distinst
+++ b/sysutils/sge62/files/patch-scripts_distinst
@@ -12,35 +12,7 @@ $FreeBSD$
            install_execd install_qmaster lib man mpi pvm qmon util utilbin"
  
  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
- 
- # How else I can find out that I'm user root?
-@@ -730,17 +739,6 @@
+@@ -730,17 +730,6 @@
  echo   "    Installing:" $PROG
  echo   " Architectures:" $ARCH
  echo   "Base directory:" $DEST_SGE_ROOT
@@ -58,17 +30,17 @@ $FreeBSD$
  
  echo
  
-@@ -803,6 +801,9 @@
-          instqmon=true
+@@ -799,6 +788,9 @@
+          instmpi=true
           instcommon=true
           ;;
 +      noqmon)
 +         instqmon=false
 +         ;;
-       sec)
-          instsec=true
+       qmontree)
+          instqmon=true
           instcommon=true
-@@ -1006,25 +1007,25 @@
+@@ -1006,19 +998,6 @@
           Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
        done
  
@@ -84,30 +56,11 @@ $FreeBSD$
 -         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
-@@ -1148,7 +1149,7 @@
+@@ -1148,7 +1127,7 @@
  
        for prog in $PROG; do
           case $prog in
@@ -116,27 +69,42 @@ $FreeBSD$
                 : 
                 ;;
              qmake)
-@@ -1226,13 +1227,7 @@
-          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 \
-@@ -1242,7 +1237,7 @@
-                    -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
+@@ -1246,6 +1225,8 @@
+                      InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
+                   elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
+                      InstallProg $BERKELEYDBBASE/bin/$prog
++		  elif [ -f $BERKELEYDBBASE/bin/$prog${BDB_LIB_SUFFIX} ]; then
++		     InstallProgAs $BERKELEYDBBASE/bin/$prog${BDB_LIB_SUFFIX} $prog
+                   fi
                 fi
              elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
-                if [ "$DSTARCH" != "win32-x86" ]; then
+@@ -1356,13 +1337,15 @@
+                   libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext"
+                elif [ $DSTARCH = darwin ];  then
+                   libname="$OPENSSLBASE/$DSTARCH/lib/$lib.0.9.7.$shlibext"
++	       elif [ ${DSTARCH%%-*} = fbsd ]; then
++                  libname="$OPENSSLBASE/lib/$lib.$shlibext"
+                else
+                   libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext.0.9.7"
+                fi
+ 
+                if [ -f $libname ]; then
+                   InstallProg $libname
+-                  if [ $DSTARCH = tru64 ]; then
++                  if [ $DSTARCH = tru64 -o ${DSTARCH%%-*} = fbsd ]; then
+                      :
+                   elif [ $DSTARCH = darwin ]; then
+                      (cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; \
+@@ -1383,7 +1366,11 @@
+          if [ $DSTARCH != win32-x86 ]; then
+             if [ $instbdb = true ]; then
+                for lib in $BERKELEYDB_SHARED_LIBRARIES; do
+-                  libname="$BERKELEYDBBASE/$DSTARCH/lib/$lib.$shlibext"
++                  if [ ${DSTARCH%%-*} = fbsd ]; then
++                     libname="$BERKELEYDBBASE/lib/$lib.$shlibext"
++                  else
++                     libname="$BERKELEYDBBASE/$DSTARCH/lib/$lib.$shlibext"
++                  fi
+                   if [ -f $libname ]; then
+                      InstallProg $libname
+                   elif [ $exit_on_error = true ]; then