forked from Lainports/freebsd-ports
6b88ce43ac
Remove the option to install DRMAA .jar files as they are not automatically downloadable due to the move the the sun donwload center. Adding a new port to install them or adding an option to use the manually downloaded would probably be a good idea, but I've been stalling the upgrade too long as it is.
156 lines
5.1 KiB
Text
156 lines
5.1 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- scripts/distinst.orig
|
|
+++ scripts/distinst
|
|
@@ -35,7 +35,7 @@
|
|
|
|
umask 022
|
|
|
|
-TOPFILES="3rd_party bin catman ckpt doc examples include inst_sge \
|
|
+TOPFILES="3rd_party bin ckpt doc examples include inst_sge \
|
|
install_execd install_qmaster lib man mpi pvm qmon util utilbin"
|
|
|
|
HASARCHDIR="bin lib examples/jobsbin utilbin"
|
|
@@ -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.4"
|
|
@@ -75,11 +74,11 @@
|
|
# The last number listed here will be the verson linked from libdrmaa.so
|
|
DRMAA_SHARED_LIB_VERSIONS="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
|
|
-printf " OK [Y/N][Y]: "
|
|
-
|
|
-read ans
|
|
-if [ "$ans" = y -o "$ans" = Y -o "$ans" = "" ]; then
|
|
- :
|
|
-else
|
|
- echo
|
|
- echo Ciao
|
|
- echo
|
|
- exit 1
|
|
-fi
|
|
|
|
echo
|
|
|
|
@@ -749,6 +737,12 @@
|
|
instmpi=true
|
|
instcommon=true
|
|
;;
|
|
+ nodrmaa)
|
|
+ instdrmaa=false
|
|
+ ;;
|
|
+ noqmon)
|
|
+ instqmon=false
|
|
+ ;;
|
|
qmontree)
|
|
instqmon=true
|
|
instcommon=true
|
|
@@ -942,18 +936,18 @@
|
|
Execute cp $f $DEST_SGE_ROOT/include
|
|
done
|
|
|
|
- for filename in $DRMAAJ_FILES $JUTIJ_FILES $JGDIJ_FILES; do
|
|
- filename="${filename}.jar"
|
|
- if [ -f $filename ]; then
|
|
- echo Installing `basename $filename`
|
|
- Execute rm -f $DEST_SGE_ROOT/lib/`basename $filename`
|
|
- MakeDir lib
|
|
- Install 0.0 644 $filename $DEST_SGE_ROOT/lib/`basename $filename`
|
|
- elif [ $exit_on_error = true ]; then
|
|
- echo "\"$filename\" not found. Installation failed."
|
|
- exit 1
|
|
- fi
|
|
- done
|
|
+# for filename in $DRMAAJ_FILES $JUTIJ_FILES $JGDIJ_FILES; do
|
|
+# filename="${filename}.jar"
|
|
+# if [ -f $filename ]; then
|
|
+# echo Installing `basename $filename`
|
|
+# Execute rm -f $DEST_SGE_ROOT/lib/`basename $filename`
|
|
+# MakeDir lib
|
|
+# Install 0.0 644 $filename $DEST_SGE_ROOT/lib/`basename $filename`
|
|
+# elif [ $exit_on_error = true ]; then
|
|
+# echo "\"$filename\" not found. Installation failed."
|
|
+# exit 1
|
|
+# fi
|
|
+# done
|
|
|
|
Cleanup include
|
|
fi
|
|
@@ -1003,19 +997,6 @@
|
|
Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
|
|
done
|
|
|
|
- HPCBASE=mpi/SunHPCT5
|
|
- Execute mkdir -p $DEST_SGE_ROOT/$HPCBASE
|
|
-
|
|
- for f in $SUNHPCTIGHT_FILES; do
|
|
- Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
|
|
- Execute chmod 644 $DEST_SGE_ROOT/$HPCBASE/$f
|
|
- done
|
|
-
|
|
- for f in $SUNHPCTIGHT_SCRIPTS; do
|
|
- Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
|
|
- Execute chmod 755 $DEST_SGE_ROOT/$HPCBASE/$f
|
|
- done
|
|
-
|
|
Cleanup mpi
|
|
fi
|
|
|
|
@@ -1163,7 +1144,7 @@
|
|
|
|
for prog in $PROG; do
|
|
case $prog in
|
|
- jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|qmontree|common|distcommon|utilbin|arco)
|
|
+ jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|nodrmaa|noqmon|pvm|qmontree|common|distcommon|utilbin|arco)
|
|
:
|
|
;;
|
|
qmake)
|
|
@@ -1278,6 +1259,8 @@
|
|
InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
|
|
elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
|
|
InstallProg $BERKELEYDBBASE/bin/$prog
|
|
+ elif [ -f $BERKELEYDBBASE/bin/$prog${BDB_LIB_SUFFIX} ]; then
|
|
+ InstallProgAs $BERKELEYDBBASE/bin/$prog${BDB_LIB_SUFFIX} $prog
|
|
fi
|
|
fi
|
|
elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
|
|
@@ -1408,6 +1391,8 @@
|
|
libname="$lib.$shlibext"
|
|
elif [ $DSTARCH = darwin-ppc -o $DSTARCH = darwin-x86 ]; then
|
|
libname="$lib.$OPENSSLSOVERSION.$shlibext"
|
|
+ elif [ ${DSTARCH%%-*} = fbsd ]; then
|
|
+ libname="$OPENSSLBASE/lib/$lib.$shlibext"
|
|
else
|
|
libname="$lib.$shlibext.$OPENSSLSOVERSION"
|
|
fi
|
|
@@ -1422,7 +1407,7 @@
|
|
InstallProg $libname
|
|
if [ $DSTARCH = tru64 ]; then
|
|
:
|
|
- 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
|