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]

9 files changed, 90 insertions, 125 deletions

diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 221cf05fed3e..d7fa1edc29f6 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -7,12 +7,11 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/51/
+MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/78/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
-DISTNAME=	sge-V60u7_1_TAG-src
+DISTNAME=	sge-V60u8_TAG-src
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Sun Grid Engine, a batch queueing system
@@ -24,7 +23,7 @@ FETCH_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
-OPTIONS=	BDB "Use DB based spooler (currently broken)" off \
+OPTIONS=	BDB "Use DB based spooler" on \
 		DRMAA "Support the Java DRMAA API (requires native Java)" on \
 		QMON "Qmon support (requires X and Motif)" on
 
@@ -52,8 +51,8 @@ FETCH_CMD=	wget -c
 SGE_BASE?=	sge
 SGE_ROOT=	${TARGETDIR}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
-SGE_VERSION=	6.0.7.1
-SGE_RELEASE=	6.0u7_1
+SGE_VERSION=	6.0.8
+SGE_RELEASE=	6.0u8
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
 PLIST_SUB+=	SGE_BASE=${SGE_BASE}
@@ -122,7 +121,6 @@ JAVA_VERSION=	1.4+
 JAVA_OS=	native
 JAVA_BUILD=	jdk
 JAVA_RUN=	jre
-.include "${PORTSDIR}/Mk/bsd.java.mk"
 ANT?=		${LOCALBASE}/bin/ant
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 PLIST_SUB+=	DRMAA=
@@ -167,9 +165,9 @@ post-patch:
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \
 	    ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
-	    ${WRKSRC}/scripts/distinst.site
+	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \
+	    ${FILESDIR}/distinst.private > ${WRKSRC}/distinst.private
 
 do-build:
 	cd ${WRKSRC} && ${AIMK_CMD} -only-depend
@@ -222,6 +220,8 @@ build-plist: build
 	    ${SED} -e 's|^${TMP_SGE_ROOT}|%%SGE_BASE%%|' \
 		-e 's|${SGE_ARCH}|%%SGE_ARCH%%|' \
 		-e 's|\(.*libspool[bc].so\)|%%BDB_SPOOL%%\1|' \
+		-e 's|\(.*libdb-4.2.so\)|%%BDB_SPOOL%%\1|' \
+		-e 's|\(.*utilbin.*db_.*\)|%%BDB_SPOOL%%\1|' \
 		-e 's|\(.*libXltree.so\)|%%QMON%%\1|' \
 		-e 's|\(.*qmon.*\)|%%QMON%%\1|' \
 	    > ${PLIST}
diff --git a/sysutils/sge61/Makefile.man b/sysutils/sge61/Makefile.man
index 77ce0de3243a..0cd09afcb66f 100644
--- a/sysutils/sge61/Makefile.man
+++ b/sysutils/sge61/Makefile.man
@@ -15,6 +15,7 @@ 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
+MLINKS+=drmaa_misc.3 drmaa_get_DRMAA_implementation.3
 MLINKS+=drmaa_misc.3 drmaa_get_DRM_system.3
 MLINKS+=drmaa_jobtemplate.3 drmaa_get_attribute.3
 MLINKS+=drmaa_attributes.3 drmaa_get_attribute_names.3
@@ -23,8 +24,8 @@ MLINKS+=drmaa_attributes.3 drmaa_get_next_attr_name.3
 MLINKS+=drmaa_jobtemplate.3 drmaa_get_next_attr_value.3
 MLINKS+=drmaa_submit.3 drmaa_get_next_job_id.3
 MLINKS+=drmaa_jobtemplate.3 drmaa_get_vector_attribute.3
-MLINKS+=drmaa_attributes.3 drmaa_get_vector_attribute_names.3
 MLINKS+=drmaa_session.3 drmaa_init.3
+MLINKS+=drmaa_attributes.3 drmaa_get_vector_attribute_names.3
 MLINKS+=drmaa_jobcontrol.3 drmaa_job_ps.3
 MLINKS+=drmaa_attributes.3 drmaa_release_attr_names.3
 MLINKS+=drmaa_jobtemplate.3 drmaa_release_attr_values.3
diff --git a/sysutils/sge61/distinfo b/sysutils/sge61/distinfo
index 1e95f85b86e3..f28368c70d1e 100644
--- a/sysutils/sge61/distinfo
+++ b/sysutils/sge61/distinfo
@@ -1,3 +1,3 @@
-MD5 (sge-V60u7_1_TAG-src.tar.gz) = a242676d3090e89d8389ac18313b2dda
-SHA256 (sge-V60u7_1_TAG-src.tar.gz) = 88696f705bdd54e915b2b696129c6018fcdee014df3bbbafa529b601ea814fbe
-SIZE (sge-V60u7_1_TAG-src.tar.gz) = 10570395
+MD5 (sge-V60u8_TAG-src.tar.gz) = a4b5d7ec5975f1f96dcbe28934ae078c
+SHA256 (sge-V60u8_TAG-src.tar.gz) = 5e907238b3fb05bfc256bf119287289ef944e742e4aef12486790c0383c36794
+SIZE (sge-V60u8_TAG-src.tar.gz) = 10593210
diff --git a/sysutils/sge61/files/distinst.private b/sysutils/sge61/files/distinst.private
index 6035aebf60dc..35080f0e83e9 100644
--- a/sysutils/sge61/files/distinst.private
+++ b/sysutils/sge61/files/distinst.private
@@ -1,3 +1,4 @@
 # $FreeBSD$
 OPENSSLBASE=%%OPENSSLBASE%%
 BERKELEYDBBASE=%%LOCALBASE%%
+BDB_LIB_SUFFIX="-4.2"
diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk
index 7936b6d9c408..dbb6393730ee 100644
--- a/sysutils/sge61/files/patch-aimk
+++ b/sysutils/sge61/files/patch-aimk
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- aimk.orig	Tue Oct 25 17:48:15 2005
-+++ aimk	Mon Dec  4 15:57:37 2006
+--- aimk.orig
++++ aimk
 @@ -397,7 +397,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1180,12 +1180,12 @@
+@@ -1177,27 +1177,27 @@
     set MAKE = gmake
     set OFLAG = "-O"
     set ARFLAGS     = rcv
@@ -26,11 +26,17 @@ $FreeBSD$
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
 +   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I%%X11BASE%%/include"
     set NOERR_CFLAG = "-Wno-error"
-    set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
+-   set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
++   set LFLAGS   = "-export-dynamic $DEBUG_FLAG $LFLAGS"
     set LIBS     = "$LIBS -lkvm"
-@@ -1196,11 +1196,11 @@
+    set SHAREDLD = $CC
+    set SHARED_CFLAGS = "-fPIC"
+-   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared" 
++   set SHARED_LFLAGS = "-export-dynamic $SHARED_LFLAGS -L. -shared" 
+    
     set XMTDEF   = ""
-    set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
+-   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
++   set XINCD    = "$XMTINCD $XINCD -I%%X11BASE%%/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib"
 +   set XLIBD    = "-L%%X11BASE%%/lib"
diff --git a/sysutils/sge61/files/patch-scripts_distinst b/sysutils/sge61/files/patch-scripts_distinst
index 3a23c9e8bfbb..45f59ab1fd46 100644
--- a/sysutils/sge61/files/patch-scripts_distinst
+++ b/sysutils/sge61/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
diff --git a/sysutils/sge61/files/patch-scripts_distinst.site b/sysutils/sge61/files/patch-scripts_distinst.site
deleted file mode 100644
index 8ccda77fcd24..000000000000
--- a/sysutils/sge61/files/patch-scripts_distinst.site
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- scripts/distinst.site.orig
-+++ scripts/distinst.site
-@@ -31,7 +31,7 @@
- #___INFO__MARK_END__
- 
- # 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/sge-freebsd-pdc.diff b/sysutils/sge61/files/sge-freebsd-pdc.diff
index 1c0034afdd2f..621cee7e6e2e 100644
--- a/sysutils/sge61/files/sge-freebsd-pdc.diff
+++ b/sysutils/sge61/files/sge-freebsd-pdc.diff
@@ -236,8 +236,8 @@
  
     #ifdef COMPILE_DC
  
--   #  if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+   #  if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
+-#  if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
++#  if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
  
        {
           lList *rlp = NULL;
diff --git a/sysutils/sge61/pkg-plist b/sysutils/sge61/pkg-plist
index ef9075e288f3..07bf2c589b71 100644
--- a/sysutils/sge61/pkg-plist
+++ b/sysutils/sge61/pkg-plist
@@ -61,6 +61,7 @@
 %%SGE_BASE%%/catman/cat/cat3/drmaa_control.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_delete_job_template.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_exit.3
+%%SGE_BASE%%/catman/cat/cat3/drmaa_get_DRMAA_implementation.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_get_DRM_system.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_get_attribute.3
 %%SGE_BASE%%/catman/cat/cat3/drmaa_get_attribute_names.3
@@ -166,9 +167,12 @@
 %%SGE_BASE%%/install_execd
 %%SGE_BASE%%/install_qmaster
 %%QMON%%%%SGE_BASE%%/lib/%%SGE_ARCH%%/libXltree.so
+%%SGE_BASE%%/lib/%%SGE_ARCH%%/libcrypto.so
+%%BDB_SPOOL%%%%SGE_BASE%%/lib/%%SGE_ARCH%%/libdb-4.2.so
 %%SGE_BASE%%/lib/%%SGE_ARCH%%/libdrmaa.so
 %%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%%/mpi/README
 %%SGE_BASE%%/mpi/README.atm
 %%SGE_BASE%%/mpi/hostname
@@ -427,19 +431,19 @@
 %%SGE_BASE%%/util/sge_request
 %%SGE_BASE%%/util/sgeremoterun
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/berkeley_db_svc-4.2
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/berkeley_db_svc
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/checkprog
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/checkuser
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_archive-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_checkpoint-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_deadlock-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_dump-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_load-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_printlog-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_recover-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_stat-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_upgrade-4.2
-%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_verify-4.2
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_archive
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_checkpoint
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_deadlock
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_dump
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_load
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_printlog
+%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/db_recover
+%%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%%/filestat
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/fstype
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/gethostbyaddr