summaryrefslogtreecommitdiff
path: root/parallel
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2009-05-13 21:00:25 +0000
committermarkd <markd@pkgsrc.org>2009-05-13 21:00:25 +0000
commit1f9b4c17a432c46b42772ca0eb5987487a5f038a (patch)
tree609a596c54a505714a95e6ddbc7ff849b1ff5e41 /parallel
parentba1eb26e9d5f72f2fd80984fa68dc2da93c545d4 (diff)
downloadpkgsrc-1f9b4c17a432c46b42772ca0eb5987487a5f038a.tar.gz
Update sge to 6.2.2.1
Grid Engine 6.2, which has undergone significant changes in qmaster to significantly improve its scalability in challenging environments, adds powerful features to the core system, introduces multi cluster support for the Accounting and Reporting Console (ARCo) and comes with a new module extending the scope of Grid Engine to a new domain of use cases: the Service Domain Manager (SDM), aka. project Hedeby allows to dynamically (re-)assign computational resources on demand. plus lots of bug fixes.
Diffstat (limited to 'parallel')
-rw-r--r--parallel/sge/MESSAGE6
-rw-r--r--parallel/sge/Makefile32
-rw-r--r--parallel/sge/PLIST68
-rw-r--r--parallel/sge/patches/patch-aa13
-rw-r--r--parallel/sge/patches/patch-ab13
-rw-r--r--parallel/sge/patches/patch-ac13
-rw-r--r--parallel/sge/patches/patch-ad13
-rw-r--r--parallel/sge/patches/patch-ae13
-rw-r--r--parallel/sge/patches/patch-af13
-rw-r--r--parallel/sge/patches/patch-ag13
-rw-r--r--parallel/sge/patches/patch-ah34
-rw-r--r--parallel/sge/patches/patch-ai17
-rw-r--r--parallel/sge/patches/patch-ak36
-rw-r--r--parallel/sge/patches/patch-am39
-rw-r--r--parallel/sge/patches/patch-au13
-rw-r--r--parallel/sge/patches/patch-av15
-rw-r--r--parallel/sge/patches/patch-bd21
-rw-r--r--parallel/sge/patches/patch-bm22
18 files changed, 265 insertions, 129 deletions
diff --git a/parallel/sge/MESSAGE b/parallel/sge/MESSAGE
index 006e65fccf4..f47f707ecd2 100644
--- a/parallel/sge/MESSAGE
+++ b/parallel/sge/MESSAGE
@@ -1,10 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/10/19 11:51:27 markd Exp $
+$NetBSD: MESSAGE,v 1.4 2009/05/13 21:00:25 markd Exp $
You will need to add the following lines to /etc/services:
-sge_qmaster 536/tcp
-sge_execd 537/tcp
+sge_qmaster 6444/tcp
+sge_execd 6445/tcp
In addition after installation, you need to set up SGE. To configure the
master node of the cluster, run:
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index b6d83d1feaa..ae9f159c1fb 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2008/11/26 10:20:08 markd Exp $
+# $NetBSD: Makefile,v 1.35 2009/05/13 21:00:25 markd Exp $
#
-PKGNAME= sge-6.1.5
-DISTNAME= ge-V61u5_TAG-src
+PKGNAME= sge-6.2.2.1
+DISTNAME= ge-V62u2_1_TAG-src
CATEGORIES= parallel sysutils
-MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/182/
+MASTER_SITES= http://gridengine.sunsource.net/files/documents/7/197/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gridengine.sunsource.net/
@@ -91,16 +91,18 @@ post-patch:
${ECHO} " `${WRKSRC}/source/dist/util/arch`" ; \
${FALSE} ; \
fi
-
-pre-configure:
-.for __tmp__ in source/dist/util/arch_variables source/scripts/distinst.site source/aimk.site
- ${MV} ${WRKSRC}/${__tmp__} ${WRKSRC}/${__tmp__}.bak
- ${SED} -e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};g' -e 's;@ssl_prefix@;${SSL_PREFIX};g' \
- -e 's;@db4_prefix@;${BUILDLINK_PREFIX.db4};g' \
- -e 's;@perl5@;${PERL5};g' ${WRKSRC}/${__tmp__}.bak > \
- ${WRKSRC}/${__tmp__}
- ${RM} ${WRKSRC}/${__tmp__}.bak
-.endfor
+ ( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \
+ ${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \
+ ${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \
+ ${ECHO} "set BDB_LIB_SUFFIX = 4" ; \
+ ${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private
+ ( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \
+ ${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= post-patch
+SUBST_FILES.paths= source/dist/util/arch_variables
+SUBST_SED.paths= -e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'
do-configure:
.for __prog__ in qmake qtcsh
@@ -123,7 +125,7 @@ do-install:
#${CHOWN} ${SGE_USER} ${DESTDIR}${SGE_ROOT}
#${CHGRP} ${SGE_GROUP} ${DESTDIR}${SGE_ROOT}
cd ${WRKSRC}/source && \
- ${ECHO} "Y" | ${SETENV} LOCALBASE=${LOCALBASE} DESTDIR=${DESTDIR} SGE_ROOT=${SGE_ROOT} ./scripts/distinst -local -allall -nobdb -noopenssl ${SGE_ARCH}
+ ${ECHO} "Y" | ${SETENV} LOCALBASE=${LOCALBASE} DESTDIR=${DESTDIR} SGE_ROOT=${SGE_ROOT} ./scripts/distinst -local -all -nobdb -noopenssl ${SGE_ARCH} -- doc man
for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \
ln -s ${DESTDIR}${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
ln -s ${DESTDIR}${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
diff --git a/parallel/sge/PLIST b/parallel/sge/PLIST
index 85691457987..46412f28d3e 100644
--- a/parallel/sge/PLIST
+++ b/parallel/sge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/09/15 16:30:57 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/05/13 21:00:25 markd Exp $
bin/qacct
bin/qalter
bin/qconf
@@ -11,9 +11,12 @@ bin/qmod
bin/qmon
bin/qping
bin/qquota
+bin/qrdel
bin/qresub
bin/qrls
bin/qrsh
+bin/qrstat
+bin/qrsub
bin/qselect
bin/qsh
bin/qstat
@@ -33,9 +36,12 @@ sge/bin/${SGE_ARCH}/qmod
sge/bin/${SGE_ARCH}/qmon
sge/bin/${SGE_ARCH}/qping
sge/bin/${SGE_ARCH}/qquota
+sge/bin/${SGE_ARCH}/qrdel
sge/bin/${SGE_ARCH}/qresub
sge/bin/${SGE_ARCH}/qrls
sge/bin/${SGE_ARCH}/qrsh
+sge/bin/${SGE_ARCH}/qrstat
+sge/bin/${SGE_ARCH}/qrsub
sge/bin/${SGE_ARCH}/qselect
sge/bin/${SGE_ARCH}/qsh
sge/bin/${SGE_ARCH}/qstat
@@ -44,7 +50,6 @@ sge/bin/${SGE_ARCH}/qtcsh
sge/bin/${SGE_ARCH}/sge_coshepherd
sge/bin/${SGE_ARCH}/sge_execd
sge/bin/${SGE_ARCH}/sge_qmaster
-sge/bin/${SGE_ARCH}/sge_schedd
sge/bin/${SGE_ARCH}/sge_shadowd
sge/bin/${SGE_ARCH}/sge_shepherd
sge/bin/${SGE_ARCH}/sgepasswd
@@ -53,6 +58,7 @@ sge/catman/cat/cat1/gethostbyname.1
sge/catman/cat/cat1/gethostname.1
sge/catman/cat/cat1/getservbyname.1
sge/catman/cat/cat1/hostnameutils.1
+sge/catman/cat/cat1/jsv.1
sge/catman/cat/cat1/qacct.1
sge/catman/cat/cat1/qalter.1
sge/catman/cat/cat1/qconf.1
@@ -65,9 +71,12 @@ sge/catman/cat/cat1/qmod.1
sge/catman/cat/cat1/qmon.1
sge/catman/cat/cat1/qping.1
sge/catman/cat/cat1/qquota.1
+sge/catman/cat/cat1/qrdel.1
sge/catman/cat/cat1/qresub.1
sge/catman/cat/cat1/qrls.1
sge/catman/cat/cat1/qrsh.1
+sge/catman/cat/cat1/qrstat.1
+sge/catman/cat/cat1/qrsub.1
sge/catman/cat/cat1/qselect.1
sge/catman/cat/cat1/qsh.1
sge/catman/cat/cat1/qstat.1
@@ -120,6 +129,7 @@ sge/catman/cat/cat3/drmaa_wifaborted.3
sge/catman/cat/cat3/drmaa_wifexited.3
sge/catman/cat/cat3/drmaa_wifsignaled.3
sge/catman/cat/cat3/drmaa_wtermsig.3
+sge/catman/cat/cat3/jsv_script_interface.3
sge/catman/cat/cat5/access_list.5
sge/catman/cat/cat5/accounting.5
sge/catman/cat/cat5/bootstrap.5
@@ -146,11 +156,12 @@ sge/catman/cat/cat5/share_tree.5
sge/catman/cat/cat5/user.5
sge/catman/cat/cat5/usermapping.5
sge/catman/cat/cat8/SGE_Helper_Service.exe.8
+sge/catman/cat/cat8/sge_ca.8
sge/catman/cat/cat8/sge_execd.8
sge/catman/cat/cat8/sge_qmaster.8
-sge/catman/cat/cat8/sge_schedd.8
sge/catman/cat/cat8/sge_shadowd.8
sge/catman/cat/cat8/sge_shepherd.8
+sge/catman/cat/cat8/sge_st.8
sge/ckpt/README.cpr
sge/ckpt/README.cray
sge/ckpt/checkpoint_command
@@ -169,9 +180,7 @@ sge/ckpt/sx6_ckpt_command
sge/ckpt/sx6_clean_command
sge/ckpt/sx6_migration_command
sge/ckpt/sx6_restart_command
-sge/doc/README-Autoinstall.txt
sge/doc/README-DRMAA.txt
-sge/doc/README-Upgrade.txt
sge/doc/arc_depend_irix.asc
sge/doc/arc_depend_solaris.asc
sge/doc/load_parameters.asc
@@ -191,7 +200,6 @@ sge/examples/drmaa/howto4.c
sge/examples/drmaa/howto5.c
sge/examples/drmaa/howto6.c
sge/examples/jobs/array_submitter.sh
-sge/examples/jobs/hello.bat
sge/examples/jobs/jobnet_submitter.sh
sge/examples/jobs/pascal.sh
sge/examples/jobs/pminiworm.sh
@@ -199,7 +207,6 @@ sge/examples/jobs/simple.sh
sge/examples/jobs/sleeper.sh
sge/examples/jobs/step_A_array_submitter.sh
sge/examples/jobs/step_B_array_submitter.sh
-sge/examples/jobs/worker.exe
sge/examples/jobs/worker.sh
sge/examples/jobsbin/${SGE_ARCH}/work
sge/include/drmaa.h
@@ -208,7 +215,6 @@ sge/install_execd
sge/install_qmaster
sge/lib/${SGE_ARCH}/libXltree.so
sge/lib/${SGE_ARCH}/libdrmaa.so
-sge/lib/${SGE_ARCH}/libdrmaa.so.0.95
sge/lib/${SGE_ARCH}/libdrmaa.so.1.0
sge/lib/${SGE_ARCH}/libjuti.so
sge/lib/${SGE_ARCH}/libspoolb.so
@@ -218,6 +224,7 @@ sge/man/man1/gethostbyname.1
sge/man/man1/gethostname.1
sge/man/man1/getservbyname.1
sge/man/man1/hostnameutils.1
+sge/man/man1/jsv.1
sge/man/man1/qacct.1
sge/man/man1/qalter.1
sge/man/man1/qconf.1
@@ -230,9 +237,12 @@ sge/man/man1/qmod.1
sge/man/man1/qmon.1
sge/man/man1/qping.1
sge/man/man1/qquota.1
+sge/man/man1/qrdel.1
sge/man/man1/qresub.1
sge/man/man1/qrls.1
sge/man/man1/qrsh.1
+sge/man/man1/qrstat.1
+sge/man/man1/qrsub.1
sge/man/man1/qselect.1
sge/man/man1/qsh.1
sge/man/man1/qstat.1
@@ -285,6 +295,7 @@ sge/man/man3/drmaa_wifaborted.3
sge/man/man3/drmaa_wifexited.3
sge/man/man3/drmaa_wifsignaled.3
sge/man/man3/drmaa_wtermsig.3
+sge/man/man3/jsv_script_interface.3
sge/man/man5/access_list.5
sge/man/man5/accounting.5
sge/man/man5/bootstrap.5
@@ -311,11 +322,12 @@ sge/man/man5/share_tree.5
sge/man/man5/user.5
sge/man/man5/usermapping.5
sge/man/man8/SGE_Helper_Service.exe.8
+sge/man/man8/sge_ca.8
sge/man/man8/sge_execd.8
sge/man/man8/sge_qmaster.8
-sge/man/man8/sge_schedd.8
sge/man/man8/sge_shadowd.8
sge/man/man8/sge_shepherd.8
+sge/man/man8/sge_st.8
sge/mpi/README
sge/mpi/README.atm
sge/mpi/SunHPCT5/README
@@ -358,6 +370,8 @@ sge/pvm/stoppvm.sh
sge/qmon/PIXMAPS/21cal.xpm
sge/qmon/PIXMAPS/21cal_ins.xpm
sge/qmon/PIXMAPS/aclask.xpm
+sge/qmon/PIXMAPS/ar.xpm
+sge/qmon/PIXMAPS/big/toolbar_ar.xpm
sge/qmon/PIXMAPS/big/toolbar_browser.xpm
sge/qmon/PIXMAPS/big/toolbar_calendar.xpm
sge/qmon/PIXMAPS/big/toolbar_ckpt.xpm
@@ -440,6 +454,7 @@ sge/qmon/PIXMAPS/stdoutput.xpm
sge/qmon/PIXMAPS/stdoutput_ins.xpm
sge/qmon/PIXMAPS/str.xpm
sge/qmon/PIXMAPS/time.xpm
+sge/qmon/PIXMAPS/toolbar_ar.xpm
sge/qmon/PIXMAPS/toolbar_browser.xpm
sge/qmon/PIXMAPS/toolbar_calendar.xpm
sge/qmon/PIXMAPS/toolbar_ckpt.xpm
@@ -494,9 +509,15 @@ sge/util/install_modules/inst_qmaster_uninst.sh
sge/util/install_modules/inst_schedd_high.conf
sge/util/install_modules/inst_schedd_max.conf
sge/util/install_modules/inst_schedd_normal.conf
+sge/util/install_modules/inst_st.sh
sge/util/install_modules/inst_template.conf
-sge/util/install_modules/inst_update.sh
+sge/util/jaas.config.template
+sge/util/java.policy.template
+sge/util/jmxremote.access
+sge/util/jmxremote.password
sge/util/logchecker.sh
+sge/util/logging.properties.template
+sge/util/management.properties.template
sge/util/qtask
sge/util/rctemplates/darwin_template
sge/util/rctemplates/sgebdb_template
@@ -553,6 +574,12 @@ sge/util/resources/centry/tmpdir
sge/util/resources/centry/virtual_free
sge/util/resources/centry/virtual_total
sge/util/resources/centry/virtual_used
+sge/util/resources/jsv/JSV.pm
+sge/util/resources/jsv/jsv.pl
+sge/util/resources/jsv/jsv.sh
+sge/util/resources/jsv/jsv.tcl
+sge/util/resources/jsv/jsv_include.sh
+sge/util/resources/jsv/jsv_include.tcl
sge/util/resources/loadsensors/calendar.sh
sge/util/resources/loadsensors/ibm-loadsensor
sge/util/resources/loadsensors/interix-loadsensor.sh
@@ -565,12 +592,15 @@ sge/util/resources/pe/make
sge/util/resources/pe/make.sge_pqs_api
sge/util/resources/schemas/qhost/qhost.xsd
sge/util/resources/schemas/qquota/qquota.xsd
+sge/util/resources/schemas/qrstat/qrstat.xsd
sge/util/resources/schemas/qstat/detailed_job_info.xsd
sge/util/resources/schemas/qstat/message.xsd
sge/util/resources/schemas/qstat/qstat.xsd
sge/util/resources/starter_methods/settaskid.sh
+sge/util/resources/usersets/arusers
sge/util/resources/usersets/deadlineusers
sge/util/resources/usersets/defaultdepartment
+sge/util/rmiconsole.policy
sge/util/setfileperm.sh
sge/util/setfileperm.sh.orig
sge/util/sgeCA/renew_all_certs.csh
@@ -578,9 +608,20 @@ sge/util/sgeCA/sge_ca
sge/util/sgeCA/sge_ca.cnf
sge/util/sgeCA/sge_ssl.cnf
sge/util/sgeCA/sge_ssl_template.cnf
+sge/util/sgeSMF/bdb_template.xml
+sge/util/sgeSMF/execd_template.xml
+sge/util/sgeSMF/qmaster_template.xml
+sge/util/sgeSMF/sge_smf.sh
+sge/util/sgeSMF/sge_smf_support.sh
+sge/util/sgeSMF/shadowd_template.xml
+sge/util/sgeST/sge_st
+sge/util/sgeST/st_settings.sh
sge/util/sge_aliases
sge/util/sge_request
sge/util/sgeremoterun
+sge/util/upgrade_modules/inst_upgrade.sh
+sge/util/upgrade_modules/load_sge_config.sh
+sge/util/upgrade_modules/save_sge_config.sh
sge/utilbin/${SGE_ARCH}/adminrun
sge/utilbin/${SGE_ARCH}/authuser
sge/utilbin/${SGE_ARCH}/berkeley_db_svc
@@ -596,6 +637,7 @@ sge/utilbin/${SGE_ARCH}/db_recover
sge/utilbin/${SGE_ARCH}/db_stat
sge/utilbin/${SGE_ARCH}/db_upgrade
sge/utilbin/${SGE_ARCH}/db_verify
+sge/utilbin/${SGE_ARCH}/echo_raw
sge/utilbin/${SGE_ARCH}/filestat
sge/utilbin/${SGE_ARCH}/fstype
sge/utilbin/${SGE_ARCH}/gethostbyaddr
@@ -607,6 +649,7 @@ sge/utilbin/${SGE_ARCH}/loadcheck
sge/utilbin/${SGE_ARCH}/now
sge/utilbin/${SGE_ARCH}/openssl
sge/utilbin/${SGE_ARCH}/qrsh_starter
+sge/utilbin/${SGE_ARCH}/read_raw
sge/utilbin/${SGE_ARCH}/rlogin
sge/utilbin/${SGE_ARCH}/rsh
sge/utilbin/${SGE_ARCH}/rshd
@@ -618,15 +661,20 @@ sge/utilbin/${SGE_ARCH}/testsuidroot
sge/utilbin/${SGE_ARCH}/uidgid
@dirrm sge/utilbin/${SGE_ARCH}
@dirrm sge/utilbin
+@dirrm sge/util/upgrade_modules
+@dirrm sge/util/sgeST
+@dirrm sge/util/sgeSMF
@dirrm sge/util/sgeCA
@dirrm sge/util/resources/usersets
@dirrm sge/util/resources/starter_methods
@dirrm sge/util/resources/schemas/qstat
+@dirrm sge/util/resources/schemas/qrstat
@dirrm sge/util/resources/schemas/qquota
@dirrm sge/util/resources/schemas/qhost
@dirrm sge/util/resources/schemas
@dirrm sge/util/resources/pe
@dirrm sge/util/resources/loadsensors
+@dirrm sge/util/resources/jsv
@dirrm sge/util/resources/centry
@dirrm sge/util/resources/calendars
@dirrm sge/util/resources
diff --git a/parallel/sge/patches/patch-aa b/parallel/sge/patches/patch-aa
new file mode 100644
index 00000000000..4253928e2a4
--- /dev/null
+++ b/parallel/sge/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2009/05/13 21:00:25 markd Exp $
+
+--- source/libs/uti/sge_pty.c.orig 2008-12-04 23:57:01.000000000 +1300
++++ source/libs/uti/sge_pty.c
+@@ -54,7 +54,7 @@
+ # include <sys/ioctl.h>
+ # include <stropts.h>
+ # include <termio.h>
+-#elif defined(FREEBSD)
++#elif defined(FREEBSD) || defined(NETBSD)
+ # include <termios.h>
+ #else
+ # include <termio.h>
diff --git a/parallel/sge/patches/patch-ab b/parallel/sge/patches/patch-ab
new file mode 100644
index 00000000000..89fbbef36ce
--- /dev/null
+++ b/parallel/sge/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/05/13 21:00:25 markd Exp $
+
+--- source/daemons/shepherd/shepherd.c.orig 2009-02-16 21:50:38.000000000 +1300
++++ source/daemons/shepherd/shepherd.c
+@@ -117,7 +117,7 @@ struct rusage {
+ #elif defined(INTERIX)
+ # include <termios.h>
+ # include <sys/ioctl.h>
+-#elif defined(FREEBSD)
++#elif defined(FREEBSD) || defined(NETBSD)
+ # include <termios.h>
+ #else
+ # include <termio.h>
diff --git a/parallel/sge/patches/patch-ac b/parallel/sge/patches/patch-ac
new file mode 100644
index 00000000000..66c70402049
--- /dev/null
+++ b/parallel/sge/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2009/05/13 21:00:25 markd Exp $
+
+--- source/daemons/shepherd/sge_shepherd_ijs.c.orig 2008-12-04 23:56:58.000000000 +1300
++++ source/daemons/shepherd/sge_shepherd_ijs.c
+@@ -54,7 +54,7 @@
+ #elif defined(INTERIX)
+ # include <termios.h>
+ # include <sys/ioctl.h>
+-#elif defined(FREEBSD)
++#elif defined(FREEBSD) || defined(NETBSD)
+ # include <sys/ioctl.h>
+ # include <termios.h>
+ #else
diff --git a/parallel/sge/patches/patch-ad b/parallel/sge/patches/patch-ad
new file mode 100644
index 00000000000..ee28dd18796
--- /dev/null
+++ b/parallel/sge/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2009/05/13 21:00:25 markd Exp $
+
+--- source/daemons/shepherd/Makefile.orig 2008-10-31 02:54:16.000000000 +1300
++++ source/daemons/shepherd/Makefile
+@@ -62,7 +62,7 @@ SHEPHERD_OBJS = $(SHEPHERD_SRC:.c=.o) sg
+
+ SHEPHERD_ADD_OBJS = $(SHEPHERD_ADD_SRC:.c=.o)
+
+-SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm_static -lcommlists -luti $(WINGRIDLIB_STATIC) -llck -lrmon $(DLLIB)
++SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB)
+
+ SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP) $(LCKLIB) $(RMONLIB)
+
diff --git a/parallel/sge/patches/patch-ae b/parallel/sge/patches/patch-ae
new file mode 100644
index 00000000000..7b5465f8fce
--- /dev/null
+++ b/parallel/sge/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2009/05/13 21:00:25 markd Exp $
+
+--- source/clients/common/sge_client_ijs.c.orig 2008-12-11 01:09:23.000000000 +1300
++++ source/clients/common/sge_client_ijs.c
+@@ -45,7 +45,7 @@
+ #elif defined(INTERIX)
+ # include <termios.h>
+ # include <sys/ioctl.h>
+-#elif defined(FREEBSD)
++#elif defined(FREEBSD) || defined(NETBSD)
+ # include <termios.h>
+ # include <sys/ioctl.h>
+ #else
diff --git a/parallel/sge/patches/patch-af b/parallel/sge/patches/patch-af
new file mode 100644
index 00000000000..6bea6cc5b3d
--- /dev/null
+++ b/parallel/sge/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2009/05/13 21:00:25 markd Exp $
+
+--- source/clients/qsh/qsh.c.orig 2008-12-11 23:39:39.000000000 +1300
++++ source/clients/qsh/qsh.c
+@@ -94,7 +94,7 @@
+ #elif defined(INTERIX)
+ # include <termios.h>
+ # include <sys/ioctl.h>
+-#elif defined(FREEBSD)
++#elif defined(FREEBSD) || defined(NETBSD)
+ # include <termios.h>
+ #else
+ # include <termio.h>
diff --git a/parallel/sge/patches/patch-ag b/parallel/sge/patches/patch-ag
new file mode 100644
index 00000000000..be4c6e17165
--- /dev/null
+++ b/parallel/sge/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 2009/05/13 21:00:25 markd Exp $
+
+--- source/libs/spool/Makefile.orig 2009-02-10 00:06:38.000000000 +1300
++++ source/libs/spool/Makefile
+@@ -123,7 +123,7 @@ test_sge_spooling.o: $(SPOOLLIB_DIR)/tes
+ $(CC) $(CFLAGS) -c $(SPOOLLIB_DIR)/test_sge_spooling.c
+
+ test_sge_spooling_utilities: test_sge_spooling_utilities.o $(SPOOLING_DEPS) $(SGEOBJLIB) $(SGEOBJDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SCHEDLIB) $(LCKLIB) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(UTILIB) $(RMONLIB) $(WINGRIDLIB_DEP)
+- $(LD_WRAPPER) $(CC) $(CFLAGS) -o test_sge_spooling_utilities $(LFLAGS) test_sge_spooling_utilities.o $(SPOOLING_LIBS) $(SCHEDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(UTILIB) $(RMONLIB) $(WINGRIDLIB) $(LCKLIB) $(SECLIB) $(SLIBS) $(LIBS) $(DLLIB)
++ $(LD_WRAPPER) $(CC) $(CFLAGS) -o test_sge_spooling_utilities $(LFLAGS) test_sge_spooling_utilities.o $(SPOOLING_LIBS) $(SPOOLLIB) $(SCHEDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(UTILIB) $(RMONLIB) $(WINGRIDLIB) $(LCKLIB) $(SECLIB) $(SLIBS) $(LIBS) $(DLLIB)
+
+ test_sge_spooling_utilities.o: $(SPOOLLIB_DIR)/test_sge_spooling_utilities.c
+ $(CC) $(CFLAGS) -c $(SPOOLLIB_DIR)/test_sge_spooling_utilities.c
diff --git a/parallel/sge/patches/patch-ah b/parallel/sge/patches/patch-ah
deleted file mode 100644
index 387f134917a..00000000000
--- a/parallel/sge/patches/patch-ah
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2008/11/26 10:20:08 markd Exp $
-
---- source/aimk.site.orig 2008-07-04 03:10:38.000000000 +1200
-+++ source/aimk.site
-@@ -72,16 +72,16 @@ setenv TMPDIR /tmp
- # is installed
- #
- set OPENSSL_SOVERSION = 0.9.7l
--set OPENSSL_HOME = /off_home/gridengine/openssl-0.9.7l-origin/$buildarch
-+set OPENSSL_HOME = @ssl_prefix@
-
- #
- # BERKELEYDB_HOME the directory where the include and lib directory of
- # Berkeley DB is installed
- #
--set BERKELEYDB_HOME = /off_home/gridengine/db-4.4.20/$buildarch
--set BDB_INCLUDE_SUBDIR =
-+set BERKELEYDB_HOME = @db4_prefix@
-+set BDB_INCLUDE_SUBDIR = db4
- set BDB_LIB_SUBDIR =
--set BDB_LIB_SUFFIX =
-+set BDB_LIB_SUFFIX = 4
-
- #
- # KRB_HOME the directory where the include and lib directory of kerberos is
-@@ -106,7 +106,7 @@ set SWIG = /vol2/tools/SW/swig-1.3.22/$b
- #
- # PERL path
- #
--set PERL = /vol2/tools/SW/$buildarch/bin/perl
-+set PERL = @perl5@
-
- #
- # TCLSH path
diff --git a/parallel/sge/patches/patch-ai b/parallel/sge/patches/patch-ai
deleted file mode 100644
index 082c78463e0..00000000000
--- a/parallel/sge/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2008/11/26 10:20:08 markd Exp $
-
---- source/scripts/distinst.site.orig 2008-07-04 03:10:39.000000000 +1200
-+++ source/scripts/distinst.site
-@@ -32,10 +32,10 @@
-
- # Base directory where the openssl binary and libraries reside
- OPENSSLSOVERSION=0.9.7
--OPENSSLBASE=/off_home/gridengine/openssl-0.9.7l-origin
-+OPENSSLBASE=@ssl_prefix@
-
- # Base directory where BDB resides
--BERKELEYDBBASE=/off_home/gridengine/db-4.4.20
-+BERKELEYDBBASE=@db4_prefix@
-
- TAR=gtar
-
diff --git a/parallel/sge/patches/patch-ak b/parallel/sge/patches/patch-ak
index 9ebd884f1e4..3f8e6c76aae 100644
--- a/parallel/sge/patches/patch-ak
+++ b/parallel/sge/patches/patch-ak
@@ -1,23 +1,33 @@
-$NetBSD: patch-ak,v 1.5 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-ak,v 1.6 2009/05/13 21:00:25 markd Exp $
---- source/utilbin/Makefile.orig Wed Feb 7 13:49:17 2007
-+++ source/utilbin/Makefile Fri May 30 11:13:22 2008
-@@ -206,7 +206,7 @@
+Add LDFLAGS
+
+--- source/utilbin/Makefile.orig 2009-02-11 22:27:33.000000000 +1300
++++ source/utilbin/Makefile
+@@ -145,7 +145,7 @@ read_raw.o: $(UTILBIN_DIR)/read_raw.c
+
+ #---------------------------------------------------------------------
+ echo_raw: echo_raw.o version.o $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
+- $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck $(COMMLISTSLIB) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck -lcommlists $(LIBS)
+
+ echo_raw.o: $(UTILBIN_DIR)/echo_raw.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
+@@ -221,7 +221,7 @@ fstype.o: $(UTILBIN_DIR)/fstype.c
$(CC) $(CFLAGS) $(MEMCFLAG) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/fstype.c
#---------------------------------------------------------------------
- spooldefaults: spooldefaults.o version.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLCLIB) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SECLIBS) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(LCKLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB)
-- $(CC) -o $@ spooldefaults.o version.o sge_mt_init.o $(LFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
-+ $(CC) -o $@ spooldefaults.o version.o sge_mt_init.o $(LFLAGS) $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
+ spooldefaults: spooldefaults.o version.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLCLIB) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(LCKLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB)
+- $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
-@@ -241,8 +241,7 @@
+@@ -256,7 +256,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
#---------------------------------------------------------------------
- spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SECLIBS) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(LCKLIB) $(RMONLIB)
-- $(CC) -o $@ spooledit.o version.o sge_mt_init.o $(LFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
--
-+ $(CC) -o $@ spooledit.o version.o sge_mt_init.o $(LFLAGS) $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+ spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(LCKLIB) $(RMONLIB)
+- $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+
spooledit.o: $(UTILBIN_DIR)/spooledit.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c
-
diff --git a/parallel/sge/patches/patch-am b/parallel/sge/patches/patch-am
index 732f7325035..5382c5334cf 100644
--- a/parallel/sge/patches/patch-am
+++ b/parallel/sge/patches/patch-am
@@ -1,17 +1,29 @@
-$NetBSD: patch-am,v 1.4 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-am,v 1.5 2009/05/13 21:00:25 markd Exp $
---- source/aimk.orig Wed Aug 29 14:27:51 2007
-+++ source/aimk Fri May 30 11:03:28 2008
-@@ -368,7 +368,7 @@
+Pkgsrc stuff
+GridEngine dev mailing list patch for "nbsd-1" issue
+
+--- source/aimk.orig 2009-02-17 22:27:39.000000000 +1300
++++ source/aimk
+@@ -265,7 +265,7 @@ set DEBUGGED = 0
+ set COMPILE_DC = 0
+ set CC = cc
+ set CXX = CC
+-set CFLAGS = "-DSGE_ARCH_STRING=$buildarch -D$TARGET_BITS $INP_CFLAGS"
++set CFLAGS = "-D$TARGET_BITS $INP_CFLAGS"
+ set CORE_INCLUDE = "-I../common -I../libs -I../libs/uti -I../libs/juti -I../libs/gdi -I../libs/japi -I../libs/sgeobj -I../libs/cull -I../libs/rmon -I../libs/comm -I../libs/comm/lists -I../libs/sched -I../libs/evc -I../libs/evm -I../libs/mir -I../libs/lck -I../daemons/common -I../daemons/qmaster -I../daemons/execd -I../daemons/schedd -I../clients/common -I."
+ set DEBUG_FLAG = ""
+ set INSURE_FLAG = ""
+@@ -386,7 +386,7 @@ set SPOOLING_DEPS = "spoolloaderlib sp
# we generate a berkeley db shared lib, so we need bdb include and lib path
set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS"
set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS"
--set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib"
+-set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}"
+set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib -R$BERKELEYDB_HOME/lib"
# JUTI Targets
set JUTI_ALL = juti_all
-@@ -1101,9 +1101,9 @@
+@@ -1169,9 +1169,9 @@ case NETBSD_*:
set DLLIB = ""
set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
@@ -23,7 +35,7 @@ $NetBSD: patch-am,v 1.4 2008/09/15 16:30:57 ahoka Exp $
set LIBS = "$LIBS -lkvm"
set SHAREDLD = $CC
set SHARED_CFLAGS = "-fPIC"
-@@ -1111,9 +1111,9 @@
+@@ -1179,9 +1179,9 @@ case NETBSD_*:
set AUTHLIBS = "-lcrypt -lpam"
set XMTDEF = ""
@@ -35,3 +47,16 @@ $NetBSD: patch-am,v 1.4 2008/09/15 16:30:57 ahoka Exp $
set XLFLAGS = "$XLIBD"
set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
set RM = "rm -f"
+@@ -1875,6 +1875,12 @@ default:
+ endsw
+
+ set DEPEND_FLAGS = "`echo $DEPEND_FLAGS | sed -e 's/-[^DI][^ ]*//g'`"
++
++# we set SGE_ARCH_STRING down here because the sed command above
++# would mess up the quotes around buildarch
++set ARCH_STRING = SGE_ARCH_STRING='\"'${buildarch}'\"'
++set CFLAGS = "-D$ARCH_STRING $CFLAGS"
++set DEPEND_FLAGS = "-D$ARCH_STRING $DEPEND_FLAGS"
+
+ if ( $JNI == 1 ) then
+ set CORE_INCLUDE = "$CORE_INCLUDE -I${JAVA_HOME}/${JAVA_INCL}"
diff --git a/parallel/sge/patches/patch-au b/parallel/sge/patches/patch-au
deleted file mode 100644
index 084746c854e..00000000000
--- a/parallel/sge/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.3 2008/11/26 10:20:08 markd Exp $
-
---- source/libs/uti/Makefile.orig 2007-07-10 01:43:48.000000000 +1200
-+++ source/libs/uti/Makefile
-@@ -186,7 +186,7 @@ sge_nprocs.o: $(UTILIB_DIR)/sge_nprocs.c
- $(CC) $(CFLAGS) $(COD_NPROCS_CFLAGS) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_nprocs.c
-
- sge_arch.o: $(UTILIB_DIR)/sge_arch.c
-- $(CC) $(CFLAGS) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_arch.c
-+ $(CC) -ansi $(CFLAGS) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_arch.c
-
- sge_loadmem.o: $(UTILIB_DIR)/sge_loadmem.c
- $(CC) $(CFLAGS) $(MEMCFLAG) $(SHARED_CFLAGS) -c $(UTILIB_DIR)/sge_loadmem.c
diff --git a/parallel/sge/patches/patch-av b/parallel/sge/patches/patch-av
new file mode 100644
index 00000000000..19de0c17133
--- /dev/null
+++ b/parallel/sge/patches/patch-av
@@ -0,0 +1,15 @@
+$NetBSD: patch-av,v 1.3 2009/05/13 21:00:25 markd Exp $
+
+GridEngine dev mailing list patch for "nbsd-1" issue, along with aimk change
+
+--- source/libs/uti/sge_arch.c.orig 2009-04-09 13:19:28.000000000 +1200
++++ source/libs/uti/sge_arch.c 2009-04-09 10:10:44.000000000 +1200
+@@ -72,7 +72,7 @@
+ #define xstr(s) str(s)
+ #define str(s) #s
+
+- return xstr(SGE_ARCH_STRING);
++ return (SGE_ARCH_STRING);
+ }
+
+ /****** uti/prog/sge_get_root_dir() *******************************************
diff --git a/parallel/sge/patches/patch-bd b/parallel/sge/patches/patch-bd
index 1161a7e74f2..1b36344d674 100644
--- a/parallel/sge/patches/patch-bd
+++ b/parallel/sge/patches/patch-bd
@@ -1,13 +1,13 @@
-$NetBSD: patch-bd,v 1.3 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-bd,v 1.4 2009/05/13 21:00:25 markd Exp $
Exclude Java files.
DESTDIR support.
---- source/scripts/distinst.orig Tue Nov 20 12:16:24 2007
-+++ source/scripts/distinst Fri May 30 12:14:08 2008
-@@ -75,12 +75,12 @@
+--- source/scripts/distinst.orig 2009-01-31 05:04:08.000000000 +1300
++++ source/scripts/distinst
+@@ -75,12 +75,12 @@ DRMAA_SHARED_LIBRARIES="libdrmaa"
# The last number listed here will be the verson linked from libdrmaa.so
- DRMAA_SHARED_LIB_VERSIONS="0.95 1.0"
+ DRMAA_SHARED_LIB_VERSIONS="1.0"
DRMAA_HEADER_FILES="libs/japi/drmaa.h"
-DRMAAJ_FILES="CLASSES/drmaa"
+#DRMAAJ_FILES="CLASSES/drmaa"
@@ -21,7 +21,16 @@ DESTDIR support.
PVMSOURCES="start_pvm.c stop_pvm.c slave.c master.c spmd.c Makefile"
PVMSRCSCRIPTS="install.sh aimk"
-@@ -517,11 +517,11 @@
+@@ -420,7 +420,7 @@ instclassictargets=false
+ instopenssl=true
+ instbdb=true
+ instarco=false
+-instguiinst=true
++instguiinst=false
+ enforce_shlibpath=false
+
+ cmdname=`basename $0`
+@@ -518,11 +518,11 @@ while [ $# -ge 1 ]; do
echo Please set variable SGE_ROOT. Installation failed.
exit 1
fi
diff --git a/parallel/sge/patches/patch-bm b/parallel/sge/patches/patch-bm
index 6134792117c..a2e29466d1b 100644
--- a/parallel/sge/patches/patch-bm
+++ b/parallel/sge/patches/patch-bm
@@ -1,10 +1,10 @@
-$NetBSD: patch-bm,v 1.1 2008/09/15 16:30:57 ahoka Exp $
+$NetBSD: patch-bm,v 1.2 2009/05/13 21:00:25 markd Exp $
DESTDIR support.
---- source/dist/util/setfileperm.sh.orig Fri Jul 1 12:45:13 2005
-+++ source/dist/util/setfileperm.sh Fri May 30 13:48:16 2008
-@@ -81,7 +81,7 @@
+--- source/dist/util/setfileperm.sh.orig 2008-10-18 03:48:04.000000000 +1300
++++ source/dist/util/setfileperm.sh
+@@ -81,7 +81,7 @@ SetFilePerm()
instauto=false
@@ -13,7 +13,7 @@ DESTDIR support.
echo
echo ERROR: Please set your \$SGE_ROOT environment variable
echo and start this script again. Exit.
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ if [ -z "$SGE_ROOT" -o ! -d "$SGE_ROOT"
exit 1
fi
@@ -22,7 +22,7 @@ DESTDIR support.
echo
echo ERROR: The shell script \"$SGE_ROOT/util/arch\" does not exist.
echo Please verify your distribution and restart this script. Exit.
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ if [ ! -f "$SGE_ROOT/util/arch" ]; then
exit 1
fi
@@ -31,7 +31,7 @@ DESTDIR support.
echo
echo ERROR: Missing shell script \"$SGE_ROOT/util/arch_variables\".
echo Please verify your distribution and restart this script. Exit.
-@@ -105,7 +105,7 @@
+@@ -105,7 +105,7 @@ if [ ! -f $SGE_ROOT/util/arch_variables
exit 1
fi
@@ -40,7 +40,7 @@ DESTDIR support.
if [ $ARCH = "win32-x86" ]; then
echo
-@@ -182,7 +182,7 @@
+@@ -183,7 +183,7 @@ else
done
fi
@@ -49,14 +49,14 @@ DESTDIR support.
if [ $? != 0 ]; then
$ECHO "ERROR: can't change to directory \"$1\". Exiting."
exit 1
-@@ -203,17 +203,17 @@
+@@ -204,17 +204,17 @@ for f in $FILELIST; do
done
for f in $FILELIST $OPTFILES; do
- if [ -d $f -o -f $f ]; then
-- SetFilePerm $f
+- SetFilePerm $f
+ if [ -d $DESTDIR$f -o -f $DESTDIR$f ]; then
-+ SetFilePerm $DESTDIR$f
++ SetFilePerm $DESTDIR$f
fi
done