aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/sge62
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2008-02-13 23:39:06 +0800
committerbrooks <brooks@FreeBSD.org>2008-02-13 23:39:06 +0800
commitb4ff2fd15b95233d9f65c19dca0d98d31f80a28d (patch)
treed48a8ea7e0cf3429cc0cd5ba3d1abe1e8c4c7ec5 /sysutils/sge62
parent153804e88007a05a6cfda73faeebeb6ffe47c09e (diff)
downloadfreebsd-ports-gnome-b4ff2fd15b95233d9f65c19dca0d98d31f80a28d.tar.gz
freebsd-ports-gnome-b4ff2fd15b95233d9f65c19dca0d98d31f80a28d.tar.zst
freebsd-ports-gnome-b4ff2fd15b95233d9f65c19dca0d98d31f80a28d.zip
Initial port of Sun Grid Engine 6.1.3 derived from the 6.0.x port.
SGE 6.1 contains numerous improvements including resource quotas. A more complete list can be found in the 6.1 release announcment: http://gridengine.sunsource.net/news/SGE61-announce.html
Diffstat (limited to 'sysutils/sge62')
-rw-r--r--sysutils/sge62/Makefile44
-rw-r--r--sysutils/sge62/Makefile.man2
-rw-r--r--sysutils/sge62/distinfo9
-rw-r--r--sysutils/sge62/files/distinst.private1
-rw-r--r--sysutils/sge62/files/patch-aimk24
-rw-r--r--sysutils/sge62/files/patch-dist_inst__sge11
-rw-r--r--sysutils/sge62/files/patch-dist_util_install__modules_inst__common.sh34
-rw-r--r--sysutils/sge62/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h13
-rw-r--r--sysutils/sge62/files/patch-scripts_distinst68
-rw-r--r--sysutils/sge62/files/sge-freebsd-pdc.diff366
-rw-r--r--sysutils/sge62/pkg-plist45
11 files changed, 144 insertions, 473 deletions
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 982e1d1c63ef..360d897a934d 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -8,10 +8,14 @@
PORTNAME= sge
PORTVERSION= ${SGE_VERSION}
CATEGORIES= sysutils parallel
-MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/163/
-MASTER_SITES+= ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/161/:src \
+ http://gridengine.sunsource.net/download/SGE61/:bin \
+ ${MASTER_SITE_LOCAL}:src,bin
MASTER_SITE_SUBDIR= brooks
-DISTNAME= ge-V60u12_TAG-src
+DISTNAME= ge-V${SGE_RELEASE:S/.//}_TAG-src
+DISTFILES= ${DISTNAME}.tar.gz:src \
+ ge-${SGE_RELEASE}-common.tar.gz:bin
+EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= brooks@FreeBSD.org
COMMENT= Sun Grid Engine, a batch queueing system
@@ -28,9 +32,8 @@ OPTIONS= BDB "Use DB based spooler" on \
JAVA "Support Java DRMAA API" on \
X11 "Qmon X11 GUI" on
-CONFLICTS= sge-5* sgeee-[0-9]* sge-0.*
-
-EXTRA_PATCHES= ${FILESDIR}/sge-freebsd-pdc.diff
+LATEST_LINK= sge61
+CONFLICTS= sge-6.[02-9]* sge-5* sgeee-[0-9]* sge-0.*
.if !exists(/usr/include/sys/_pthreadtypes.h)
EXTRA_PATCHES= ${FILESDIR}/pthread-types.diff
@@ -46,8 +49,8 @@ SGE_BASE?= sge
SGE_ROOT= ${PREFIX}/${SGE_BASE}
SGE_ARCH= fbsd-${ARCH}
SGE_BUILD_ARCH= FREEBSD_${ARCH:U}
-SGE_VERSION= 6.0.12
-SGE_RELEASE= 6.0u12
+SGE_RELEASE= 6.1u3
+SGE_VERSION= ${SGE_RELEASE:S/u/./}
PLIST_SUB+= SGE_ARCH=${SGE_ARCH}
PLIST_SUB+= SGE_BASE=${SGE_BASE}
@@ -63,6 +66,7 @@ WRKSRC= ${WRKDIR}/gridengine/source
TMP_SGE_ROOT= ${WRKDIR}/sgeroot
AIMK_CMD= ${SETENV} ${AIMK_ENV} ./aimk ${AIMK_ARGS}
+# From DEFAULTPROGS in scripts/distinst
INST_PROGS= man common \
sge_qmaster \
sge_execd \
@@ -80,13 +84,14 @@ INST_PROGS= man common \
qsh \
utilbin \
jobs \
+ ${QMON} \
qhost \
qmake \
qtcsh \
qping \
qloadsensor.exe \
sgepasswd \
- ${QMON}
+ qquota
MANPREFIX= ${SGE_ROOT}
.include "${.CURDIR}/Makefile.man"
@@ -105,18 +110,12 @@ PLIST_SUB+= BDB_SPOOL="@comment "
.if defined(WITH_JAVA)
USE_JAVA= yes
JAVA_VERSION= 1.4+
-JAVA_OS= native
-JAVA_BUILD= jdk
-JAVA_RUN= jre
-ANT?= ${LOCALBASE}/bin/ant
-BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
PLIST_SUB+= DRMAA=
-AIMK_ENV+= JAVA_HOME=${JAVA_HOME}
CATEGORIES+= java
.else
-AIMK_ARGS+= -no-java -no-jni
PLIST_SUB+= DRMAA="@comment "
.endif
+AIMK_ARGS+= -no-java -no-jni
.if defined(WITH_X11)
USE_MOTIF= yes
@@ -128,6 +127,14 @@ PLIST_SUB+= QMON="@comment "
QMON= noqmon
.endif
+post-extract:
+ @cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/ge-${SGE_RELEASE}-common.tar.gz \*.jar
+ @${CP} ${WRKDIR}/lib/drmaa.jar ${WRKSRC}/classes/
+ @${MKDIR} ${WRKSRC}/classes/juti
+ @${CP} ${WRKDIR}/lib/juti.jar ${WRKSRC}/classes/juti/
+ @${MKDIR} ${WRKSRC}/libs/jgdi/build
+ @${CP} ${WRKDIR}/lib/jgdi.jar ${WRKSRC}/libs/jgdi/build/
+
post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-e "s|%%X11BASE%%|${X11BASE}|g" \
@@ -160,7 +167,8 @@ post-patch:
-e 's|%%X11BASE%%|${X11BASE}|g' \
${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private
@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \
+ -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
+ -e 's|%%WRKDIR%%|${WRKDIR}|g' \
${FILESDIR}/distinst.private > ${WRKSRC}/distinst.private
.if !defined(WITH_X11)
@${REINPLACE_CMD} -e 's/qmon//' ${WRKSRC}/dist/util/setfileperm.sh
@@ -172,7 +180,7 @@ do-build:
@cd ${WRKSRC} && ${AIMK_CMD} depend
@cd ${WRKSRC} && \
${AIMK_CMD} -debug && \
- ${AIMK_CMD} -man ${SGE_PRODUCT} &&
+ ${AIMK_CMD} -man ${SGE_PRODUCT}
@${MKDIR} ${TMP_SGE_ROOT}
@cd ${WRKSRC} && ${SETENV} SGE_ROOT=${TMP_SGE_ROOT} \
./scripts/distinst -local -libs ${SGE_ARCH} -- ${INST_PROGS}
diff --git a/sysutils/sge62/Makefile.man b/sysutils/sge62/Makefile.man
index 78a78104b497..05b2c6febc7f 100644
--- a/sysutils/sge62/Makefile.man
+++ b/sysutils/sge62/Makefile.man
@@ -57,6 +57,7 @@ MAN1+=qmake.1
MAN1+=qmod.1
MAN1+=qmon.1
MAN1+=qping.1
+MAN1+=qquota.1
MAN1+=qrls.1
MAN1+=qselect.1
MAN1+=qstat.1
@@ -92,6 +93,7 @@ MAN5+=sge_pe.5
MAN5+=sge_priority.5
MAN5+=sge_qstat.5
MAN5+=sge_request.5
+MAN5+=sge_resource_quota.5
MAN5+=sgepasswd.5
MAN5+=share_tree.5
MAN5+=user.5
diff --git a/sysutils/sge62/distinfo b/sysutils/sge62/distinfo
index 95cfe7c3e041..245fcb7be031 100644
--- a/sysutils/sge62/distinfo
+++ b/sysutils/sge62/distinfo
@@ -1,3 +1,6 @@
-MD5 (ge-V60u12_TAG-src.tar.gz) = 7f64c415b85388047e6b6fb75895d9a5
-SHA256 (ge-V60u12_TAG-src.tar.gz) = 30e81dd72ca8d50c35f7e9fbbe705b81d751ad00e2ae2aa08c3beacfd295b24b
-SIZE (ge-V60u12_TAG-src.tar.gz) = 10695455
+MD5 (ge-V61u3_TAG-src.tar.gz) = a0e8ff817ac79f1ad76aa7e100b3cd9c
+SHA256 (ge-V61u3_TAG-src.tar.gz) = 3d6008649234c2781c9c8459333670103055588f2740ec382b2e6bcdb3636688
+SIZE (ge-V61u3_TAG-src.tar.gz) = 8559414
+MD5 (ge-6.1u3-common.tar.gz) = b239e13d42e3a6851517e99ab3beee71
+SHA256 (ge-6.1u3-common.tar.gz) = 0be1715cb56d939fff9db5ced1c85212396ba0e30ab4e33b3d6bd72696a811d7
+SIZE (ge-6.1u3-common.tar.gz) = 2933888
diff --git a/sysutils/sge62/files/distinst.private b/sysutils/sge62/files/distinst.private
index 35080f0e83e9..8f1d8d56efa8 100644
--- a/sysutils/sge62/files/distinst.private
+++ b/sysutils/sge62/files/distinst.private
@@ -2,3 +2,4 @@
OPENSSLBASE=%%OPENSSLBASE%%
BERKELEYDBBASE=%%LOCALBASE%%
BDB_LIB_SUFFIX="-4.2"
+DRMAAJ05BASE=%%WRKDIR%%/lib
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index 5fad14fbc275..3a2704432295 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -3,7 +3,7 @@ $FreeBSD$
--- aimk.orig
+++ aimk
-@@ -210,7 +210,7 @@
+@@ -222,7 +222,7 @@
if ( $?SGE_INPUT_CFLAGS ) then
set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
else
@@ -12,7 +12,7 @@ $FreeBSD$
endif
# Default build targets for which we have seperate make files
-@@ -1003,12 +1003,12 @@
+@@ -1065,12 +1065,12 @@
set OFLAG = "-O"
endif
set ARFLAGS = rcv
@@ -28,8 +28,8 @@ $FreeBSD$
set NOERR_CFLAG = "-Wno-error"
set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
set LIBS = "$LIBS -lkvm"
-@@ -1017,9 +1017,9 @@
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
+@@ -1080,9 +1080,9 @@
+ set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
- set XINCD = "$XMTINCD $XINCD -I/usr/X11/include"
@@ -40,3 +40,19 @@ $FreeBSD$
set XLFLAGS = "$XLIBD"
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f"
+@@ -1728,6 +1728,7 @@
+ if ("$JAVA_ARCH" != "") then
+ set CORE_INCLUDE = "$CORE_INCLUDE -I${JAVA_HOME}/${JAVA_INCL}/${JAVA_ARCH}"
+ switch ($buildarch)
++ case fbsd-i386:
+ case lx24-x86:
+ case ulx24-x86:
+ case lx26-x86:
+@@ -1745,6 +1746,7 @@
+ case usol-sparc:
+ set JAVA_LIB_ARCH = sparc
+ breaksw
++ case fbsd-amd64:
+ case lx24-amd64:
+ case ulx24-amd64:
+ case lx26-amd64:
diff --git a/sysutils/sge62/files/patch-dist_inst__sge b/sysutils/sge62/files/patch-dist_inst__sge
index 9e02407187e2..22d69916373c 100644
--- a/sysutils/sge62/files/patch-dist_inst__sge
+++ b/sysutils/sge62/files/patch-dist_inst__sge
@@ -3,16 +3,7 @@ $FreeBSD$
--- dist/inst_sge.orig
+++ dist/inst_sge
-@@ -270,7 +270,7 @@
- GetCell
- GetQmasterSpoolDir $euid
- SetCellDependentVariables
-- SetPermissions
-+# SetPermissions
- SelectHostNameResolving
- SetProductMode
- MakeDirsMaster
-@@ -344,7 +344,7 @@
+@@ -441,7 +441,7 @@
GetQmasterSpoolDir $euid
SetCellDependentVariables
WindowsSupport
diff --git a/sysutils/sge62/files/patch-dist_util_install__modules_inst__common.sh b/sysutils/sge62/files/patch-dist_util_install__modules_inst__common.sh
index 4487e583f433..e77da325da62 100644
--- a/sysutils/sge62/files/patch-dist_util_install__modules_inst__common.sh
+++ b/sysutils/sge62/files/patch-dist_util_install__modules_inst__common.sh
@@ -3,26 +3,14 @@ $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"
+@@ -367,7 +367,9 @@
+ missing=false
+ for f in $BINFILES; do
+ if [ ! -f $SGE_BIN/$f ]; then
+- missing=true
++ if [ "$f" != "qmon" ]; then
++ missing=true
++ fi
+ $INFOTEXT "missing program >%s< in directory >%s<" $f $SGE_BIN
+ $INFOTEXT -log "missing program >%s< in directory >%s<" $f $SGE_BIN
+ fi
diff --git a/sysutils/sge62/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h b/sysutils/sge62/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h
deleted file mode 100644
index 0cbbab1cdf91..000000000000
--- a/sysutils/sge62/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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/sge62/files/patch-scripts_distinst b/sysutils/sge62/files/patch-scripts_distinst
index efa10cbd2a6f..f40b6a7d5acd 100644
--- a/sysutils/sge62/files/patch-scripts_distinst
+++ b/sysutils/sge62/files/patch-scripts_distinst
@@ -12,17 +12,31 @@ $FreeBSD$
install_execd install_qmaster lib man mpi pvm qmon util utilbin"
HASARCHDIR="bin lib examples/jobsbin utilbin"
-@@ -64,8 +64,7 @@
- libsgeobj libsgeobjd \
- libevc libevm libmir"
+@@ -65,8 +65,7 @@
+ libevc libevm libmir \
+ libjuti libjgdi"
-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 @@
+ BERKELEYDB_SHARED_LIBRARIES="libdb-4.4"
+@@ -75,11 +74,11 @@
+ # The last number listed here will be the verson linked from libdrmaa.so
+ DRMAA_SHARED_LIB_VERSIONS="0.95 1.0"
+ DRMAA_HEADER_FILES="libs/japi/drmaa.h"
+-DRMAAJ_FILES="CLASSES/drmaa"
++DRMAAJ_FILES="classes/drmaa"
+
+ JNI_SHARED_LIBRARIES="libdrmaa libjuti libjgdi"
+
+-JUTIJ_FILES="CLASSES/juti/juti"
++JUTIJ_FILES="classes/juti/juti"
+ JGDIJ_FILES="libs/jgdi/build/jgdi"
+
+ PVMSOURCES="start_pvm.c stop_pvm.c slave.c master.c spmd.c Makefile"
+@@ -672,17 +671,6 @@
echo " Installing:" $PROG
echo " Architectures:" $ARCH
echo "Base directory:" $DEST_SGE_ROOT
@@ -40,7 +54,7 @@ $FreeBSD$
echo
-@@ -807,6 +795,9 @@
+@@ -749,6 +737,9 @@
instmpi=true
instcommon=true
;;
@@ -50,7 +64,7 @@ $FreeBSD$
qmontree)
instqmon=true
instcommon=true
-@@ -1010,19 +1001,6 @@
+@@ -1024,19 +1015,6 @@
Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
done
@@ -70,7 +84,7 @@ $FreeBSD$
Cleanup mpi
fi
-@@ -1171,7 +1149,7 @@
+@@ -1184,7 +1162,7 @@
for prog in $PROG; do
case $prog in
@@ -79,7 +93,7 @@ $FreeBSD$
:
;;
qmake)
-@@ -1280,6 +1258,8 @@
+@@ -1299,6 +1277,8 @@
InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
InstallProg $BERKELEYDBBASE/bin/$prog
@@ -88,33 +102,21 @@ $FreeBSD$
fi
fi
elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
-@@ -1394,13 +1374,15 @@
- libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext"
- elif [ $DSTARCH = darwin -o $DSTARCH = darwin-x86 ]; then
- libname="$OPENSSLBASE/$DSTARCH/lib/libssl.bundle"
+@@ -1429,6 +1409,8 @@
+ libname="$lib.$shlibext"
+ elif [ $DSTARCH = darwin-ppc -o $DSTARCH = darwin-x86 ]; then
+ libname="$lib.0.9.7.$shlibext"
+ elif [ ${DSTARCH%%-*} = fbsd ]; then
-+ libname="$OPENSSLBASE/lib/$lib.$shlibext"
++ libname="$OPENSSLBASE/lib/$lib.$shlibext"
else
- libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext.0.9.7"
+ libname="$lib.$shlibext.0.9.7"
fi
-
- if [ -f $libname ]; then
+@@ -1443,7 +1425,7 @@
InstallProg $libname
-- if [ $DSTARCH = tru64 -o $DSTARCH = darwin -o $DSTARCH = darwin-x86 ]; then
-+ if [ $DSTARCH = tru64 -o $DSTARCH = darwin -o $DSTARCH = darwin-x86 -o ${DSTARCH%%-*} = fbsd ]; then
+ if [ $DSTARCH = tru64 ]; then
:
- else
- (cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; ln -s $lib.${shlibext}.0.9.7 $lib.$shlibext)
-@@ -1415,7 +1397,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 [ $DSTARCH = darwin-ppc -o $DSTARCH = darwin-x86 ]; then
++ elif [ $DSTARCH = darwin-ppc -o $DSTARCH = darwin-x86 -o ${DSTARCH%%-*} = fbsd ]; then
+ (cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; \
+ ln -s $lib.$OPENSSLSOVERSION.$shlibext $lib.$shlibext)
else
diff --git a/sysutils/sge62/files/sge-freebsd-pdc.diff b/sysutils/sge62/files/sge-freebsd-pdc.diff
deleted file mode 100644
index 1942cd5634bb..000000000000
--- a/sysutils/sge62/files/sge-freebsd-pdc.diff
+++ /dev/null
@@ -1,366 +0,0 @@
---- daemons/common/pdc.c.orig Thu Sep 1 02:09:04 2005
-+++ daemons/common/pdc.c Thu Apr 13 22:05:15 2006
-@@ -118,6 +118,16 @@
- #include "sge_unistd.h"
- #endif
-
-+#if defined(FREEBSD)
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+
-+#include <fcntl.h>
-+#include <kvm.h>
-+#include <limits.h>
-+#endif
-+
- #if defined(LINUX) || defined(ALPHA) || defined(IRIX) || defined(SOLARIS) || defined(DARWIN) || defined (FREEBSD) || defined(NETBSD)
-
- #include "sge_os.h"
-@@ -188,12 +198,57 @@
- }
- #endif
-
--#if defined(LINUX) || defined(SOLARIS) || defined(ALPHA)
-+#if defined(LINUX) || defined(SOLARIS) || defined(ALPHA) || defined(FREEBSD)
-
- void pdc_kill_addgrpid(gid_t add_grp_id, int sig,
- tShepherd_trace shepherd_trace)
- {
-+#if defined(LINUX) || defined(SOLARIS) || defined(ALPHA)
- procfs_kill_addgrpid(add_grp_id, sig, shepherd_trace);
-+#elif defined(FREEBSD)
-+ kvm_t *kd;
-+ int i, nprocs;
-+ struct kinfo_proc *procs;
-+ char kerrbuf[_POSIX2_LINE_MAX];
-+
-+ kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, kerrbuf);
-+ if (kd == NULL) {
-+#if DEBUG
-+ fprintf(stderr, "kvm_getprocs: error %s\n", kerrbuf);
-+#endif
-+ return;
-+ }
-+
-+ procs = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nprocs);
-+ if (procs == NULL) {
-+#if DEBUG
-+ fprintf(stderr, "kvm_getprocs: error %s\n", kvm_geterr(kd));
-+#endif
-+ kvm_close(kd);
-+ return;
-+ }
-+ for (; nprocs > 0; nprocs--, procs++) {
-+ for (i = 0; i < procs->ki_ngroups; i++) {
-+ if (procs->ki_groups[i] == add_grp_id) {
-+ char err_str[256];
-+
-+ if (procs->ki_uid != 0 && procs->ki_ruid != 0 &&
-+ procs->ki_svuid != 0 &&
-+ procs->ki_rgid != 0 && procs->ki_svgid != 0) {
-+ kill(procs->ki_pid, sig);
-+ sprintf(err_str, MSG_SGE_KILLINGPIDXY_UI ,
-+ sge_u32c(procs->ki_pid), add_grp_id);
-+ } else {
-+ sprintf(err_str, MSG_SGE_DONOTKILLROOTPROCESSXY_UI ,
-+ sge_u32c(procs->ki_pid), add_grp_id);
-+ }
-+ if (shepherd_trace)
-+ shepherd_trace(err_str);
-+ }
-+ }
-+ }
-+ kvm_close(kd);
-+#endif
- }
- #endif
-
-@@ -1404,6 +1459,95 @@
- ;
- pt_close();
- }
-+#elif defined(FREEBSD)
-+ {
-+ kvm_t *kd;
-+ int i, nprocs;
-+ struct kinfo_proc *procs;
-+ char kerrbuf[_POSIX2_LINE_MAX];
-+ job_elem_t *job_elem;
-+ double old_time = 0.0;
-+ uint64 old_vmem = 0;
-+
-+ kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, kerrbuf);
-+ if (kd == NULL) {
-+#if DEBUG
-+ fprintf(stderr, "kvm_getprocs: error %s\n", kerrbuf);
-+#endif
-+ DEXIT;
-+ return -1;
-+ }
-+
-+ procs = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nprocs);
-+ if (procs == NULL) {
-+#if DEBUG
-+ fprintf(stderr, "kvm_getprocs: error %s\n", kvm_geterr(kd));
-+#endif
-+ kvm_close(kd);
-+ DEXIT;
-+ return -1;
-+ }
-+ for (; nprocs > 0; nprocs--, procs++) {
-+ for (curr=job_list.next; curr != &job_list; curr=curr->next) {
-+ job_elem = LNK_DATA(curr, job_elem_t, link);
-+
-+ for (i = 0; i < procs->ki_ngroups; i++) {
-+ if (job_elem->job.jd_jid == procs->ki_groups[i]) {
-+ lnk_link_t *curr2;
-+ proc_elem_t *proc_elem;
-+ int newprocess;
-+
-+ newprocess = 1;
-+ if (job_elem->job.jd_proccount != 0) {
-+ for (curr2=job_elem->procs.next; curr2 != &job_elem->procs; curr2=curr2->next) {
-+ proc_elem = LNK_DATA(curr2, proc_elem_t, link);
-+
-+ if (proc_elem->proc.pd_pid == procs->ki_pid) {
-+ newprocess = 0;
-+ break;
-+ }
-+ }
-+ }
-+ if (newprocess) {
-+ proc_elem = malloc(sizeof(proc_elem_t));
-+ if (proc_elem == NULL) {
-+ kvm_close(kd);
-+ DEXIT;
-+ return 0;
-+ }
-+
-+ memset(proc_elem, 0, sizeof(proc_elem_t));
-+ proc_elem->proc.pd_length = sizeof(psProc_t);
-+ proc_elem->proc.pd_state = 1; /* active */
-+ proc_elem->proc.pd_pstart = procs->ki_start.tv_sec;
-+
-+ LNK_ADD(job_elem->procs.prev, &proc_elem->link);
-+ job_elem->job.jd_proccount++;
-+ } else {
-+ /* save previous usage data - needed to build delta usage */
-+ old_time = proc_elem->proc.pd_utime + proc_elem->proc.pd_stime;
-+ old_vmem = proc_elem->vmem;
-+ }
-+ proc_elem->proc.pd_tstamp = time_stamp;
-+ proc_elem->proc.pd_pid = procs->ki_pid;
-+
-+ proc_elem->proc.pd_utime = procs->ki_rusage.ru_utime.tv_sec;
-+ proc_elem->proc.pd_stime = procs->ki_rusage.ru_stime.tv_sec;
-+
-+ proc_elem->proc.pd_uid = procs->ki_uid;
-+ proc_elem->proc.pd_gid = procs->ki_rgid;
-+ proc_elem->vmem = procs->ki_size;
-+ proc_elem->rss = procs->ki_rssize;
-+
-+ proc_elem->mem = ((proc_elem->proc.pd_stime + proc_elem->proc.pd_utime) - old_time) *
-+ (( old_vmem + proc_elem->vmem)/2);
-+ }
-+ }
-+ }
-+ }
-+
-+ kvm_close(kd);
-+ }
- #elif defined(NECSX4) || defined(NECSX5)
- {
- for (curr=job_list.next; curr != &job_list; curr=curr->next) {
-@@ -1951,7 +2095,7 @@
-
- }
-
--#elif defined(ALPHA) || defined(LINUX) || defined(SOLARIS)
-+#elif defined(ALPHA) || defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
- {
- int proccount;
- lnk_link_t *currp, *nextp;
---- daemons/common/pdc.h.orig Mon Feb 9 06:06:49 2004
-+++ daemons/common/pdc.h Thu Apr 13 22:00:01 2006
-@@ -187,7 +187,7 @@
- int sup_groups_in_proc(void);
- #endif
-
--#if defined(ALPHA) || defined(LINUX) || defined(SOLARIS)
-+#if defined(ALPHA) || defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
- void pdc_kill_addgrpid(gid_t, int, tShepherd_trace);
- #endif
-
---- daemons/common/setosjobid.c.orig Tue May 3 02:18:19 2005
-+++ daemons/common/setosjobid.c Thu Apr 13 22:00:01 2006
-@@ -126,7 +126,7 @@
- sprintf(err_str, "setosjobid: uid = "pid_t_fmt", euid = "pid_t_fmt, getuid(), geteuid());
- shepherd_trace(err_str);
-
--# if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+# if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- /* Read SgeId from config-File and create Addgrpid-File */
- {
- char *cp;
---- daemons/execd/exec_job.c.orig Wed Nov 23 03:03:59 2005
-+++ daemons/execd/exec_job.c Thu Apr 13 22:06:17 2006
-@@ -106,7 +106,7 @@
- extern char execd_spool_dir[SGE_PATH_MAX];
-
- #if COMPILE_DC
--#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- /* local functions */
- static int addgrpid_already_in_use(long);
- static long get_next_addgrpid(lList *, long);
-@@ -143,7 +143,7 @@
- }
-
- #if COMPILE_DC
--#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- static long get_next_addgrpid(
- lList *rlp,
- long last_addgrpid
-@@ -245,7 +245,7 @@
- char dce_wrapper_cmd[128];
-
- #if COMPILE_DC
--#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- static gid_t last_addgrpid;
- #endif
- #endif
-@@ -778,7 +778,7 @@
-
- #ifdef COMPILE_DC
-
--# if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+# if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
-
- {
- lList *rlp = NULL;
---- daemons/execd/execd_ck_to_do.c.orig Wed Nov 2 08:03:13 2005
-+++ daemons/execd/execd_ck_to_do.c Thu Apr 13 22:07:18 2006
-@@ -913,7 +913,7 @@
- FILE *fp;
- SGE_STRUCT_STAT sb;
-
--#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- gid_t addgrpid;
- dstring addgrpid_path = DSTRING_INIT;
- #else
-@@ -928,7 +928,7 @@
- pe_task_id = lGetString(pe_task, PET_id);
- }
-
--#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- /**
- ** read additional group id and use it as osjobid
- **/
---- daemons/execd/ptf.c.orig Tue Nov 22 07:35:00 2005
-+++ daemons/execd/ptf.c Thu Apr 13 22:08:27 2006
-@@ -44,7 +44,7 @@
-
- #if defined(COMPILE_DC) || defined(MODULE_TEST)
-
--#if defined(IRIX) || defined(ALPHA) || defined(LINUX) || defined(SOLARIS) || defined(NECSX4) || defined(NECSX5) || !defined(MODULE_TEST)
-+#if defined(IRIX) || defined(ALPHA) || defined(LINUX) || defined(SOLARIS) || defined(NECSX4) || defined(NECSX5) || !defined(MODULE_TEST) || defined(FREEBSD)
- # define USE_DC
- #endif
-
-@@ -82,7 +82,7 @@
- # include <sys/category.h>
- #endif
-
--#if defined(ALPHA) || defined(SOLARIS) || defined(LINUX)
-+#if defined(ALPHA) || defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
- # include <sys/resource.h>
- #endif
-
-@@ -217,7 +217,7 @@
-
- static void ptf_setpriority_jobid(lListElem *job, lListElem *osjob, long pri);
-
--#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX)
-+#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-
- static void ptf_setpriority_addgrpid(lListElem *job, lListElem *osjob,
- long pri);
-@@ -365,7 +365,7 @@
- lSetDouble(usage, UA_value, 0);
- lAppendElem(usage_list, usage);
-
--#if defined(ALPHA) || defined(LINUX) || defined(SOLARIS)
-+#if defined(ALPHA) || defined(LINUX) || defined(SOLARIS) || defined(FREBSD)
- usage = lCreateElem(UA_Type);
- lSetString(usage, UA_name, USAGE_ATTR_VMEM);
- lSetDouble(usage, UA_value, 0);
-@@ -494,7 +494,7 @@
- ptf_setpriority_ash(job, osjob, pri);
- #elif defined(CRAY) || defined(NECSX4) || defined(NECSX5)
- ptf_setpriority_jobid(job, osjob, pri);
--#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX)
-+#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
- ptf_setpriority_addgrpid(job, osjob, pri);
- #endif
- }
-@@ -713,7 +713,7 @@
- DEXIT;
- }
-
--#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX)
-+#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-
- /****** execd/ptf/ptf_setpriority_addgrpid() **********************************
- * NAME
-@@ -724,9 +724,9 @@
- * long *pri)
- *
- * FUNCTION
--* This function is only available for the architecture SOLARIS, ALPHA and
--* LINUX. All processes belonging to "job" and "osjob" will get a new i
--* priority.
-+* This function is only available for the architecture SOLARIS, ALPHA,
-+* LINUX, and FREEBSD. All processes belonging to "job" and "osjob" will
-+* get a new priority.
- *
- * This function assumes the the "max" priority is smaller than the "min"
- * priority.
-@@ -1981,7 +1981,7 @@
- }
- }
-
--#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX)
-+#elif defined(ALPHA) || defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
- if (getuid() == 0) {
- if (setpriority(PRIO_PROCESS, getpid(), PTF_MAX_PRIORITY) < 0) {
- ERROR((SGE_EVENT, MSG_PRIO_SETPRIOFAILED_S, strerror(errno)));
---- daemons/shepherd/shepherd.c.orig Mon Jan 1 05:44:56 2007
-+++ daemons/shepherd/shepherd.c Mon Feb 5 10:07:37 2007
-@@ -2478,9 +2478,9 @@
- kill(pid, sig);
- sge_switch2admin_user();
-
--#if defined(SOLARIS) || defined(LINUX) || defined(ALPHA) || defined(IRIX)
-+#if defined(SOLARIS) || defined(LINUX) || defined(ALPHA) || defined(IRIX) || defined(FREEBSD)
- if (first_kill == 0 || sig != SIGKILL || is_qrsh == false) {
--# if defined(SOLARIS) || defined(LINUX) || defined(ALPHA)
-+# if defined(SOLARIS) || defined(LINUX) || defined(ALPHA) || defined(FREEBSD)
- # ifdef COMPILE_DC
- if (atoi(get_conf_val("enable_addgrp_kill")) == 1) {
- gid_t add_grp_id;
---- libs/uti/sge_uidgid.c.orig Wed Nov 23 03:04:09 2005
-+++ libs/uti/sge_uidgid.c Thu Apr 13 22:00:01 2006
-@@ -850,7 +850,7 @@
- #endif
- #endif /* WIN32 */
-
--#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX)
-+#if defined(SOLARIS) || defined(ALPHA) || defined(LINUX) || defined(FREEBSD)
- /* add Additional group id to current list of groups */
- if (add_grp) {
- if (sge_add_group(add_grp, err_str) == -1) {
diff --git a/sysutils/sge62/pkg-plist b/sysutils/sge62/pkg-plist
index 88b45d15ef88..fc4bc4a6c65f 100644
--- a/sysutils/sge62/pkg-plist
+++ b/sysutils/sge62/pkg-plist
@@ -1,5 +1,4 @@
%%SGE_BASE%%/3rd_party/3rd_party_licscopyrights
-%%QMON%%%%SGE_BASE%%/3rd_party/qmon/copyrights
%%QMON%%%%SGE_BASE%%/3rd_party/qmon/ltree_changed.tar.gz
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qacct
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qalter
@@ -12,6 +11,7 @@
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qmod
%%QMON%%%%SGE_BASE%%/bin/%%SGE_ARCH%%/qmon
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qping
+%%SGE_BASE%%/bin/%%SGE_ARCH%%/qquota
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qresub
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qrls
%%SGE_BASE%%/bin/%%SGE_ARCH%%/qrsh
@@ -43,6 +43,7 @@
%%SGE_BASE%%/catman/cat/cat1/qmod.1
%%QMON%%%%SGE_BASE%%/catman/cat/cat1/qmon.1
%%SGE_BASE%%/catman/cat/cat1/qping.1
+%%SGE_BASE%%/catman/cat/cat1/qquota.1
%%SGE_BASE%%/catman/cat/cat1/qresub.1
%%SGE_BASE%%/catman/cat/cat1/qrls.1
%%SGE_BASE%%/catman/cat/cat1/qrsh.1
@@ -118,6 +119,7 @@
%%SGE_BASE%%/catman/cat/cat5/sge_priority.5
%%SGE_BASE%%/catman/cat/cat5/sge_qstat.5
%%SGE_BASE%%/catman/cat/cat5/sge_request.5
+%%SGE_BASE%%/catman/cat/cat5/sge_resource_quota.5
%%SGE_BASE%%/catman/cat/cat5/sgepasswd.5
%%SGE_BASE%%/catman/cat/cat5/share_tree.5
%%SGE_BASE%%/catman/cat/cat5/user.5
@@ -146,8 +148,12 @@
%%SGE_BASE%%/ckpt/sx6_clean_command
%%SGE_BASE%%/ckpt/sx6_migration_command
%%SGE_BASE%%/ckpt/sx6_restart_command
+%%SGE_BASE%%/dtrace/README-dtrace.txt
+%%SGE_BASE%%/dtrace/monitor.d
+%%SGE_BASE%%/dtrace/monitor.sh
%%SGE_BASE%%/examples/drmaa/example.c
%%SGE_BASE%%/examples/drmaa/howto1.c
+%%SGE_BASE%%/examples/drmaa/howto1_1.c
%%SGE_BASE%%/examples/drmaa/howto2.c
%%SGE_BASE%%/examples/drmaa/howto2_1.c
%%SGE_BASE%%/examples/drmaa/howto3.c
@@ -157,6 +163,7 @@
%%SGE_BASE%%/examples/drmaa/howto5.c
%%SGE_BASE%%/examples/drmaa/howto6.c
%%SGE_BASE%%/examples/jobs/array_submitter.sh
+%%SGE_BASE%%/examples/jobs/hello.bat
%%SGE_BASE%%/examples/jobs/jobnet_submitter.sh
%%SGE_BASE%%/examples/jobs/pascal.sh
%%SGE_BASE%%/examples/jobs/pminiworm.sh
@@ -164,21 +171,26 @@
%%SGE_BASE%%/examples/jobs/sleeper.sh
%%SGE_BASE%%/examples/jobs/step_A_array_submitter.sh
%%SGE_BASE%%/examples/jobs/step_B_array_submitter.sh
+%%SGE_BASE%%/examples/jobs/worker.exe
%%SGE_BASE%%/examples/jobs/worker.sh
%%SGE_BASE%%/examples/jobsbin/%%SGE_ARCH%%/work
%%SGE_BASE%%/include/drmaa.h
%%SGE_BASE%%/inst_sge
%%SGE_BASE%%/install_execd
%%SGE_BASE%%/install_qmaster
+%%SGE_BASE%%/lib/drmaa-0.5.jar
+%%SGE_BASE%%/lib/drmaa.jar
%%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
%%SGE_BASE%%/lib/%%SGE_ARCH%%/libdrmaa.so.0.95
%%SGE_BASE%%/lib/%%SGE_ARCH%%/libdrmaa.so.1.0
+%%SGE_BASE%%/lib/%%SGE_ARCH%%/libjuti.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%%/lib/jgdi.jar
+%%SGE_BASE%%/lib/juti.jar
%%SGE_BASE%%/mpi/README
%%SGE_BASE%%/mpi/README.atm
%%SGE_BASE%%/mpi/hostname
@@ -228,6 +240,7 @@
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_pe.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_prj.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_queue.xpm
+%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_rqs.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_sched.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_submit.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/big/toolbar_ticket.xpm
@@ -309,6 +322,7 @@
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_pe.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_prj.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_queue.xpm
+%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_rqs.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_sched.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_submit.xpm
%%QMON%%%%SGE_BASE%%/qmon/PIXMAPS/toolbar_ticket.xpm
@@ -333,6 +347,7 @@
%%SGE_BASE%%/util/arch
%%SGE_BASE%%/util/arch_variables
%%SGE_BASE%%/util/bdb_checkpoint.sh
+%%SGE_BASE%%/util/certtool.sh
%%SGE_BASE%%/util/create_settings.sh
%%SGE_BASE%%/util/dl.csh
%%SGE_BASE%%/util/dl.sh
@@ -364,6 +379,7 @@
%%SGE_BASE%%/util/resources/centry/arch
%%SGE_BASE%%/util/resources/centry/calendar
%%SGE_BASE%%/util/resources/centry/cpu
+%%SGE_BASE%%/util/resources/centry/display_win_gui
%%SGE_BASE%%/util/resources/centry/h_core
%%SGE_BASE%%/util/resources/centry/h_cpu
%%SGE_BASE%%/util/resources/centry/h_data
@@ -417,6 +433,8 @@
%%SGE_BASE%%/util/resources/loadsensors/solaris-iidle.sh
%%SGE_BASE%%/util/resources/pe/make
%%SGE_BASE%%/util/resources/pe/make.sge_pqs_api
+%%SGE_BASE%%/util/resources/schemas/qhost/qhost.xsd
+%%SGE_BASE%%/util/resources/schemas/qquota/qquota.xsd
%%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
%%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
%%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
@@ -426,12 +444,14 @@
%%SGE_BASE%%/util/setfileperm.sh
%%SGE_BASE%%/util/sgeCA/renew_all_certs.csh
%%SGE_BASE%%/util/sgeCA/sge_ca
+%%SGE_BASE%%/util/sgeCA/sge_ca.cnf
%%SGE_BASE%%/util/sgeCA/sge_ssl.cnf
%%SGE_BASE%%/util/sgeCA/sge_ssl_template.cnf
%%SGE_BASE%%/util/sge_aliases
%%SGE_BASE%%/util/sge_request
%%SGE_BASE%%/util/sgeremoterun
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/adminrun
+%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/authuser
%%BDB_SPOOL%%%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/berkeley_db_svc
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/checkprog
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/checkuser
@@ -465,11 +485,11 @@
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/spoolinit
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/testsuidroot
%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/uidgid
-%%PORTDOCS%%%%DOCSDIR%%/README-ARCo.txt
%%PORTDOCS%%%%DOCSDIR%%/README-Autoinstall.txt
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
%%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
%%PORTDOCS%%%%DOCSDIR%%/README-Update-60u2.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-Upgrade-61.txt
%%PORTDOCS%%%%DOCSDIR%%/README-Upgrade.txt
%%PORTDOCS%%%%DOCSDIR%%/compatibility_test.html
%%PORTDOCS%%%%DOCSDIR%%/devel/adoc.html
@@ -483,15 +503,24 @@
%%PORTDOCS%%%%DOCSDIR%%/devel/libmir.html
%%PORTDOCS%%%%DOCSDIR%%/devel/review.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/review_help.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/AR_job_life_time.jpg
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/AR_life_time.jpg
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/AdvanceReservationSpecification.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/EvaluationExpressionSupport.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/EvaluationExpressionSupport.wiki
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/ResourceLimitationRulesSpecification.html
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/ResourceQuotaSpecification.html
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/auto_user.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/bapl.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/cluster_queue.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/dtrace_monitor.wiki
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/event_mirror.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/job_category.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/job_class.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/maui.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/policy_module.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/priority_class.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/profiling.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/qmaster_monitoring.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/resource_attributes.txt
%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/resource_reservation.txt
@@ -515,6 +544,7 @@
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qmod.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qmon.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qping.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qquota.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qresub.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrls.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrsh.html
@@ -535,6 +565,7 @@
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_control.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_delete_job_template.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_exit.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_DRMAA_implementation.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_DRM_system.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_attribute.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_attribute_names.html
@@ -542,6 +573,9 @@
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_next_attr_name.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_next_attr_value.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_next_job_id.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_num_attr_names.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_num_attr_values.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_num_job_ids.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_vector_attribute.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_get_vector_attribute_names.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/drmaa_init.html
@@ -698,10 +732,12 @@
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_priority.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_qstat.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_request.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_resource_quota.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sgepasswd.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/share_tree.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/user.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/usermapping.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/SGE_Helper_Service.exe.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_commd.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_execd.html
%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman8/sge_qmaster.html
@@ -782,6 +818,8 @@
@dirrm %%SGE_BASE%%/util/resources/usersets
@dirrm %%SGE_BASE%%/util/resources/starter_methods
@dirrm %%SGE_BASE%%/util/resources/schemas/qstat
+@dirrm %%SGE_BASE%%/util/resources/schemas/qquota
+@dirrm %%SGE_BASE%%/util/resources/schemas/qhost
@dirrm %%SGE_BASE%%/util/resources/schemas
@dirrm %%SGE_BASE%%/util/resources/pe
@dirrm %%SGE_BASE%%/util/resources/loadsensors
@@ -811,6 +849,7 @@
@dirrm %%SGE_BASE%%/examples/jobs
@dirrm %%SGE_BASE%%/examples/drmaa
@dirrm %%SGE_BASE%%/examples
+@dirrm %%SGE_BASE%%/dtrace
@dirrm %%SGE_BASE%%/ckpt
@dirrm %%SGE_BASE%%/catman/cat/cat8
@dirrm %%SGE_BASE%%/catman/cat/cat5