summaryrefslogtreecommitdiff
path: root/sysutils/sge61/files/patch-scripts_distinst
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2008-02-13 15:39:06 +0000
committerBrooks Davis <brooks@FreeBSD.org>2008-02-13 15:39:06 +0000
commit74270ab2799707e3e43853390fbf4ce9ac82ecc7 (patch)
tree8c97ff754b4d71c1e88f277482513e4c363bd92b /sysutils/sge61/files/patch-scripts_distinst
parent- Update to 0.92.1 (bugfix release) [1] (diff)
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
Notes
Notes: svn path=/head/; revision=207163
Diffstat (limited to 'sysutils/sge61/files/patch-scripts_distinst')
-rw-r--r--sysutils/sge61/files/patch-scripts_distinst68
1 files changed, 35 insertions, 33 deletions
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