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]

2 files changed, 41 insertions, 23 deletions

diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index bec6e07a7d80..e9dac639c4bd 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	sge-V60u11_TAG-src
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Sun Grid Engine, a batch queueing system
 
+# MASTER_SITE requires cookies, which fetch does not support
 FETCH_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 # We have to use wget because the master site required cookies to
@@ -24,8 +25,8 @@ DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
 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
+		JAVA "Support Java DRMAA API" on \
+		X11 "Qmon X11 GUI" on
 
 CONFLICTS=	sge-5* sgeee-[0-9]* sge-0.*
 
@@ -101,7 +102,7 @@ AIMK_ARGS+=	-spool-classic
 PLIST_SUB+=	BDB_SPOOL="@comment "
 .endif
 
-.if defined(WITH_DRMAA)
+.if defined(WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
@@ -117,7 +118,7 @@ AIMK_ARGS+=	-no-java -no-jni
 PLIST_SUB+=	DRMAA="@comment "
 .endif
 
-.if defined(WITH_QMON)
+.if defined(WITH_X11)
 USE_MOTIF=	yes
 PLIST_SUB+=	QMON=
 QMON=		qmon
@@ -161,26 +162,33 @@ post-patch:
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \
 	    ${FILESDIR}/distinst.private > ${WRKSRC}/distinst.private
+.if !defined(WITH_X11)
+	@${REINPLACE_CMD} -e 's/qmon//' ${WRKSRC}/dist/util/setfileperm.sh
+.endif
 
 do-build:
-	cd ${WRKSRC} && ${AIMK_CMD} -only-depend
-	cd ${WRKSRC} && ./scripts/zerodepend
-	cd ${WRKSRC} && ${AIMK_CMD} depend
-	cd ${WRKSRC} && \
+	@cd ${WRKSRC} && ${AIMK_CMD} -only-depend
+	@cd ${WRKSRC} && ./scripts/zerodepend
+	@cd ${WRKSRC} && ${AIMK_CMD} depend
+	@cd ${WRKSRC} && \
 	    ${AIMK_CMD} -debug && \
 	    ${AIMK_CMD} -man ${SGE_PRODUCT} &&
-	${MKDIR} ${TMP_SGE_ROOT}
-	cd ${WRKSRC} && ${SETENV} SGE_ROOT=${TMP_SGE_ROOT} \
+	@${MKDIR} ${TMP_SGE_ROOT}
+	@cd ${WRKSRC} && ${SETENV} SGE_ROOT=${TMP_SGE_ROOT} \
 	    ./scripts/distinst -local -libs ${SGE_ARCH} -- ${INST_PROGS}
+.if !defined(WITH_X11)
+	@${RM} ${TMP_SGE_ROOT}/catman/cat/cat1/qmon.1
+	@${RM} -r ${TMP_SGE_ROOT}/3rd_party/qmon
+.endif
 
 do-install:
-	${MKDIR} ${SGE_ROOT}
-	cd ${TMP_SGE_ROOT} && \
+	@${MKDIR} ${SGE_ROOT}
+	@cd ${TMP_SGE_ROOT} && \
 	    ${FIND} . | ${TAR} cTf - - | ${TAR} xUCf ${SGE_ROOT} -
-	cd ${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} util/setfileperm.sh -auto ${SGE_ROOT}
+	@cd ${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} util/setfileperm.sh -auto ${SGE_ROOT}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/../doc && ${FIND} * \( -name CVS \
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/../doc && ${FIND} * \( -name CVS \
 	    ${EXCEPTFILES:S/^/-o -name /} \) -a -prune -o -type f -print \
 	    | ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
 .endif
@@ -204,7 +212,7 @@ release-tar: build
 
 # Build a pkg-plist and Makefile.man
 build-plist: build
-#.if defined(WITHOUT_BDB) || defined(WITHOUT_JAVA) || defined(WITHOUT_QMON)
+#.if defined(WITHOUT_BDB) || defined(WITHOUT_JAVA) || defined(WITHOUT_X11)
 #	@echo "ERROR: All OPTIONS must be enabled to build plist!" && ${FALSE}
 #.endif
 	@${FIND} ${TMP_SGE_ROOT}/* -name man -prune -o \
diff --git a/sysutils/sge60/files/patch-scripts_distinst b/sysutils/sge60/files/patch-scripts_distinst
index 27b5dd297f6f..efa10cbd2a6f 100644
--- a/sysutils/sge60/files/patch-scripts_distinst
+++ b/sysutils/sge60/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