Minor change that do not change the installed packages.

 - Replace the non-standard knobs DRMAA and QMON with JAVA and X11
   respectivly so system wide setting have the desired effect.
 - Fix installation in the !X11 case.
 - Add a comment the dependency on wget indicating why we need to use it
   (the download site requires cookies). [1]

Requested by:	des [1]

1 files changed, 17 insertions, 7 deletions

diff --git a/sysutils/sge62/files/patch-scripts_distinst b/sysutils/sge62/files/patch-scripts_distinst
index 27b5dd297f6f..efa10cbd2a6f 100644
--- a/sysutils/sge62/files/patch-scripts_distinst
+++ b/sysutils/sge62/files/patch-scripts_distinst
@@ -12,7 +12,17 @@ $FreeBSD$
            install_execd install_qmaster lib man mpi pvm qmon util utilbin"
  
  HASARCHDIR="bin lib examples/jobsbin utilbin"
-@@ -735,17 +735,6 @@
+@@ -64,8 +64,7 @@
+                   libsgeobj libsgeobjd \
+                   libevc libevm libmir"
+ 
+-QMON_SHARED_LIBRARIES="libXbae libXicon libXmt libXspin libXtab"
+-QMON_NEED_SHARED_LIBRARIES="libXltree"
++QMON_SHARED_LIBRARIES="libXbae libXicon libXmt libXspin libXtab libXltree"
+ OPENSSL_SHARED_LIBRARIES="libcrypto libssl"
+ 
+ BERKELEYDB_SHARED_LIBRARIES="libdb-4.2"
+@@ -735,17 +734,6 @@
  echo   "    Installing:" $PROG
  echo   " Architectures:" $ARCH
  echo   "Base directory:" $DEST_SGE_ROOT
@@ -30,7 +40,7 @@ $FreeBSD$
  
  echo
  
-@@ -807,6 +796,9 @@
+@@ -807,6 +795,9 @@
           instmpi=true
           instcommon=true
           ;;
@@ -40,7 +50,7 @@ $FreeBSD$
        qmontree)
           instqmon=true
           instcommon=true
-@@ -1014,19 +1006,6 @@
+@@ -1010,19 +1001,6 @@
           Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
        done
  
@@ -60,7 +70,7 @@ $FreeBSD$
        Cleanup mpi
     fi
  
-@@ -1174,7 +1153,7 @@
+@@ -1171,7 +1149,7 @@
  
        for prog in $PROG; do
           case $prog in
@@ -69,7 +79,7 @@ $FreeBSD$
                 : 
                 ;;
              qmake)
-@@ -1272,6 +1251,8 @@
+@@ -1280,6 +1258,8 @@
                       InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
                    elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
                       InstallProg $BERKELEYDBBASE/bin/$prog
@@ -78,7 +88,7 @@ $FreeBSD$
                    fi
                 fi
              elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
-@@ -1386,13 +1367,15 @@
+@@ -1394,13 +1374,15 @@
                    libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext"
                 elif [ $DSTARCH = darwin -o $DSTARCH = darwin-x86 ];  then
                    libname="$OPENSSLBASE/$DSTARCH/lib/libssl.bundle"
@@ -95,7 +105,7 @@ $FreeBSD$
                       :
                    else
                       (cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; ln -s $lib.${shlibext}.0.9.7 $lib.$shlibext)
-@@ -1407,7 +1390,11 @@
+@@ -1415,7 +1397,11 @@
           if [ $DSTARCH != win32-x86 ]; then
              if [ $instbdb = true ]; then
                 for lib in $BERKELEYDB_SHARED_LIBRARIES; do