diff options
Diffstat (limited to 'sysutils/sge61/files')
-rw-r--r-- | sysutils/sge61/files/distinst.private | 1 | ||||
-rw-r--r-- | sysutils/sge61/files/patch-aimk | 24 | ||||
-rw-r--r-- | sysutils/sge61/files/patch-dist_inst__sge | 11 | ||||
-rw-r--r-- | sysutils/sge61/files/patch-dist_util_install__modules_inst__common.sh | 34 | ||||
-rw-r--r-- | sysutils/sge61/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h | 13 | ||||
-rw-r--r-- | sysutils/sge61/files/patch-scripts_distinst | 68 | ||||
-rw-r--r-- | sysutils/sge61/files/sge-freebsd-pdc.diff | 366 |
7 files changed, 68 insertions, 449 deletions
diff --git a/sysutils/sge61/files/distinst.private b/sysutils/sge61/files/distinst.private index 35080f0e83e9..8f1d8d56efa8 100644 --- a/sysutils/sge61/files/distinst.private +++ b/sysutils/sge61/files/distinst.private @@ -2,3 +2,4 @@ OPENSSLBASE=%%OPENSSLBASE%% BERKELEYDBBASE=%%LOCALBASE%% BDB_LIB_SUFFIX="-4.2" +DRMAAJ05BASE=%%WRKDIR%%/lib diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk index 5fad14fbc275..3a2704432295 100644 --- a/sysutils/sge61/files/patch-aimk +++ b/sysutils/sge61/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/sge61/files/patch-dist_inst__sge b/sysutils/sge61/files/patch-dist_inst__sge index 9e02407187e2..22d69916373c 100644 --- a/sysutils/sge61/files/patch-dist_inst__sge +++ b/sysutils/sge61/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/sge61/files/patch-dist_util_install__modules_inst__common.sh b/sysutils/sge61/files/patch-dist_util_install__modules_inst__common.sh index 4487e583f433..e77da325da62 100644 --- a/sysutils/sge61/files/patch-dist_util_install__modules_inst__common.sh +++ b/sysutils/sge61/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/sge61/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h b/sysutils/sge61/files/patch-libs_spool_flatfile_sge__spooling__flatfile__scanner.h deleted file mode 100644 index 0cbbab1cdf91..000000000000 --- a/sysutils/sge61/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/sge61/files/patch-scripts_distinst b/sysutils/sge61/files/patch-scripts_distinst index efa10cbd2a6f..f40b6a7d5acd 100644 --- a/sysutils/sge61/files/patch-scripts_distinst +++ b/sysutils/sge61/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/sge61/files/sge-freebsd-pdc.diff b/sysutils/sge61/files/sge-freebsd-pdc.diff deleted file mode 100644 index 1942cd5634bb..000000000000 --- a/sysutils/sge61/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) { |