5 files changed, 35 insertions, 60 deletions

diff --git a/sysutils/sge62/files/aimk.private b/sysutils/sge62/files/aimk.private
index ed153420e88b..7257c0d00c4c 100644
--- a/sysutils/sge62/files/aimk.private
+++ b/sysutils/sge62/files/aimk.private
@@ -3,3 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%%
 set BERKELEYDB_HOME = %%LOCALBASE%%
 set BDB_INCLUDE_SUBDIR = db42
 set BDB_LIB_SUFFIX = -4.2
+set X11BASE = %%X11BASE%%
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index dbb6393730ee..5fad14fbc275 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- aimk.orig
 +++ aimk
-@@ -397,7 +397,7 @@
+@@ -210,7 +210,7 @@
  if ( $?SGE_INPUT_CFLAGS ) then
     set INP_CFLAGS    = "$SGE_INPUT_CFLAGS"
  else
@@ -12,39 +12,31 @@ $FreeBSD$
  endif
  
  # Default build targets for which we have seperate make files
-@@ -1177,27 +1177,27 @@
-    set MAKE = gmake
-    set OFLAG = "-O"
-    set ARFLAGS     = rcv
+@@ -1003,12 +1003,12 @@
+       set OFLAG = "-O"
+    endif
+    set ARFLAGS  = rcv
 -   set CC       = gcc
 -   set CXX      = g++
 +   set CC       = %%CC%%
 +   set CXX      = %%CXX%%
-    set DLLIB	= ""
+    set DLLIB	 = ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   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 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   = "-export-dynamic $DEBUG_FLAG $LFLAGS"
+    set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
     set LIBS     = "$LIBS -lkvm"
-    set SHAREDLD = $CC
-    set SHARED_CFLAGS = "-fPIC"
--   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared" 
-+   set SHARED_LFLAGS = "-export-dynamic $SHARED_LFLAGS -L. -shared" 
+@@ -1017,9 +1017,9 @@
+    set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic" 
     
     set XMTDEF   = ""
 -   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
-+   set XINCD    = "$XMTINCD $XINCD -I%%X11BASE%%/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"
++   set XLIBD    = "-L${X11BASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"
--   set JAVA_ARCH = ""
-+   set JAVA_ARCH = "freebsd"
-    breaksw 
- 
- case NETBSD_*:
diff --git a/sysutils/sge62/files/patch-common_basis__types.h b/sysutils/sge62/files/patch-common_basis__types.h
deleted file mode 100644
index 84515b99c65d..000000000000
--- a/sysutils/sge62/files/patch-common_basis__types.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- common/basis_types.h.orig
-+++ common/basis_types.h
-@@ -251,12 +251,10 @@
-    else \
-       variable = pthread_getspecific(key)
- 
--#if !defined(FREEBSD)
- #define HAS_GETPWNAM_R
- #define HAS_GETGRNAM_R
- #define HAS_GETPWUID_R
- #define HAS_GETGRGID_R
--#endif
- 
- #define HAS_LOCALTIME_R
- #define HAS_CTIME_R
diff --git a/sysutils/sge62/files/patch-scripts_distinst b/sysutils/sge62/files/patch-scripts_distinst
index 45f59ab1fd46..27b5dd297f6f 100644
--- a/sysutils/sge62/files/patch-scripts_distinst
+++ b/sysutils/sge62/files/patch-scripts_distinst
@@ -12,7 +12,7 @@ $FreeBSD$
            install_execd install_qmaster lib man mpi pvm qmon util utilbin"
  
  HASARCHDIR="bin lib examples/jobsbin utilbin"
-@@ -730,17 +730,6 @@
+@@ -735,17 +735,6 @@
  echo   "    Installing:" $PROG
  echo   " Architectures:" $ARCH
  echo   "Base directory:" $DEST_SGE_ROOT
@@ -30,7 +30,7 @@ $FreeBSD$
  
  echo
  
-@@ -799,6 +788,9 @@
+@@ -807,6 +796,9 @@
           instmpi=true
           instcommon=true
           ;;
@@ -40,7 +40,7 @@ $FreeBSD$
        qmontree)
           instqmon=true
           instcommon=true
-@@ -1006,19 +998,6 @@
+@@ -1014,19 +1006,6 @@
           Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
        done
  
@@ -60,16 +60,16 @@ $FreeBSD$
        Cleanup mpi
     fi
  
-@@ -1148,7 +1127,7 @@
+@@ -1174,7 +1153,7 @@
  
        for prog in $PROG; do
           case $prog in
--            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|qmontree|common|distcommon|utilbin)
-+            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|noqmon|qmontree|common|distcommon|utilbin)
+-            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|qmontree|common|distcommon|utilbin|arco)
++            jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|noqmon|pvm|qmontree|common|distcommon|utilbin|arco)
                 : 
                 ;;
              qmake)
-@@ -1246,6 +1225,8 @@
+@@ -1272,6 +1251,8 @@
                       InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
                    elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
                       InstallProg $BERKELEYDBBASE/bin/$prog
@@ -78,24 +78,24 @@ $FreeBSD$
                    fi
                 fi
              elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
-@@ -1356,13 +1337,15 @@
+@@ -1386,13 +1367,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"
+                elif [ $DSTARCH = darwin -o $DSTARCH = darwin-x86 ];  then
+                   libname="$OPENSSLBASE/$DSTARCH/lib/libssl.bundle"
++               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
+-                  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
                       :
-                   elif [ $DSTARCH = darwin ]; then
-                      (cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; \
-@@ -1383,7 +1366,11 @@
+                   else
+                      (cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; ln -s $lib.${shlibext}.0.9.7 $lib.$shlibext)
+@@ -1407,7 +1390,11 @@
           if [ $DSTARCH != win32-x86 ]; then
              if [ $instbdb = true ]; then
                 for lib in $BERKELEYDB_SHARED_LIBRARIES; do
@@ -107,4 +107,4 @@ $FreeBSD$
 +                  fi
                    if [ -f $libname ]; then
                       InstallProg $libname
-                   elif [ $exit_on_error = true ]; then
+                   else
diff --git a/sysutils/sge62/files/sge-freebsd-pdc.diff b/sysutils/sge62/files/sge-freebsd-pdc.diff
index 621cee7e6e2e..0c8c7683b5c3 100644
--- a/sysutils/sge62/files/sge-freebsd-pdc.diff
+++ b/sysutils/sge62/files/sge-freebsd-pdc.diff
@@ -339,9 +339,9 @@
     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	Thu Dec  1 05:49:28 2005
-+++ daemons/shepherd/shepherd.c	Thu Apr 13 22:00:01 2006
-@@ -2411,9 +2411,9 @@
+--- 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();
  
@@ -350,9 +350,9 @@
          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;
-                 char *cp = search_conf_val("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 @@