Update to the Son of Grid Engine 8.0.0d

The Son of Grid Engine is a community project to continue Sun Grid Engine. Notable changes in Son of Grid Engine ------------------------------------- Version 8.0.0d -------------- * Bug fixes * Man and fixes * Fix building with older gcc versions * Provide load average in qstat XML output [#446, #454] * Partially back out Univa change which broke classic spooling * Fix -terse in sge_request [#777] * Other changes (possibly-incompatible) * Message fixes Version 8.0.0c -------------- * Bug fixes * Man and other documentation fixes * Build/installation fixes (particularly for Red Hat 6 and Linux 3) * Fix group ids for submitted jobs [U] * Fix default value of boolean with JSV [U] * Windows fixes for helper crashes and Vista GUI jobs [U] * Ensure parallel jobs are dispatched to the least loaded host [U] * Correct ownership of qsub -pty output file; was owned by admin user [U] * Fix format of Windows loadcheck.exe output [U] * Read from stderr even if stdout is already closed in IJS [U] * Fix PDC_INTERVAL=NEVER execd parameter [U] * Fix accounting information for Windows GUI jobs [U] * Increase default MAX_DYN_EC qmaster param [U] * Fix qsub -sync y error message and enforce MAX_DYN_EC correctly [U] * Fix job validation (-w e) behaviour [#716] [U] * Fix qrsh input redirection [U] * Avoid warning when submitting a qrsh job [U] * Print start time in qstat -j -xml output [U] * Don't raise an error changing resource request on waiting job [#806] * Don't exit 0 on error with qconf -secl or -sep * Include string.h in drmaa.h [#712] * Fix process-scheduler-log with host aliases * Enhancements * Base qmake and qtcsh on the current gmake and tcsh source [#289, #504, #832] * Support "-binding linear" and "-binding linear:slots" * Use the hwloc library for all topology information and core binding, supporting more operating systems (now: AIX, Darwin, FreeBSD, GNU/Linux, HPUX, MS Windows, OSF/1, Solaris), and more hardware types (specifically AMD Magny Cours and similar) * Add task number to execd "exceeds job ... limit" * Other changes (possibly-incompatible) * Modify default paths in build files and elsewhere [U] * Assorted message fixes * In RPMs, move qsched to qmaster package, and separate drmaa4ruby * Default to newijs in load_sge_config.sh * Default to sh, not csh for configured shell Version 8.0.0b -------------- * Bug fixes * Build/installation fixes [including #424, #1349] [(U)] * Fix execd init script [#1348] * Man and other documentation fixes [including #614, #764] [(U)] * Fix contents of admin mail properly [#1307, #1345] * Fix qalter messages for -tc * Fix build with -DSGE_PQS_API * Fix group ids for submitted jobs [U] * Enhancements * Update qsched and add man page * Other changes (possibly-incompatible) * Avoid the use of /bin/ksh [#1306] * Change installation defaults to classic spooling, not adding shadow hosts, and not JMX. [(U)] Version 8.0.0a -------------- This is roughly a superset of Univa's 8.0.0 (the V800_TAG from https://github.com/gridengine/gridengine), with thanks for that. Changes made there which haven't been included in this version: PLPA source not removed; some different build/installation defaults (e.g. for JMX); Univa/UGE "branding" (partly because trademark status is unknown); authuser not removed (for SDM and testing use), * Bug fixes * Many man and other documentation fixes [including #790, #776, #769, #733, #610, #587, #581, #459, #456, #439, #255, #1288, #797, #1271, #773] [(U)] * Some program message fixes [(U)] * Various build and installation fixes [including #761, #709, #656, #616, #546, #536, #521, #491, #438, #414, #411, #383, #381, #138, #455, #344, #438, #1311, #1272, #1273] [(U)] * Ask for keystore password twice on installation * Fix qmaster crashes with tightly integrated parallel jobs or un-discoverable qinstance [#789] [U] * Report 0 cores and sockets on unsupported Solaris hosts [U] * Fix malloc hooks which caused crashes, particularly with SuSE 11 [#792, #748, #749] [U] * Verify the pe task start user in execd in non-CSP mode [U] * Fix binding parameters parsing [U] * Fix JSV logging with multiple users submitting jobs on same submit host [U] * Fix unresponsive qmaster when modifying the global configuration in a huge cluster [U] * Speed up finishing tightly integrated jobs [U] * Check consistency of JSV binding information properly [U] * Fix broken project spooling, which caused loss of project when restarting master when using core binding [U] * Fix slotwise preemption failure to unsuspend one job per host [#775] [U] * Fix problems retrieving passwd and group information with large responses [#1295] [(U)] * Fix JSV changing default of boolean [U] * Fix ENABLE_RESCHEDULE_SLAVE=1 [U] * Allow comma in CMDNAME with Perl JSV scripts [#803] * Don't put queue into error state when supplementary group id cannot be set [#185] [U] * Don't convert LF to CRLF with qrsh -pty [U] * Fix qconf segfault on bad subordination string [U] * Fix group ids of submitted jobs [U] * Disallow -masterq with serial jobs [#155] [U] * Fix 100% CPU use by shepherd of qsh [U] * Removed unnecessary binding warning on job starts [U] * Fix qconf error reports when tmp directory has 755 permissions [U] * Fix suspending of remote process on qrsh -pty yes <cmd> on Solaris [U] * Fix starting jobs after global host changed [U] * Reject invalid load_formula value [U] * Fix handling of implicitly-requested exclusive resources [U] * Fix execd vmem reporting on 64-bit Linux [U] * Fix startup of execd on Windows Vista [U] * Set xterm's path more appropriately on GNU/Linux [#557] * Fix generation of admin email from failed jobs [#1307] * Fix some ill-formed output from qstat -xml [#314] * Fix handling of multi-line environment variables propagated to shepherd [#395] * Fix example MPI PE templates * Fix bad quoting in JSV sh library * Fix checking of consumables for parallel jobs across multiple hosts [U] * Enhancements * Additional and clarified documentation * PAM modules for ssh tight integration and access control for interactive jobs * Initial core binding support for Solaris/SPARC64 [U] * Some efficiency improvements and memory leaks fixed [U] * Ports to S/390 and PARISC GNU/Linux [U] * New complex m_thread [U] * Show topology by default in qhost [U] * qsub -pty switch [#704] [U] * Improved qmon graphics [#530] [(U)] * Include bash in default shell list [U] * A JSV that rejects all jobs [U] * Files for Scali-MPI * Ruby DRMAA implementation * Enable easy building against shared system libraries and use system openssl and bdb binaries * New scripts: "qsched" reports resource reservations; "status" wraps qstat; enable/disable submission; node-selection (idle etc.) * Restart argument for daemon init scripts * Improved efficiency of shell JSV if used with bash * Core dumps from crashing daemons enabled under Linux [U] * Example host_aliases file [#154] * Spec file for RPM packaging [#820] * Other changes (possibly-incompatible) * Show core binding by default in qstat, qhost (use -ncb for compatibility) [U] * Removed Berkeley DB RPC support (recently dropped by BDB) [U] * Changed position in pending job list for user-rescheduled jobs (exit99, qmod -rj) and OLD_RESCHEDULE_BEHAVIOR, OLD_RESCHEDULE_BEHAVIOR_ARRAY_JOB parameters [U] * Unified GNU/Linux arch strings (lx-*, from lx24-* and lx26-*) [U] * Default to enabling core binding on GNU/Linux [U] * Removed Sun service tags support [U] * Removed obsolete SunHPCT5 files
author: asau <asau> 2012-03-20 17:07:43 +0000
committer: asau <asau> 2012-03-20 17:07:43 +0000
commit: 5b0dc969acda3e18cf50c4bdac5e1b216b8f177b (patch)
tree: c3054566d0d89cdeeddb55a59a8d59ef130be33e /parallel/sge
parent: b006d785e9c1d979c8906972193d4fb3ae30d885 (diff)
download: pkgsrc-5b0dc969acda3e18cf50c4bdac5e1b216b8f177b.tar.gz
20 files changed, 289 insertions, 374 deletions
diff --git a/parallel/sge/DESCR b/parallel/sge/DESCR
index f5cc832b451..c34854eb100 100644
--- a/parallel/sge/DESCR
+++ b/parallel/sge/DESCR
@@ -1,6 +1,5 @@
 The Grid Engine project is an open source community effort
 to facilitate the adoption of distributed computing solutions.
-Sponsored by Sun Microsystems and hosted by CollabNet, the
-Grid Engine project provides enabling distributed resource
+The Grid Engine project provides enabling distributed resource
 management software for wide ranging requirements from compute
 farms to grid computing.
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 4831e0921da..c5fb78fffcf 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.41 2011/12/09 14:36:36 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2012/03/20 17:07:43 asau Exp $
 #
 
-PKGNAME=		sge-6.2.2.1
-DISTNAME=		ge-V62u2_1_TAG-src
-PKGREVISION=		5
+DISTNAME=		sge-8.0.0d
+PKGNAME=		sge-8.0.0.4
 CATEGORIES=		parallel sysutils
-MASTER_SITES=		http://gridengine.sunsource.net/files/documents/7/197/
+MASTER_SITES=		http://arc.liv.ac.uk/downloads/SGE/releases/8.0.0d/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://gridengine.sunsource.net/
-COMMENT=		Sun Grid Engine distributed resource management system
+HOMEPAGE=		https://arc.liv.ac.uk/trac/SGE
+COMMENT=		Son of Grid Engine distributed resource management system
 
 BUILD_DEPENDS+=		{standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
 
@@ -18,7 +17,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl:run
 
-WRKSRC=			${WRKDIR}/gridengine
 CFLAGS+=		-D${UPPER_OPSYS}
 CONFIGURE_ENV+=		REMOTE=sge
 CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}
@@ -89,6 +87,9 @@ PKG_FAIL_REASON+=	"SGE_ARCH and SGE_BUILDARCH need to be configured for your OS"
 .endif
 SGE_BUILDARCH?=		${SGE_BUILDARCH_cmd:sh}
 
+# Some hacks to get it properly linked:
+MAKE_ENV+=	SGE_ARCH=$(SGE_ARCH) SGE_ROOT=$(SGE_ROOT)
+
 LDFLAGS+=	-R${SGE_ROOT}/lib/${SGE_ARCH}
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${SGE_ROOT}/lib/${SGE_ARCH}
 
@@ -133,6 +134,18 @@ do-build:
 	cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni
 	cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -man -sunman
 
+CHECK_INTERPRETER_SKIP=	sge/bin/process-scheduler-log \
+			sge/bin/qsched \
+			sge/bin/status \
+			sge/examples/drmaa/ruby/* \
+			sge/hadoop/pestart.sh \
+			sge/hadoop/pestop.sh \
+			sge/hadoop/setup.pl \
+			sge/hadoop/wait.sh \
+			sge/util/resources/drmaa4ruby/* \
+			sge/util/resources/drmaa4ruby/samples/* \
+			sge/util/resources/wrappers/rshd-wrapper
+
 do-install:
 	${MKDIR} ${DESTDIR}${SGE_ROOT}
 	#${CHOWN} ${SGE_USER} ${DESTDIR}${SGE_ROOT}
@@ -153,6 +166,7 @@ do-install:
 PLIST_SUBST+=	SGE_ARCH=${SGE_ARCH}
 
 .include "../../databases/db4/buildlink3.mk" # 4.2 at least
+.include "../../x11/Xbae/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/parallel/sge/PLIST b/parallel/sge/PLIST
index ae02178a438..acb292a44e1 100644
--- a/parallel/sge/PLIST
+++ b/parallel/sge/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:10:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/03/20 17:07:43 asau Exp $
 bin/qacct
 bin/qalter
 bin/qconf
 bin/qdel
+bin/qevent
 bin/qhold
 bin/qhost
 bin/qlogin
@@ -28,6 +29,7 @@ sge/bin/${SGE_ARCH}/qacct
 sge/bin/${SGE_ARCH}/qalter
 sge/bin/${SGE_ARCH}/qconf
 sge/bin/${SGE_ARCH}/qdel
+sge/bin/${SGE_ARCH}/qevent
 sge/bin/${SGE_ARCH}/qhold
 sge/bin/${SGE_ARCH}/qhost
 sge/bin/${SGE_ARCH}/qlogin
@@ -53,6 +55,16 @@ sge/bin/${SGE_ARCH}/sge_qmaster
 sge/bin/${SGE_ARCH}/sge_shadowd
 sge/bin/${SGE_ARCH}/sge_shepherd
 sge/bin/${SGE_ARCH}/sgepasswd
+sge/bin/busy-nodes
+sge/bin/dead-nodes
+sge/bin/idle-nodes
+sge/bin/nodes-in-job
+sge/bin/process-scheduler-log
+sge/bin/qsched
+sge/bin/qselect-node-list
+sge/bin/sge-disable-submits
+sge/bin/sge-enable-submits
+sge/bin/status
 sge/catman/cat/cat1/gethostbyaddr.1
 sge/catman/cat/cat1/gethostbyname.1
 sge/catman/cat/cat1/gethostname.1
@@ -77,15 +89,19 @@ 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/qsched.1
 sge/catman/cat/cat1/qselect.1
 sge/catman/cat/cat1/qsh.1
 sge/catman/cat/cat1/qstat.1
 sge/catman/cat/cat1/qsub.1
 sge/catman/cat/cat1/qtcsh.1
+sge/catman/cat/cat1/sge-enable-disable.1
+sge/catman/cat/cat1/sge-node-selection.1
 sge/catman/cat/cat1/sge_ckpt.1
 sge/catman/cat/cat1/sge_intro.1
 sge/catman/cat/cat1/sge_types.1
 sge/catman/cat/cat1/sgepasswd.1
+sge/catman/cat/cat1/status.1
 sge/catman/cat/cat1/submit.1
 sge/catman/cat/cat3/drmaa_allocate_job_template.3
 sge/catman/cat/cat3/drmaa_attributes.3
@@ -142,6 +158,7 @@ sge/catman/cat/cat5/hostgroup.5
 sge/catman/cat/cat5/project.5
 sge/catman/cat/cat5/qtask.5
 sge/catman/cat/cat5/queue_conf.5
+sge/catman/cat/cat5/remote_startup.5
 sge/catman/cat/cat5/reporting.5
 sge/catman/cat/cat5/sched_conf.5
 sge/catman/cat/cat5/sge_aliases.5
@@ -154,14 +171,15 @@ sge/catman/cat/cat5/sge_resource_quota.5
 sge/catman/cat/cat5/sgepasswd.5
 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/pam_sge-qrsh-setup.8
+sge/catman/cat/cat8/pam_sge_authorize.8
 sge/catman/cat/cat8/sge_ca.8
+sge/catman/cat/cat8/sge_coshepherd.8
 sge/catman/cat/cat8/sge_execd.8
 sge/catman/cat/cat8/sge_qmaster.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
@@ -180,6 +198,8 @@ sge/ckpt/sx6_ckpt_command
 sge/ckpt/sx6_clean_command
 sge/ckpt/sx6_migration_command
 sge/ckpt/sx6_restart_command
+sge/doc/LICENCE.txt
+sge/doc/NEWS
 sge/doc/README-DRMAA.txt
 sge/doc/arc_depend_irix.asc
 sge/doc/arc_depend_solaris.asc
@@ -199,21 +219,52 @@ sge/examples/drmaa/howto3_2.c
 sge/examples/drmaa/howto4.c
 sge/examples/drmaa/howto5.c
 sge/examples/drmaa/howto6.c
+sge/examples/drmaa/ruby/array.rb
+sge/examples/drmaa/ruby/attributes.rb
+sge/examples/drmaa/ruby/example.rb
+sge/examples/drmaa/ruby/flow/README
+sge/examples/drmaa/ruby/flow/flow.rb
+sge/examples/drmaa/ruby/flow/samples/README
+sge/examples/drmaa/ruby/flow/samples/do_final
+sge/examples/drmaa/ruby/flow/samples/do_inst
+sge/examples/drmaa/ruby/flow/samples/do_make
+sge/examples/drmaa/ruby/flow/samples/do_report
+sge/examples/drmaa/ruby/flow/samples/do_test
+sge/examples/drmaa/ruby/flow/samples/do_uninst
+sge/examples/drmaa/ruby/flow/samples/huge.ff
+sge/examples/drmaa/ruby/flow/samples/large.ff
+sge/examples/drmaa/ruby/flow/samples/small.ff
+sge/examples/drmaa/ruby/flow/samples/tiny.ff
+sge/examples/drmaa/ruby/sig.rb
+sge/examples/drmaa/ruby/stream_and_trap.rb
+sge/examples/drmaa/ruby/test_all.sh
+sge/examples/drmaa/ruby/threads.rb
 sge/examples/jobs/array_submitter.sh
 sge/examples/jobs/jobnet_submitter.sh
 sge/examples/jobs/pascal.sh
 sge/examples/jobs/pminiworm.sh
 sge/examples/jobs/simple.sh
 sge/examples/jobs/sleeper.sh
+sge/examples/jobs/ssession.sh
 sge/examples/jobs/step_A_array_submitter.sh
 sge/examples/jobs/step_B_array_submitter.sh
 sge/examples/jobs/worker.sh
+sge/examples/jobsbin/${SGE_ARCH}/showq
 sge/examples/jobsbin/${SGE_ARCH}/work
+sge/hadoop/env.sh
+sge/hadoop/jsv.sh
+sge/hadoop/load_sensor.sh
+sge/hadoop/logging.properties
+sge/hadoop/make_conf.sh
+sge/hadoop/pestart.sh
+sge/hadoop/pestop.sh
+sge/hadoop/setup.pl
+sge/hadoop/ssh
+sge/hadoop/wait.sh
 sge/include/drmaa.h
 sge/inst_sge
 sge/install_execd
 sge/install_qmaster
-sge/lib/${SGE_ARCH}/libXltree.so
 sge/lib/${SGE_ARCH}/libdrmaa.so
 sge/lib/${SGE_ARCH}/libdrmaa.so.1.0
 sge/lib/${SGE_ARCH}/libjuti.so
@@ -243,15 +294,19 @@ sge/man/man1/qrls.1
 sge/man/man1/qrsh.1
 sge/man/man1/qrstat.1
 sge/man/man1/qrsub.1
+sge/man/man1/qsched.1
 sge/man/man1/qselect.1
 sge/man/man1/qsh.1
 sge/man/man1/qstat.1
 sge/man/man1/qsub.1
 sge/man/man1/qtcsh.1
+sge/man/man1/sge-enable-disable.1
+sge/man/man1/sge-node-selection.1
 sge/man/man1/sge_ckpt.1
 sge/man/man1/sge_intro.1
 sge/man/man1/sge_types.1
 sge/man/man1/sgepasswd.1
+sge/man/man1/status.1
 sge/man/man1/submit.1
 sge/man/man3/drmaa_allocate_job_template.3
 sge/man/man3/drmaa_attributes.3
@@ -308,6 +363,7 @@ sge/man/man5/hostgroup.5
 sge/man/man5/project.5
 sge/man/man5/qtask.5
 sge/man/man5/queue_conf.5
+sge/man/man5/remote_startup.5
 sge/man/man5/reporting.5
 sge/man/man5/sched_conf.5
 sge/man/man5/sge_aliases.5
@@ -320,20 +376,20 @@ sge/man/man5/sge_resource_quota.5
 sge/man/man5/sgepasswd.5
 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/pam_sge-qrsh-setup.8
+sge/man/man8/pam_sge_authorize.8
 sge/man/man8/sge_ca.8
+sge/man/man8/sge_coshepherd.8
 sge/man/man8/sge_execd.8
 sge/man/man8/sge_qmaster.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
-sge/mpi/SunHPCT5/pe_sunmpi_ci.template
-sge/mpi/SunHPCT5/resume_sunmpi_ci.sh
-sge/mpi/SunHPCT5/suspend_sunmpi_ci.sh
+sge/mpi/Scali-MPI/README
+sge/mpi/Scali-MPI/Scali_Resume.sh
+sge/mpi/Scali-MPI/Scali_Suspend.sh
 sge/mpi/hostname
 sge/mpi/mpi.sh
 sge/mpi/mpi.template
@@ -401,6 +457,7 @@ sge/qmon/PIXMAPS/ctx.xpm
 sge/qmon/PIXMAPS/days.xpm
 sge/qmon/PIXMAPS/deadline.xpm
 sge/qmon/PIXMAPS/deadline_ins.xpm
+sge/qmon/PIXMAPS/double.xpm
 sge/qmon/PIXMAPS/dynamite.xpm
 sge/qmon/PIXMAPS/env.xpm
 sge/qmon/PIXMAPS/file_link.xpm
@@ -488,16 +545,31 @@ sge/qmon/PIXMAPS/xterm-sun.xpm
 sge/qmon/PIXMAPS/xterm.xpm
 sge/qmon/Qmon
 sge/qmon/qmon_help.ad
+sge/start_gui_installer
 sge/util/arch
 sge/util/arch_variables
 sge/util/arch_variables.orig
-sge/util/bdb_checkpoint.sh
 sge/util/certtool.sh
 sge/util/create_settings.sh
 sge/util/dl.csh
 sge/util/dl.sh
 sge/util/dl1.csh
 sge/util/dl2.csh
+sge/util/gui-installer/html/en/help/CSPConfig.html
+sge/util/gui-installer/html/en/help/ChooseComp.html
+sge/util/gui-installer/html/en/help/Empty.html
+sge/util/gui-installer/html/en/help/Error.html
+sge/util/gui-installer/html/en/help/HostPanel.html
+sge/util/gui-installer/html/en/help/JMXConfig.html
+sge/util/gui-installer/html/en/help/License.html
+sge/util/gui-installer/html/en/help/MainConfig.html
+sge/util/gui-installer/html/en/help/SpoolingConfig.html
+sge/util/gui-installer/html/en/help/Welcome.html
+sge/util/gui-installer/templates/check_host
+sge/util/gui-installer/templates/gui_inst_template.conf
+sge/util/gui-installer/templates/install_component
+sge/util/gui-installer/templates/readme_template.html
+sge/util/host_aliases
 sge/util/install_modules/DB_CONFIG
 sge/util/install_modules/backup_template.conf
 sge/util/install_modules/inst_berkeley.sh
@@ -509,7 +581,6 @@ 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/jaas.config.template
 sge/util/java.policy.template
@@ -544,6 +615,10 @@ sge/util/resources/centry/load_avg
 sge/util/resources/centry/load_long
 sge/util/resources/centry/load_medium
 sge/util/resources/centry/load_short
+sge/util/resources/centry/m_core
+sge/util/resources/centry/m_socket
+sge/util/resources/centry/m_topology
+sge/util/resources/centry/m_topology_inuse
 sge/util/resources/centry/mem_free
 sge/util/resources/centry/mem_total
 sge/util/resources/centry/mem_used
@@ -574,12 +649,38 @@ 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/drmaa4ruby/README
+sge/util/resources/drmaa4ruby/drmaa.rb
+sge/util/resources/drmaa4ruby/samples/array.rb
+sge/util/resources/drmaa4ruby/samples/attributes.rb
+sge/util/resources/drmaa4ruby/samples/example.rb
+sge/util/resources/drmaa4ruby/samples/flow/README
+sge/util/resources/drmaa4ruby/samples/flow/flow.rb
+sge/util/resources/drmaa4ruby/samples/flow/samples/README
+sge/util/resources/drmaa4ruby/samples/flow/samples/do_final
+sge/util/resources/drmaa4ruby/samples/flow/samples/do_inst
+sge/util/resources/drmaa4ruby/samples/flow/samples/do_make
+sge/util/resources/drmaa4ruby/samples/flow/samples/do_report
+sge/util/resources/drmaa4ruby/samples/flow/samples/do_test
+sge/util/resources/drmaa4ruby/samples/flow/samples/do_uninst
+sge/util/resources/drmaa4ruby/samples/flow/samples/huge.ff
+sge/util/resources/drmaa4ruby/samples/flow/samples/large.ff
+sge/util/resources/drmaa4ruby/samples/flow/samples/small.ff
+sge/util/resources/drmaa4ruby/samples/flow/samples/tiny.ff
+sge/util/resources/drmaa4ruby/samples/sig.rb
+sge/util/resources/drmaa4ruby/samples/stream_and_trap.rb
+sge/util/resources/drmaa4ruby/samples/test_all.sh
+sge/util/resources/drmaa4ruby/samples/threads.rb
 sge/util/resources/jsv/JSV.pm
+sge/util/resources/jsv/SimpleJsv.java
+sge/util/resources/jsv/jjsv.sh
 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/jsv/jsv_reject_all.sh
+sge/util/resources/jsv/logging.properties
 sge/util/resources/loadsensors/calendar.sh
 sge/util/resources/loadsensors/ibm-loadsensor
 sge/util/resources/loadsensors/interix-loadsensor.sh
@@ -589,17 +690,21 @@ sge/util/resources/loadsensors/nuser.sh
 sge/util/resources/loadsensors/sgi_tty_sensor.sh
 sge/util/resources/loadsensors/solaris-iidle.sh
 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/detailed_job_info_cb.xsd
 sge/util/resources/schemas/qstat/message.xsd
 sge/util/resources/schemas/qstat/qstat.xsd
+sge/util/resources/scripts/README.qsched
+sge/util/resources/scripts/README.status
 sge/util/resources/starter_methods/settaskid.sh
 sge/util/resources/usersets/arusers
 sge/util/resources/usersets/deadlineusers
 sge/util/resources/usersets/defaultdepartment
+sge/util/resources/wrappers/qlogin_wrapper
+sge/util/resources/wrappers/rshd-wrapper
 sge/util/rmiconsole.policy
 sge/util/setfileperm.sh
 sge/util/setfileperm.sh.orig
@@ -614,8 +719,6 @@ 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
@@ -659,3 +762,4 @@ sge/utilbin/${SGE_ARCH}/spooledit
 sge/utilbin/${SGE_ARCH}/spoolinit
 sge/utilbin/${SGE_ARCH}/testsuidroot
 sge/utilbin/${SGE_ARCH}/uidgid
+sge/utilbin/${SGE_ARCH}/valid_jvmlib
diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo
index 91663b06efa..42192144d36 100644
--- a/parallel/sge/distinfo
+++ b/parallel/sge/distinfo
@@ -1,24 +1,16 @@
-$NetBSD: distinfo,v 1.13 2011/02/17 08:55:11 markd Exp $
+$NetBSD: distinfo,v 1.14 2012/03/20 17:07:43 asau Exp $
 
-SHA1 (ge-V62u2_1_TAG-src.tar.gz) = f4655c17ea80109aea797f76a02ead02e44ffeb3
-RMD160 (ge-V62u2_1_TAG-src.tar.gz) = fb36f8aaae2f4e9975428dca0d21e9328b77d37a
-Size (ge-V62u2_1_TAG-src.tar.gz) = 9462032 bytes
-SHA1 (patch-aa) = 37bd47e92fae541e013292a96dba9d22ed900e6d
-SHA1 (patch-ab) = 797103b812ce48730a4101d00a4bdee0db603909
-SHA1 (patch-ac) = 7ce773a766ec6e4c1ba8465800600ed31680f7e6
-SHA1 (patch-ad) = 0da714b6f9f2dfb0d952f84863a76fdac23aed8e
-SHA1 (patch-ae) = deaeae7d60cdb5d1a3917b10325d040c4ebef2c2
-SHA1 (patch-af) = b1ba90d9414c0ea46431bb04312a1a2e198516e2
-SHA1 (patch-ag) = f33c490bbb93c6d37ef1937210bff7b92cf19207
-SHA1 (patch-ak) = 24c7effbc1a0fd1c7410ed97517286f535462785
-SHA1 (patch-am) = cee7cb7549fc6f48695b95064600d1a4c1e8b5f0
+SHA1 (sge-8.0.0d.tar.gz) = e7500bbeec4075d054410f7465011efb61e93def
+RMD160 (sge-8.0.0d.tar.gz) = aa83db459f4bbbebd7d2cc81290b7b8cb0818210
+Size (sge-8.0.0d.tar.gz) = 12289130 bytes
+SHA1 (patch-ad) = 004600f060b5fcacd91ba68808686c0a679889f6
+SHA1 (patch-ag) = 57eb4296e531f3a47b95c8842e0db0575870dcf0
+SHA1 (patch-am) = bbb87319c4dcb893be3757feec2c8cf69fe7ae61
 SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
-SHA1 (patch-av) = 1e68be936996fe3b4be21b590600cec3fa26970a
-SHA1 (patch-bd) = c24a357d5a87be61b5e0a91daf219e1cc24087a2
-SHA1 (patch-bl) = 5cf177b4b3d31a6483da6daa5ec5ff840b3be7fe
+SHA1 (patch-bd) = aae1bdccfb81712c504b3add8b9728a2bcf3d1dd
+SHA1 (patch-bl) = f04f92c1a1c69443e9336f9fcbe7d988001f6681
 SHA1 (patch-bm) = 524268d07060fac00a2648e7c63377f965377c9d
-SHA1 (patch-ca) = f248651b4be0514900d30f31a75843e1b54c1e51
-SHA1 (patch-cb) = e33ffad67579c8381cffd4f5c236235205108867
-SHA1 (patch-cc) = 0a60fdce9a501f290429a1827df57fcfb3b5950f
 SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002
-SHA1 (patch-utilbin_Makefile) = 01158b5edf874cd677bc03185fc3da3b5a051813
+SHA1 (patch-source_3rdparty_qmon_Makefile) = c2847af5921aceadea4d669cac38b53478aee29c
+SHA1 (patch-source_clients_qmon_Makefile) = 19fb99bbd753c295296ca4bf986634b654d7b9f7
+SHA1 (patch-source_utilbin_Makefile) = 0377bae49e2e53fa0a7ce7486269c130a16a6c3d
diff --git a/parallel/sge/patches/patch-aa b/parallel/sge/patches/patch-aa
deleted file mode 100644
index 4253928e2a4..00000000000
--- a/parallel/sge/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 89fbbef36ce..00000000000
--- a/parallel/sge/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 66c70402049..00000000000
--- a/parallel/sge/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index ee28dd18796..5c529126bb6 100644
--- a/parallel/sge/patches/patch-ad
+++ b/parallel/sge/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2009/05/13 21:00:25 markd Exp $
+$NetBSD: patch-ad,v 1.4 2012/03/20 17:07:43 asau 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
+--- source/daemons/shepherd/Makefile.orig	2011-11-29 03:06:13.000000000 +0400
++++ source/daemons/shepherd/Makefile	2012-02-20 19:55:03.000000000 +0400
+@@ -64,7 +64,7 @@
  
  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_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm_static -lcommlists -luti $(WINGRIDLIB_STATIC) $(DLLIB)
++SHEPHERD_ADD_LIBS = -lgdi -lsgeobj -lsgeobjd $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB)
  
- SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP) $(LCKLIB) $(RMONLIB)
+ SHEPHERD_LIB_DEPENDS = $(GDILIB) $(SGEOBJDLIB) $(SGEOBJLIB) $(KRBLIBS) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(COMMLIB_STATIC) $(UTILIB) $(WINGRIDLIB_DEP)  
  
diff --git a/parallel/sge/patches/patch-ae b/parallel/sge/patches/patch-ae
deleted file mode 100644
index 7b5465f8fce..00000000000
--- a/parallel/sge/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 6bea6cc5b3d..00000000000
--- a/parallel/sge/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index be4c6e17165..987a39269d7 100644
--- a/parallel/sge/patches/patch-ag
+++ b/parallel/sge/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.4 2009/05/13 21:00:25 markd Exp $
+$NetBSD: patch-ag,v 1.5 2012/03/20 17:07:43 asau 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
+--- source/libs/spool/Makefile.orig	2011-11-29 03:06:15.000000000 +0400
++++ source/libs/spool/Makefile	2012-02-20 19:58:29.000000000 +0400
+@@ -117,7 +117,7 @@
  	$(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: test_sge_spooling_utilities.o $(SPOOLING_DEPS) $(SGEOBJLIB) $(SGEOBJDLIB) $(MIRLIB) $(EVCLIB) $(GDILIB) $(SCHEDLIB) $(CULLLIB) $(COMMLIB) $(COMMLISTSLIB) $(UTILIB) $(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) $(WINGRIDLIB) $(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) $(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-ak b/parallel/sge/patches/patch-ak
deleted file mode 100644
index 4d3e3577c2f..00000000000
--- a/parallel/sge/patches/patch-ak
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2011/02/17 08:55:11 markd Exp $
-
-Add LDFLAGS
-replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
-doesnt reorder.
-
---- source/utilbin/Makefile.orig	2009-02-11 09:27:33.000000000 +0000
-+++ source/utilbin/Makefile
-@@ -117,14 +117,14 @@ gethostbyaddr.o:	$(UTILBIN_DIR)/gethostb
- 
- #---------------------------------------------------------------------
- getservbyname:	getservbyname.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(DLLIB) $(LIBS)
-+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(DLLIB) $(LIBS)
- 
- getservbyname.o:	$(UTILBIN_DIR)/getservbyname.c
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/getservbyname.c
- 
- #---------------------------------------------------------------------
- filestat:	filestat.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LIBS)
-+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LIBS)
- 
- filestat.o:	$(UTILBIN_DIR)/filestat.c
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/filestat.c
-@@ -145,28 +145,28 @@ 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
- 
- #---------------------------------------------------------------------
- checkprog:	checkprog.o peopen_standalone.o pids_standalone.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(LCKLIB) $(RMONLIB)
--		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(LIBS) $(DLLIB)
-+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(LIBS) $(DLLIB)
- 
- checkprog.o:	$(UTILBIN_DIR)/checkprog.c
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkprog.c
- 
- #---------------------------------------------------------------------
- checkuser:     checkuser.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LIBS)
-+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LIBS)
- 
- checkuser.o:      $(UTILBIN_DIR)/checkuser.c
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkuser.c
- 
- #---------------------------------------------------------------------
- adminrun:   adminrun.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LIBS)
-+		$(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LIBS)
- 
- adminrun.o: $(UTILBIN_DIR)/adminrun.c
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/adminrun.c
-@@ -187,7 +187,7 @@ signals.o:	$(UTILBIN_DIR)/signals.c
- 
- #---------------------------------------------------------------------
- loadcheck:	loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
-+		$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LOADAVGLIBS) $(LIBS)
- 
- loadcheck.o:	$(UTILBIN_DIR)/loadcheck.c 
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
-@@ -202,13 +202,13 @@ loadcheck.obj: $(UTILBIN_DIR)/loadcheck.
- 
- #---------------------------------------------------------------------
- languagetest:   languagetest.o version.o  $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(LIBS)
-+		$(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(LIBS)
- 
- languagetest.o: $(UTILBIN_DIR)/languagetest.c
- 		$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/languagetest.c
- #---------------------------------------------------------------------
- infotext:   infotext.o  version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
--		$(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) -llck -lrmon $(LIBS)
-+		$(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) -lcommlists -llck -lrmon $(LIBS)
- 
- infotext.o: $(UTILBIN_DIR)/infotext.c
- 		$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/infotext.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) $(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
-@@ -256,7 +256,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
- 
- #---------------------------------------------------------------------
- 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 70168a92cee..bae862da70a 100644
--- a/parallel/sge/patches/patch-am
+++ b/parallel/sge/patches/patch-am
@@ -1,30 +1,54 @@
-$NetBSD: patch-am,v 1.6 2011/02/17 08:55:11 markd Exp $
+$NetBSD: patch-am,v 1.7 2012/03/20 17:07:43 asau Exp $
 
 Pkgsrc stuff
 GridEngine dev mailing list patch for "nbsd-1" issue
 ArchLinux static crypto also needs libz.a
 
---- source/aimk.orig	2009-02-17 22:27:39.000000000 +1300
+--- source/aimk.orig	2011-11-28 23:06:13.000000000 +0000
 +++ 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/${BDB_LIB_SUBDIR}"
-+set SHARED_LFLAGS    = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib -R$BERKELEYDB_HOME/lib"
+@@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then
+    # 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/${BDB_LIB_SUBDIR}"
++   set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib"
+ endif
+ set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS"
  
- # JUTI Targets
- set JUTI_ALL  = juti_all
-@@ -1169,9 +1169,9 @@ case NETBSD_*:
+@@ -1213,9 +1213,9 @@ case DARWIN_PPC:
+ 
+    set XMTDEF   = ""
+    set XMTINCD  = "$XMTINCD -I$MOTIFHOME/include"
+-   set XINCD    = "$XMTINCD $XINCD -I/usr/X11R6/include"
++   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
+    set XCFLAGS  = "-DNeedFunctionPrototypes -DNeedVarargsPrototypes -Wno-error $XMTDEF $XINCD"
+-   set XLIBD    = "-L$MOTIFHOME/lib -L/usr/X11R6/lib"
++   set XLIBD    = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib -R${X11BASE}/lib"
+    set XLIBS    = "-lXm -lXpm -lXt -lXext -lX11 -lSM -lICE"
+    if ("$ADOC" == 1) then
+       set CFLAGS = "$CFLAGS -Wno-error"
+@@ -1263,7 +1263,7 @@ case FREEBSD_*:
+    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 NOERR_CFLAG = "-Wno-error"
+    set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
+    set LIBS     = "$LIBS -lkvm"
+@@ -1273,9 +1273,9 @@ case FREEBSD_*:
+    set AUTHLIBS = "-lcrypt -lpam"
+  
+    set XMTDEF   = ""
+-   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/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 -R${X11BASE}/lib"
+    set XLFLAGS  = "$XLIBD"
+    set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
+    set RM	= "rm -f"
+@@ -1294,9 +1294,9 @@ case NETBSD_*:
     set DLLIB    = ""
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
@@ -36,7 +60,7 @@ ArchLinux static crypto also needs libz.a
     set LIBS     = "$LIBS -lkvm"
     set SHAREDLD = $CC
     set SHARED_CFLAGS = "-fPIC"
-@@ -1179,9 +1179,9 @@ case NETBSD_*:
+@@ -1304,9 +1304,9 @@ case NETBSD_*:
     set AUTHLIBS = "-lcrypt -lpam"
  
     set XMTDEF   = ""
@@ -44,11 +68,11 @@ ArchLinux static crypto also needs libz.a
 +   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib"
-+   set XLIBD    = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R ${LOCALBASE}/lib"
++   set XLIBD    = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM       = "rm -f"
-@@ -1376,6 +1376,8 @@ case LINUXSPARC64:
+@@ -1508,6 +1508,8 @@ case LINUXSPARC64:
        set DEBUG_FLAG = "$DEBUG_FLAG -fprofile-arcs -ftest-coverage"
     endif
  
@@ -57,16 +81,26 @@ ArchLinux static crypto also needs libz.a
     if ( -f /lib/libc.so.6 ) then
        strings /lib/libc.so.6 | grep "GNU C Library" | grep '2.[234]' >& /dev/null
        if ($status == 0) then
-@@ -1875,6 +1877,12 @@ default:
- endsw
+@@ -2103,6 +2105,13 @@ else
+   set LIBS_DIR = ${SDIR}
+ endif
  
- 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}"
+ 
+    if ( "${JAVA_HOME}/${JAVA_INCL}" != /usr/include ) then
+@@ -2326,7 +2335,7 @@ if ( "$BUILDMAN" == 1 ) then
+       setenv PATH ${PATH}:${GROFFPATH}
+    endif   
+ 
+-   $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE $BUILDMAN $BUILDHTMLMAN
++   $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE 0 $BUILDHTMLMAN
+ 
+    if ( $status != 0 ) then
+       echo not done
diff --git a/parallel/sge/patches/patch-av b/parallel/sge/patches/patch-av
deleted file mode 100644
index 19de0c17133..00000000000
--- a/parallel/sge/patches/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 1b36344d674..015066f513a 100644
--- a/parallel/sge/patches/patch-bd
+++ b/parallel/sge/patches/patch-bd
@@ -1,36 +1,29 @@
-$NetBSD: patch-bd,v 1.4 2009/05/13 21:00:25 markd Exp $
+$NetBSD: patch-bd,v 1.5 2012/03/20 17:07:43 asau Exp $
 
 Exclude Java files.
 DESTDIR support.
 
---- source/scripts/distinst.orig	2009-01-31 05:04:08.000000000 +1300
+--- source/scripts/distinst.orig	2011-11-28 23:06:15.000000000 +0000
 +++ source/scripts/distinst
-@@ -75,12 +75,12 @@ DRMAA_SHARED_LIBRARIES="libdrmaa"
+@@ -79,13 +79,13 @@ DRMAA_SHARED_LIBRARIES="libdrmaa"
  # 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"
+-DRMAAJ_FILES="CLASSES/jdrmaa/drmaa"
++#DRMAAJ_FILES="CLASSES/jdrmaa/drmaa"
  
  JNI_SHARED_LIBRARIES="libdrmaa libjuti libjgdi"
  
 -JUTIJ_FILES="CLASSES/juti/juti"
 -JGDIJ_FILES="libs/jgdi/build/jgdi"
+-JJSV_FILES="CLASSES/jjsv/JSV"
 +#JUTIJ_FILES="CLASSES/juti/juti"
 +#JGDIJ_FILES="libs/jgdi/build/jgdi"
++#JJSV_FILES="CLASSES/jjsv/JSV"
+ JAVA_LIBRARIES="${DRMAAJ_FILES} ${JUTIJ_FILES} ${JGDIJ_FILES} ${JJSV_FILES}"
  
  PVMSOURCES="start_pvm.c stop_pvm.c slave.c master.c spmd.c Makefile"
- PVMSRCSCRIPTS="install.sh aimk"
-@@ -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
+@@ -544,11 +544,11 @@ while [ $# -ge 1 ]; do
           echo Please set variable SGE_ROOT. Installation failed.
           exit 1
        fi
@@ -45,3 +38,51 @@ DESTDIR support.
        localinst=true
        ;;
     -mansrc)
+@@ -927,13 +927,16 @@ if [ $instcommon = true ]; then
+                         $DEST_SGE_ROOT/util/sgeCA/*.cnf \
+                         $DEST_SGE_ROOT/util/sgeSMF/*.xml \
+                         $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
+-                        $DEST_SGE_ROOT/util/DetectJvmLibrary.jar \
+                         $DEST_SGE_ROOT/util/resources/calendars/* \
+                         $DEST_SGE_ROOT/util/resources/centry/* \
+                         $DEST_SGE_ROOT/util/resources/pe/* \
+                         $DEST_SGE_ROOT/util/resources/schemas/*/* \
+                         $DEST_SGE_ROOT/util/resources/usersets/*
+ 
++      if test -f $DEST_SGE_ROOT/util/DetectJvmLibrary.jar; then
++	  Execute chmod 644 $DEST_SGE_ROOT/util/DetectJvmLibrary.jar;
++      fi
++
+       Execute chmod 755 $DEST_SGE_ROOT/util/resources/jsv/jsv.sh \
+                         $DEST_SGE_ROOT/util/resources/jsv/jjsv.sh \
+                         $DEST_SGE_ROOT/util/resources/jsv/jsv.pl \
+@@ -951,8 +954,7 @@ if [ $instcommon = true ]; then
+       Execute cp libs/japi/example.c $DEST_SGE_ROOT/examples/drmaa
+       Execute cp libs/japi/howto/*.c $DEST_SGE_ROOT/examples/drmaa
+       MakeDir examples/drmaa/ruby
+-      Execute mv $DEST_SGE_ROOT/util/resources/drmaa4ruby/samples/* $DEST_SGE_ROOT/examples/drmaa/ruby
+-      Execute rmdir $DEST_SGE_ROOT/util/resources/drmaa4ruby/samples
++      Execute cp -r dist/util/resources/drmaa4ruby/samples/* $DEST_SGE_ROOT/examples/drmaa/ruby
+       Cleanup examples
+    fi
+ 
+@@ -1117,9 +1119,6 @@ if [ $instcommon = true ]; then
+ 
+       if [ -f CLASSES/herd/herd.jar ]; then
+          Execute cp CLASSES/herd/herd.jar $DEST_SGE_ROOT/lib/herd.jar
+-      elif [ $exit_on_error = true ]; then
+-         echo "\"CLASSES/herd/herd.jar\" not found. Installation failed."
+-         exit 1
+       fi
+    fi
+ 
+@@ -1276,7 +1275,9 @@ if [ $instguiinst = true ]; then
+       echo "Installing \"start_gui_installer\" and \"/util/gui-installer\""
+       Execute mkdir -p $DEST_SGE_ROOT/util/gui-installer/html/en/help
+       Execute mkdir -p $DEST_SGE_ROOT/util/gui-installer/templates
++      if [ -f "$GUI_DIR/dist/installer.jar" ]; then
+       Execute cp $GUI_DIR/dist/installer.jar $DEST_SGE_ROOT/util/gui-installer
++      fi
+       Execute cp $GUI_DIR/templates/start_gui_installer.sh $DEST_SGE_ROOT/start_gui_installer
+       Execute cp -r $GUI_DIR/html $DEST_SGE_ROOT/util/gui-installer
+       Execute cp $GUI_DIR/templates/install_component $GUI_DIR/templates/gui_inst_template.conf $GUI_DIR/templates/readme_template.html $GUI_DIR/templates/check_host $DEST_SGE_ROOT/util/gui-installer/templates
diff --git a/parallel/sge/patches/patch-bl b/parallel/sge/patches/patch-bl
index 9a39a4a1a75..f7810c36633 100644
--- a/parallel/sge/patches/patch-bl
+++ b/parallel/sge/patches/patch-bl
@@ -1,4 +1,4 @@
-$NetBSD: patch-bl,v 1.5 2011/02/17 08:55:11 markd Exp $
+$NetBSD: patch-bl,v 1.6 2012/03/20 17:07:43 asau Exp $
 
 --- source/libs/comm/cl_ssl_framework.c.orig	2009-02-16 08:50:41.000000000 +0000
 +++ source/libs/comm/cl_ssl_framework.c
@@ -45,15 +45,6 @@ $NetBSD: patch-bl,v 1.5 2011/02/17 08:55:11 markd Exp $
        void* cl_com_ssl_crypto_handle_saved = NULL;
  #endif
  
-@@ -1062,7 +1065,7 @@ static int cl_com_ssl_build_symbol_table
-       cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL );
- #endif /* RTLD_NODELETE */
- 
--#elif defined(FREEBSD)
-+#elif defined(NETBSD) || defined(FREEBSD)
- #ifdef RTLD_NODELETE
-       cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
- #else
 @@ -1091,7 +1094,7 @@ static int cl_com_ssl_build_symbol_table
           return CL_RETVAL_SSL_DLOPEN_SSL_LIB_FAILED;
        }
diff --git a/parallel/sge/patches/patch-ca b/parallel/sge/patches/patch-ca
deleted file mode 100644
index ce00131a8de..00000000000
--- a/parallel/sge/patches/patch-ca
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2010/12/08 11:30:18 markd Exp $
-
-rename getline() to avoid clash
-
---- source/3rdparty/sge_depend/def.h.orig	2003-03-09 05:06:35.000000000 +0000
-+++ source/3rdparty/sge_depend/def.h
-@@ -136,7 +136,7 @@ char         *realloc();
- #if NeedFunctionPrototypes
- char *copy( char *str);
- char *base_name(char *file, int strip);
--char *getline(struct filepointer *filep);
-+char *sge_getline(struct filepointer *filep);
- struct filepointer *getfile(char *file);
- struct inclist *newinclude(char *newfile, char *incstring);
- struct inclist *inc_path(char	*file, char *include, boolean	dot);
-@@ -155,7 +155,7 @@ struct symtab **isdefined( char *symbol,
- #else
- char *copy();
- char *base_name();
--char *getline();
-+char *sge_getline();
- struct filepointer *getfile();
- struct inclist *newinclude();
- struct inclist *inc_path();
diff --git a/parallel/sge/patches/patch-cb b/parallel/sge/patches/patch-cb
deleted file mode 100644
index 71f7d7966d6..00000000000
--- a/parallel/sge/patches/patch-cb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2010/12/08 11:30:18 markd Exp $
-
-rename getline() to avoid clash
-
---- source/3rdparty/sge_depend/main.c.orig	2007-07-26 15:41:43.000000000 +0000
-+++ source/3rdparty/sge_depend/main.c
-@@ -510,7 +510,7 @@ char *copy(str)
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *sge_getline(filep)
-    register struct filepointer   *filep;
- {
-    register char   *p,   /* walking pointer */
diff --git a/parallel/sge/patches/patch-cc b/parallel/sge/patches/patch-cc
deleted file mode 100644
index d3ebeeb616f..00000000000
--- a/parallel/sge/patches/patch-cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2010/12/08 11:30:18 markd Exp $
-
-rename getline() to avoid clash
-
---- source/3rdparty/sge_depend/parse.c.orig	2008-04-16 09:11:05.000000000 +0000
-+++ source/3rdparty/sge_depend/parse.c
-@@ -80,7 +80,7 @@ static int gobble(filep, file, file_red)
-    register char   *line;
-    register int   type;
- 
--   while ((line = getline(filep))) {
-+   while ((line = sge_getline(filep))) {
-       switch(type = deftype(line, filep, file_red, file, FALSE)) {
-       case IF:
-       case IFFALSE:
-@@ -571,7 +571,7 @@ int find_includes(filep, file, file_red,
-    register int   type;
-    boolean recfailOK;
- 
--   while ((line = getline(filep))) {
-+   while ((line = sge_getline(filep))) {
-       switch(type = deftype(line, filep, file_red, file, TRUE)) {
-       case IF:
-       doif:
diff --git a/parallel/sge/patches/patch-utilbin_Makefile b/parallel/sge/patches/patch-utilbin_Makefile
deleted file mode 100644
index 331b324cfeb..00000000000
--- a/parallel/sge/patches/patch-utilbin_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-utilbin_Makefile,v 1.1 2011/02/17 08:55:11 markd Exp $
-
-replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
-doesnt reorder.
-
---- source/utilbin/Makefile.orig	2011-02-10 02:13:18.354047083 +0000
-+++ source/utilbin/Makefile
-@@ -282,7 +282,7 @@ sge_share_mon.o: $(UTILBIN_DIR)/sge_shar
- 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/sge_share_mon.c
- 
- #---------------------------------------------------------------------
--AUTHUSER_ADD_LIBS = -luti -llck -lrmon $(COMMLISTSLIB) $(DLLIB)
-+AUTHUSER_ADD_LIBS = -luti -llck -lrmon -lcommlists $(DLLIB)
- 
- authuser: authuser.o juti.o $(UTILIB) $(LCKLIB) $(RMONLIB) $(COMMLISTSLIB)
- 	$(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS)
author	asau <asau>	2012-03-20 17:07:43 +0000
committer	asau <asau>	2012-03-20 17:07:43 +0000
commit	5b0dc969acda3e18cf50c4bdac5e1b216b8f177b (patch)
tree	c3054566d0d89cdeeddb55a59a8d59ef130be33e /parallel/sge
parent	b006d785e9c1d979c8906972193d4fb3ae30d885 (diff)
download	pkgsrc-5b0dc969acda3e18cf50c4bdac5e1b216b8f177b.tar.gz