Update sge to 6.0 Update 11

Bugs fixed in SGE 6.0u11 since release 6.0u10
--------------------------------------------

scalability issue with qdel and very large array jobs
loadcheck reports on a hyperthreaded CPU only one processor
CSP mode auto installation: certificates are not copied to submit hosts
qmon crashes when displaying about dialog
sge_schedd deadlock upon schedd_job_info job_list being enabled
Qmon has a ticket number limitation
qmon on secondary screen crashes when "Job Control" is pressed
queue status in reporting file is missing.
"Modify"-Button is activated but should be grayed
reporting(5) man page lacks information about sharelog records
Ability to sort queue instances using each column of the queue instances
table
Queue request -q from sge_request can't be overridden through command line
qdel on a job in deleted state does not output any information
qsub -terse to just output job id
qrsh man page doesn't explain which options don't work with interactive jobs
Numbers in error mail too large
still used usersets/project/calendar/pe/checkpoint can be removed under
certain conditions
remove util/sge_log_tee from distribution
shell_start_mode should be documentated to be only used for batch jobs
reserved usage not explained in sge_conf.5
Discrepancy between load values reported by Gridengine and from the
HP-UX 64 bit env.
auto installation option failed to save the install log
function job_get_id_string() is not MT save and used in qmaster
Broken output of job name with 'qsub -N'
meaningless error in clients when reporting_param flush_time is
incorrectly set
remote installation of execd's need enhancement, rework, cleanup
Scheduler does not write pid file in daemonize phase
invalid memory access in cl_com_get_handle
Qconf usage x man page inconsistency
Project man page contains different attribute names.
the binary check in inst_sge is wrong!
Wrong exit code with qconf -sds
qacct -l h=<hostname> dumps core on darwin and linux itanium
inst_sge -m fails for non-root when USER variable is not set
Extraneous space in qsub's "Invalid month specification." message
Hybrid user/project share-tree is broken for user sharing amongst array
jobs
clear usage operation should implicitely trigger refresh in share-tree
dialogue
UNKNOWN group/owner in accouting(5)
qmon's Complex Configuration Load and Save buttons did not work
memory leak in sge_schedd



Bugs fixed in SGE 6.0u10 since release 6.0u9
--------------------------------------------

qdel of just submitted job
can't start qmaster message appears, but qmaster is started
inst_sge script does not add the master host to the shadow_masters file
wrong qlogin_daemon or rlogin_daemon in host conf doesn't set host and
job into error state
reprioritize field in qmon cluster config missing
hostname resolving should not be case sensitive
drmaa_version() function should return 1.0
DRMAA sessions should be persistent
drmaa_control() causes illegal memory access
getDrmaaImplementation() should return the same string as getDrmSystem()
qconf rejects configuration, when attribute value ends with a space
character
during QMaster installation, creation of local database directory fails
on hp11
the execd auto_install takes too long because of long delays after a
parallel install block
Unable to modify Advanced Settings in Configuration for Host in my
cluster using qmon
qacct -l h=<hostname> dump core
shared library name DT_SONAME not set with libdrmaa.so
Berkeley DB backup failed when using hostname with a fully qualified
domain name
the inst_common.sh is missing $SGE_EXECD_PORT
potential security issues in cull library
inst_sge -help wrongly indicates -bup/-rst works with BDB spooling only
qping segfaults in ssl mode
The sge_share_mon utility does not work with the automatic policy enforcement
the auto uninstall execd needs a ssh deamon when the uninstall is done local
accounting records for slave tasks of pe jobs contain invalid submission time
DRMAA 1.0 interface need complete documentation in man pages
qselect matches wrong resources which have been overridden at lower level
qsh does not work if XAUTHORITY is set in root environment
In certain cases jobs may stay in "t" state for 5 minutes
qmaster logging "scheduler tried to remove a incomplete"
ignore_fqdn is broken for the local configuration
host already exists when modifying cluster settings
segmentation fault with empty string
qmaster performance gets throttled if qsub -sync y is used when many
jobs are in the system
sge_conf(5) setting 'max_u_jobs' broken if BDB spooling is used
job control: sorting by different fields
qmon job control: display wider default columns
load formula does not recognize float as weighting factor
qmaster dies when modifying slots value for queue domain when queuename
is missing
spooledit cannot dump USERSET objects
default xterm path in arch_variables script not correct for darwin
architectures
qsh problems on darwin architecture because of wrong crypto lib
execution daemon can crash on Linux where libnss_ldap.so uses BDB 4.2
shared library


Bugs fixed in SGE 6.0u9 since release 6.0u8
-------------------------------------------

CSP mode is affected by OpenSSL Security Advisory [28th September 2006]
account string does not accept the "|" character
unreasonably long scheduler dispatch times if lots of projects are used
in share tree
unreasonably long scheduler dispatch times if lots of cluster queues are
deployed in large clusters
jobs with negative priority will be rejected by qmaster

19 files changed, 83 insertions, 322 deletions

diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index cf8b3597e52..32400cac526 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,19 +1,14 @@
-# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:55 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2007/08/15 02:03:05 markd Exp $
 #
 
-PKGNAME=		sge-6.0.8
-PKGREVISION=		2
-DISTNAME=		sge-V60u8_TAG-src
+PKGNAME=		sge-6.0.11
+DISTNAME=		sge-V60u11_TAG-src
 CATEGORIES=		parallel sysutils
-MASTER_SITES=		# empty
-#MASTER_SITES=		http://gridengine.sunsource.net/files/documents/7/78/
+MASTER_SITES=		http://gridengine.sunsource.net/files/documents/7/142/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gridengine.sunsource.net/
 COMMENT=		Sun Grid Engine distributed resource management system
-DOWNLOAD=		http://gridengine.sunsource.net/servlets/ProjectDocumentList
-
-INTERACTIVE_STAGE=	fetch
 
 BUILD_DEPENDS+=		{standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
 
@@ -24,18 +19,11 @@ WRKSRC=			${WRKDIR}/gridengine
 CFLAGS+=		-D${UPPER_OPSYS}
 CONFIGURE_ENV+=		REMOTE=sge
 CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}
-CONFIGURE_ARGS+=	--with-grd=${SGE_BUILDARCH:Q}
+CONFIGURE_ARGS+=	--with-sge=${SGE_BUILDARCH:Q}
 PLIST_SUBST+=		SGE_ARCH=${SGE_ARCH:Q}
 MESSAGE_SUBST+=		SGE_ROOT=${SGE_ROOT}
 MAKE_ENV+=		PERL5=${PERL5:Q}
 
-FETCH_MESSAGE=		" The file ${DISTNAME}${EXTRACT_SUFX} containing the"
-FETCH_MESSAGE+=		" Grid Engine source snapshot must be fetched into:"
-FETCH_MESSAGE+=		""
-FETCH_MESSAGE+=		"	${DISTDIR}"
-FETCH_MESSAGE+=		" from:"
-FETCH_MESSAGE+=		"	${DOWNLOAD}"
-
 SGE_USER?=		sgeadmin
 SGE_GROUP?=		sgeadmin
 PKG_GROUPS=		${SGE_GROUP}
@@ -60,6 +48,7 @@ UPPER_OPSYS_cmd=	${ECHO} "${OPSYS}" | ${TR} a-z A-Z
 UPPER_OPSYS=		${UPPER_OPSYS_cmd:sh}
 
 .if ${OPSYS} == "NetBSD"
+AIMK+=			-DFD_SETSIZE=2048
 SGE_ARCH=		nbsd-${MACHINE_ARCH}
 SGE_BUILDARCH_cmd=	${ECHO} "${OPSYS}_${MACHINE_ARCH}" | ${TR} a-z A-Z
 .elif ${OPSYS} == "FreeBSD"
diff --git a/parallel/sge/PLIST b/parallel/sge/PLIST
index d494e6bb7df..26cafeef619 100644
--- a/parallel/sge/PLIST
+++ b/parallel/sge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/19 11:51:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/08/15 02:03:06 markd Exp $
 bin/qacct
 bin/qalter
 bin/qconf
@@ -89,6 +89,9 @@ sge/catman/cat/cat3/drmaa_get_contact.3
 sge/catman/cat/cat3/drmaa_get_next_attr_name.3
 sge/catman/cat/cat3/drmaa_get_next_attr_value.3
 sge/catman/cat/cat3/drmaa_get_next_job_id.3
+sge/catman/cat/cat3/drmaa_get_num_attr_names.3
+sge/catman/cat/cat3/drmaa_get_num_attr_values.3
+sge/catman/cat/cat3/drmaa_get_num_job_ids.3
 sge/catman/cat/cat3/drmaa_get_vector_attribute.3
 sge/catman/cat/cat3/drmaa_get_vector_attribute_names.3
 sge/catman/cat/cat3/drmaa_init.3
@@ -139,6 +142,7 @@ 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/sge_execd.8
 sge/catman/cat/cat8/sge_qmaster.8
 sge/catman/cat/cat8/sge_schedd.8
@@ -162,6 +166,7 @@ sge/ckpt/sx6_ckpt_command
 sge/ckpt/sx6_clean_command
 sge/ckpt/sx6_migration_command
 sge/ckpt/sx6_restart_command
+sge/doc/README-ARCo.txt
 sge/doc/README-Autoinstall.txt
 sge/doc/README-DRMAA.txt
 sge/doc/arc_depend_irix.asc
@@ -194,6 +199,8 @@ 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}/libspoolb.so
 sge/lib/${SGE_ARCH}/libspoolc.so
 sge/man/man1/gethostbyaddr.1
@@ -238,6 +245,9 @@ sge/man/man3/drmaa_get_contact.3
 sge/man/man3/drmaa_get_next_attr_name.3
 sge/man/man3/drmaa_get_next_attr_value.3
 sge/man/man3/drmaa_get_next_job_id.3
+sge/man/man3/drmaa_get_num_attr_names.3
+sge/man/man3/drmaa_get_num_attr_values.3
+sge/man/man3/drmaa_get_num_job_ids.3
 sge/man/man3/drmaa_get_vector_attribute.3
 sge/man/man3/drmaa_get_vector_attribute_names.3
 sge/man/man3/drmaa_init.3
@@ -288,6 +298,7 @@ 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/sge_execd.8
 sge/man/man8/sge_qmaster.8
 sge/man/man8/sge_schedd.8
@@ -449,7 +460,6 @@ sge/qmon/PIXMAPS/xterm.xpm
 sge/qmon/Qmon
 sge/qmon/qmon_help.ad
 sge/util/arch
-sge/util/arch.orig
 sge/util/arch_variables
 sge/util/arch_variables.orig
 sge/util/bdb_checkpoint.sh
@@ -540,10 +550,6 @@ sge/util/resources/pe/make.sge_pqs_api
 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/spooling/disable_history.sql
-sge/util/resources/spooling/history.sh
-sge/util/resources/spooling/init_postgres.sh
-sge/util/resources/spooling/init_postgres.sql
 sge/util/resources/starter_methods/settaskid.sh
 sge/util/resources/usersets/deadlineusers
 sge/util/resources/usersets/defaultdepartment
@@ -553,7 +559,6 @@ sge/util/sgeCA/sge_ca
 sge/util/sgeCA/sge_ssl.cnf
 sge/util/sgeCA/sge_ssl_template.cnf
 sge/util/sge_aliases
-sge/util/sge_log_tee
 sge/util/sge_request
 sge/util/sgeremoterun
 sge/utilbin/${SGE_ARCH}/adminrun
@@ -595,7 +600,6 @@ sge/utilbin/${SGE_ARCH}/uidgid
 @dirrm sge/util/sgeCA
 @dirrm sge/util/resources/usersets
 @dirrm sge/util/resources/starter_methods
-@dirrm sge/util/resources/spooling
 @dirrm sge/util/resources/schemas/qstat
 @dirrm sge/util/resources/schemas
 @dirrm sge/util/resources/pe
diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo
index b0e6de894eb..fa0a6dbe99e 100644
--- a/parallel/sge/distinfo
+++ b/parallel/sge/distinfo
@@ -1,22 +1,11 @@
-$NetBSD: distinfo,v 1.7 2007/01/25 19:46:55 markd Exp $
+$NetBSD: distinfo,v 1.8 2007/08/15 02:03:06 markd Exp $
 
-SHA1 (sge-V60u8_TAG-src.tar.gz) = 3efe0f4576ef7bdb527b9b5e0d04850847745f87
-RMD160 (sge-V60u8_TAG-src.tar.gz) = 40e40e157e3ca555195774adbd8f27c1d3f0bcfd
-Size (sge-V60u8_TAG-src.tar.gz) = 10593210 bytes
-SHA1 (patch-ae) = 2827fe4999413aaf833e57ecfa44fd495809e02d
-SHA1 (patch-af) = 6d7ca6c032ae4d5696dd9f94484020577bb4e35b
-SHA1 (patch-ag) = 145ee60e13d00ac8544db645f6c952c047239eb7
-SHA1 (patch-ah) = d0cb695f0a55cfea6625a90d388fac82ab3219af
-SHA1 (patch-ai) = f60b1946ecc594e3467fac16b054182edfc13c34
-SHA1 (patch-aj) = 884096ddfec328284d1c1b603428885b6d43c724
-SHA1 (patch-ak) = a99fb17fd583e8e1cbfab9271f3cb3ebc5797584
-SHA1 (patch-am) = 58c08eda9a5cbe5ed3202fdeeb4e3c28d70e49af
-SHA1 (patch-ar) = e951d7f999af9022911a1f7ee7283cb62e2cf830
-SHA1 (patch-as) = 355eca405440e09b9ecd9e1db4a4727ab408e772
+SHA1 (sge-V60u11_TAG-src.tar.gz) = 65953f0738935234027b51de2e0910dc6901fdc2
+RMD160 (sge-V60u11_TAG-src.tar.gz) = 06747d75dc6c87f710da3e51aaed2404a972e205
+Size (sge-V60u11_TAG-src.tar.gz) = 7509896 bytes
+SHA1 (patch-ah) = a54cb0d2d970e1e7563a6a5d1df73fa6c1751ac3
+SHA1 (patch-ai) = 9ed4476290c659bd1981fbbc67e908ccc7cdfded
+SHA1 (patch-ak) = 24493f9294bebaf41f08830da7b8fb5f1bd48eec
+SHA1 (patch-am) = 9dee10fdf12a6424070daa9109fbdb1a6849777a
 SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
-SHA1 (patch-bf) = ecce12bf3c7986c1366e1836d2108bce4ae0fbf8
-SHA1 (patch-bg) = 7e2d950e6ee5a09bbe7e39855f80533aa3db090d
-SHA1 (patch-bi) = e1e383801e288537ae42ea40d24cd9feec136211
-SHA1 (patch-bj) = 46aadeb215c7731664f558732227cefe00492aa2
-SHA1 (patch-bk) = 3471a2b8877c5e7b094810ce8cf71df8ef10a758
-SHA1 (patch-bl) = fbb526f5a63dae2346bdf27a4e8d6d6c90ca8b96
+SHA1 (patch-bl) = 9e0780aeb592810a834316b82a9b16929084f39f
diff --git a/parallel/sge/patches/patch-ae b/parallel/sge/patches/patch-ae
deleted file mode 100644
index 2dd45b7861d..00000000000
--- a/parallel/sge/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/05/03 00:38:34 dmcmahill Exp $
-
---- source/clients/qmon/Makefile.orig	2004-03-03 13:09:34.000000000 +0000
-+++ source/clients/qmon/Makefile
-@@ -135,7 +135,7 @@ messages:
- # rules to build binaries
- ###############################################################################
- qmon:  $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_LIB_DEPENDS)
--	$(LD_WRAPPER) $(CC) $(LFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS) 
-+	$(LD_WRAPPER) $(CC) $(LFLAGS) $(LDFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS)
- 
- ############################################################################
- # ListTree Demo prog
diff --git a/parallel/sge/patches/patch-af b/parallel/sge/patches/patch-af
deleted file mode 100644
index 4c3182310e4..00000000000
--- a/parallel/sge/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/10/19 11:51:27 markd Exp $
-
---- source/3rdparty/qmon/iconlist/IconList.c.orig	2005-05-03 21:18:02.000000000 +1200
-+++ source/3rdparty/qmon/iconlist/IconList.c
-@@ -50,6 +50,10 @@
- #include <Xm/Traversal.h>
- #endif
- 
-+#ifdef LesstifVersion
-+#undef NeedWidePrototypes
-+#endif
-+
- #ifndef SOLARIS
- #if XmVersion >= 2000
- extern void _XmResizeObject(
diff --git a/parallel/sge/patches/patch-ag b/parallel/sge/patches/patch-ag
deleted file mode 100644
index 79870a193e1..00000000000
--- a/parallel/sge/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/10/19 11:51:27 markd Exp $
-
---- source/3rdparty/qmon/spinbox/Spinbox.c.orig	2005-07-27 23:54:52.000000000 +1200
-+++ source/3rdparty/qmon/spinbox/Spinbox.c
-@@ -1796,7 +1796,7 @@ static Boolean long_get_value (
- {
- #ifdef CRAY
-    errno = 0;
--#elif !defined(LINUX) && !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) && \
-+#elif !defined(LINUX) && !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD) && \
-    !defined(AIX51) && !defined(AIX43) && !defined(ALPHA) && !defined(HP1164) && !defined(HPUX) && !defined(IRIX) 
-    int errno = 0; 
- #endif
diff --git a/parallel/sge/patches/patch-ah b/parallel/sge/patches/patch-ah
index 62669dfc475..53a8e6720b5 100644
--- a/parallel/sge/patches/patch-ah
+++ b/parallel/sge/patches/patch-ah
@@ -1,17 +1,17 @@
-$NetBSD: patch-ah,v 1.2 2006/10/19 11:51:27 markd Exp $
+$NetBSD: patch-ah,v 1.3 2007/08/15 02:03:06 markd Exp $
 
---- source/aimk.site.orig	2005-11-24 07:14:52.000000000 +1300
+--- source/aimk.site.orig	2007-01-30 22:41:51.000000000 +1300
 +++ source/aimk.site
-@@ -54,7 +54,7 @@ setenv TMPDIR /tmp
+@@ -51,7 +51,7 @@ setenv TMPDIR /tmp
  # OPENSSL_HOME the directory where the include and lib directory of openssl
  # is installed
  #
--set OPENSSL_HOME = /vol2/tools/SW/openssl-0.9.7e/$buildarch
+-set OPENSSL_HOME = /vol2/tools/SW/openssl-0.9.7l/$buildarch
 +set OPENSSL_HOME = @ssl_prefix@
  
  # 
  # POSTGRES_HOME the directory where the include and lib directory of 
-@@ -66,11 +66,11 @@ set POSTGRES_HOME = /vol2/tools/SW/postg
+@@ -63,11 +63,11 @@ set POSTGRES_HOME = /vol2/tools/SW/postg
  # BERKELEYDB_HOME the directory where the include and lib directory of
  # Berkeley DB is installed
  #
@@ -26,7 +26,7 @@ $NetBSD: patch-ah,v 1.2 2006/10/19 11:51:27 markd Exp $
  
  # 
  # KRB_HOME the directory where the include and lib directory of kerberos is
-@@ -99,7 +99,7 @@ set SWIG = /vol2/tools/SW/swig-1.3.22/$b
+@@ -96,7 +96,7 @@ set SWIG = /vol2/tools/SW/swig-1.3.22/$b
  #
  # PERL path
  #
diff --git a/parallel/sge/patches/patch-ai b/parallel/sge/patches/patch-ai
index 61c9ecc8146..c68a2f24502 100644
--- a/parallel/sge/patches/patch-ai
+++ b/parallel/sge/patches/patch-ai
@@ -1,14 +1,16 @@
-$NetBSD: patch-ai,v 1.2 2006/10/19 11:51:27 markd Exp $
+$NetBSD: patch-ai,v 1.3 2007/08/15 02:03:07 markd Exp $
 
---- source/scripts/distinst.site.orig	2005-09-14 18:56:02.000000000 +1200
+--- source/scripts/distinst.site.orig	2006-12-12 05:25:04.000000000 +1300
 +++ source/scripts/distinst.site
-@@ -31,7 +31,7 @@
+@@ -31,9 +31,9 @@
  #___INFO__MARK_END__
  
  # Base directory where the openssl binary and libraries reside
--OPENSSLBASE=/vol2/tools/SW/openssl-0.9.7e
+-OPENSSLBASE=/vol2/tools/SW/openssl-0.9.7l
 +OPENSSLBASE=@ssl_prefix@
  
  # Base directory where BDB resides
 -BERKELEYDBBASE=/vol2/SW/db-4.2.52
 +BERKELEYDBBASE=@db4_prefix@
+ 
+ TAR=gtar
diff --git a/parallel/sge/patches/patch-aj b/parallel/sge/patches/patch-aj
deleted file mode 100644
index 5cd767789e3..00000000000
--- a/parallel/sge/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/10/19 11:51:27 markd Exp $
-
---- source/libs/uti/sge_uidgid.c.orig	2006-09-26 13:02:53.000000000 +1200
-+++ source/libs/uti/sge_uidgid.c
-@@ -1532,7 +1532,7 @@ copygrp(struct group *tgrp, struct group
-    for (i = 0; tgrp->gr_mem[i] != NULL; i++) {
-       strcpy(grp->gr_mem[i], tgrp->gr_mem[i]);
-    }
--   *(grp->gr_mem[i]) = NULL;
-+   (grp->gr_mem[i]) = NULL;
- 
-    return 0;
- }
diff --git a/parallel/sge/patches/patch-ak b/parallel/sge/patches/patch-ak
index a461a2667cd..e123b6389c2 100644
--- a/parallel/sge/patches/patch-ak
+++ b/parallel/sge/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2007/01/25 19:46:55 markd Exp $
+$NetBSD: patch-ak,v 1.4 2007/08/15 02:03:07 markd Exp $
 
---- source/utilbin/Makefile.orig	2006-01-31 01:50:36.000000000 +1300
+--- source/utilbin/Makefile.orig	2007-05-07 22:09:17.000000000 +1200
 +++ source/utilbin/Makefile
-@@ -197,7 +197,7 @@ fstype.o: $(UTILBIN_DIR)/fstype.c
+@@ -206,7 +206,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)
@@ -11,12 +11,12 @@ $NetBSD: patch-ak,v 1.3 2007/01/25 19:46:55 markd Exp $
  
  spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
  		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
-@@ -232,7 +232,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
+@@ -241,7 +241,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
  
  #---------------------------------------------------------------------
  spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(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 -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) -lspoolb $(SPOOLING_LIBS) -lsched -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.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 6e206c3ec2b..d9ead653f50 100644
--- a/parallel/sge/patches/patch-am
+++ b/parallel/sge/patches/patch-am
@@ -1,56 +1,41 @@
-$NetBSD: patch-am,v 1.2 2006/10/19 11:51:27 markd Exp $
+$NetBSD: patch-am,v 1.3 2007/08/15 02:03:07 markd Exp $
 
---- source/aimk.orig	2006-04-20 00:23:24.000000000 +1200
+--- source/aimk.orig	2007-05-09 00:49:44.000000000 +1200
 +++ source/aimk
-@@ -529,7 +529,7 @@ set SPOOLING_DEPS   = "spoolloaderlib sp
+@@ -349,7 +349,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 -R$BERKELEYDB_HOME/lib"
  
- # Compile with gettext and libintl - we have platform dependent defaults
- switch ($BUILDARCH) 
-@@ -1184,11 +1184,11 @@ case FREEBSD_*:
-    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 NOERR_CFLAG = "-Wno-error"
--   set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
-+   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
-    set LIBS     = "$LIBS -lkvm"
-    set SHAREDLD = $CC
-    set SHARED_CFLAGS = "-fPIC"
--   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared" 
-+   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic" 
-    
-    set XMTDEF   = ""
-    set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
-@@ -1212,18 +1212,23 @@ case NETBSD_*:
-    set DLLIB    = ""
+ set LOADCHECK_ALL = loadcheck
+ 
+@@ -1047,18 +1047,23 @@ case NETBSD_*:
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
--   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M -DSGE_THREADSAFE_UTIL $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
+ #   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M -DSGE_THREADSAFE_UTIL $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
+-   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
 +   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
-    set NOERR_CFLAG = "-Wno-error"
--   set LFLAGS   = "$DEBUG_FLAG $LFLAGS"
 +   switch (`/usr/bin/uname -r`)
 +   case "[1-2].*":
-+	set CFLAGS = "$CFLAGS -DSGE_THREADSAFE_UTIL"
-+	breaksw
++       set CFLAGS = "$CFLAGS -DSGE_THREADSAFE_UTIL"
++       breaksw
 +   endsw
+    set NOERR_CFLAG = "-Wno-error"
+-   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
 +   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
     set LIBS     = "$LIBS -lkvm"
     set SHAREDLD = $CC
     set SHARED_CFLAGS = "-fPIC"
--   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
-+   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
+    set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
  
     set XMTDEF   = ""
--   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
+-   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include -I/usr/pkg/include"
 +   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"
-+   set XLIBD    = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
+-   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 XLFLAGS  = "$XLIBD"
     set XLIBS    = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM       = "rm -f"
diff --git a/parallel/sge/patches/patch-ar b/parallel/sge/patches/patch-ar
deleted file mode 100644
index f103715aa55..00000000000
--- a/parallel/sge/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2006/10/19 11:51:27 markd Exp $
-
---- source/daemons/shepherd/setrlimits.c.orig	2005-11-23 04:35:03.000000000 +1300
-+++ source/daemons/shepherd/setrlimits.c
-@@ -437,7 +437,7 @@ static void pushlimit(int resource, stru
-       if (rlp->rlim_max < rlp->rlim_cur)
-          rlp->rlim_cur = rlp->rlim_max;
- 
--#if defined(NECSX4) || defined(NECSX5)
-+#if defined(NECSX4) || defined(NECSX5) || defined(NETBSD_ALPHA) || defined(NETBSD_X86_64) || defined(NETBSD_SPARC64)
- #  define limit_fmt "%ld"
- #elif defined(IRIX) || defined(HPUX) || defined(DARWIN) || defined(FREEBSD) || defined(NETBSD) || defined(INTERIX)
- #  define limit_fmt "%lld"
diff --git a/parallel/sge/patches/patch-as b/parallel/sge/patches/patch-as
deleted file mode 100644
index 3338305143a..00000000000
--- a/parallel/sge/patches/patch-as
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-as,v 1.3 2006/10/19 11:51:27 markd Exp $
-
---- source/dist/util/arch.orig	2005-06-21 00:25:11.000000000 +1200
-+++ source/dist/util/arch
-@@ -309,6 +309,9 @@ if [ "$1" = "-m" -o "$1" = "-mt" -o "$1"
-       DEFAULTMANPATH=`/usr/bin/manpath -q`
-       PATH=$SAFE_PATH
-       ;;
-+   nbsd-*)
-+      DEFAULTMANPATH=/usr/pkg/man:/usr/local/man:/usr/X11R6/man:/usr/share/man
-+      ;;
-    hp*)
-       DEFAULTMANPATH=/usr/man:/usr/contrib/man:/usr/local/man
-       SHARED_LIBRARY_PATH="SHLIB_PATH"
diff --git a/parallel/sge/patches/patch-bf b/parallel/sge/patches/patch-bf
deleted file mode 100644
index f74672b364a..00000000000
--- a/parallel/sge/patches/patch-bf
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2006/10/19 11:51:27 markd Exp $
-
---- source/utilbin/infotext.c.orig	2005-10-25 04:58:07.000000000 +1300
-+++ source/utilbin/infotext.c
-@@ -66,7 +66,7 @@ static void  sge_infotext_welcome(void);
- static void  sge_infotext_raw(char* format_string);
- static void  sge_infotext_usage(void);
- static int   sge_infotext_get_nr_of_substrings(char* buffer, char* substring);
--#if defined(ALPHA) || defined(SOLARISAMD64) || defined(ALPHA5) || defined(ALINUX) || defined(HPUX) || __GNUC__ >= 3
-+#if defined(ALPHA) || defined(SOLARISAMD64) || defined(ALPHA5) || defined(ALINUX) || defined(HPUX) || __GNUC__ >= 3 || defined(NETBSD)
- static char* sge_infotext_string_replace(dstring* buf, char* arg, char* what, char* with, int only_first );
- #endif
- static char* sge_infotext_string_input_parsing(dstring* buf,char* string);
-@@ -545,7 +545,7 @@ static char* sge_infotext_string_output_
- }
- 
- 
--#if defined(ALPHA) || defined(SOLARISAMD64) || defined(ALPHA5) || defined(ALINUX) || defined(HPUX) || defined(IRIX65) || __GNUC__ >= 3
-+#if defined(ALPHA) || defined(SOLARISAMD64) || defined(ALPHA5) || defined(ALINUX) || defined(HPUX) || defined(IRIX65) || __GNUC__ >= 3 || defined(NETBSD)
- static char* sge_infotext_string_replace(dstring* tmp_buf, char* arg, char* what, char* with, int only_first) {
-    int i;
-    char* p1;
-@@ -1050,7 +1050,7 @@ int main( int argc, char* argv[] ) {
-    DPRINTF(("pass 4\n"));
-    {
-       if (real_args > 0) {
--#if defined(SOLARISAMD64) || defined(ALPHA) || defined(ALPHA5) || defined(ALINUX) || defined(HPUX) || defined(IRIX65) || __GNUC__ >= 3
-+#if defined(SOLARISAMD64) || defined(ALPHA) || defined(ALPHA5) || defined(ALINUX) || defined(HPUX) || defined(IRIX65) || __GNUC__ >= 3 || defined(NETBSD)
-       for(i=0;i<real_args;i++) {
- /*      printf("argument[%d]: \"%s\"\n",i,argv[first_arg +i]); */
-          sge_dstring_copy_string(&buffer, sge_infotext_string_replace(&tmp_buf, (char*)sge_dstring_get_string(&buffer2),"%s",argv[first_arg +i],1));
diff --git a/parallel/sge/patches/patch-bg b/parallel/sge/patches/patch-bg
deleted file mode 100644
index f82b79c286c..00000000000
--- a/parallel/sge/patches/patch-bg
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-bg,v 1.2 2006/10/19 11:51:27 markd Exp $
-
---- source/common/basis_types.h.orig	2005-07-18 22:25:31.000000000 +1200
-+++ source/common/basis_types.h
-@@ -110,7 +110,7 @@ extern "C" {
- #  define u_long32 u_int
- #elif defined(WIN32NATIVE)
- #  define u_long32 unsigned long
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(NETBSD)
- #  define u_long32 uint32_t
- #else
- #  define u_long32 u_long
-@@ -120,7 +120,7 @@ extern "C" {
- 
- /* set sge_u32 and sge_x32 for 64 or 32 bit machines */
- /* sge_uu32 for strictly unsigned, not nice, but did I use %d for an unsigned? */
--#if defined(TARGET_64BIT) || defined(FREEBSD)
-+#if defined(TARGET_64BIT) || defined(FREEBSD) || defined(NETBSD)
- #  define sge_u32    "%d"
- #  define sge_uu32   "%u"
- #  define sge_x32    "%x"
-@@ -136,7 +136,7 @@ extern "C" {
-    solaris (who else - it's IRIX?) uses long 
-    variables for uid_t, gid_t and pid_t 
- */
--#if defined(FREEBSD)
-+#if defined(FREEBSD) || defined(NETBSD)
- #  define uid_t_fmt "%u"
- #else
- #  define uid_t_fmt pid_t_fmt
-@@ -150,7 +150,7 @@ extern "C" {
- 
- #if (defined(SOLARIS) && defined(TARGET_32BIT)) || defined(IRIX) || defined(INTERIX)
- #  define gid_t_fmt    "%ld"
--#elif defined(LINUX86) || defined(FREEBSD)
-+#elif defined(LINUX86) || defined(FREEBSD) || defined(NETBSD)
- #  define gid_t_fmt    "%u"
- #else
- #  define gid_t_fmt    "%d"
diff --git a/parallel/sge/patches/patch-bi b/parallel/sge/patches/patch-bi
deleted file mode 100644
index 06575f79db1..00000000000
--- a/parallel/sge/patches/patch-bi
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2005/11/26 21:19:20 markd Exp $
-
---- source/3rdparty/qtcsh/tc.sig.h.orig	2001-07-18 23:06:05.000000000 +1200
-+++ source/3rdparty/qtcsh/tc.sig.h
-@@ -61,7 +61,7 @@
- /*
-  * sigvec is not the same everywhere
-  */
--# if defined(_SEQUENT_) || (defined(_POSIX_SOURCE) && !defined(hpux))
-+# if defined(_SEQUENT_) || (defined(_POSIX_SOURCE) && !defined(hpux)) || defined(__NetBSD__)
- #  define HAVE_SIGVEC
- #  define mysigvec(a, b, c)	sigaction(a, b, c)
- typedef struct sigaction sigvec_t;
-@@ -75,7 +75,7 @@ typedef struct sigaction sigvec_t;
- #  endif
- #  define sv_handler sa_handler
- #  define sv_flags sa_flags
--# endif /* _SEQUENT || (_POSIX_SOURCE && !hpux) */
-+# endif /* _SEQUENT || (_POSIX_SOURCE && !hpux) || __NetBSD__ */
- 
- # ifdef hpux
- #  define HAVE_SIGVEC
diff --git a/parallel/sge/patches/patch-bj b/parallel/sge/patches/patch-bj
deleted file mode 100644
index ea2078c6baf..00000000000
--- a/parallel/sge/patches/patch-bj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2006/10/19 11:51:27 markd Exp $
-
---- source/daemons/common/err_trace.c.orig	2005-11-24 00:03:58.000000000 +1300
-+++ source/daemons/common/err_trace.c
-@@ -962,7 +962,7 @@ static bool nfs_mounted(const char *path
- {
-    bool ret=true;
- 
--#if defined(LINUX) || defined(DARWIN) || defined(FREEBSD) || defined(NETBSD)
-+#if defined(LINUX) || defined(DARWIN) || defined(FREEBSD) || (defined(NETBSD) && !defined(ST_RDONLY))
-    struct statfs buf;
-    statfs(path, &buf);
- #elif defined(INTERIX)
diff --git a/parallel/sge/patches/patch-bk b/parallel/sge/patches/patch-bk
deleted file mode 100644
index 3809e701f6d..00000000000
--- a/parallel/sge/patches/patch-bk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bk,v 1.1 2006/10/19 11:51:27 markd Exp $
-
---- source/utilbin/fstype.c.orig	2005-10-06 20:18:25.000000000 +1300
-+++ source/utilbin/fstype.c
-@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
-    }
-    else
-    {  
--#if defined(LINUX) || defined(DARWIN) || defined(FREEBSD) || defined(NETBSD)
-+#if defined(LINUX) || defined(DARWIN) || defined(FREEBSD) || (defined(NETBSD) && !defined(ST_RDONLY))
-    struct statfs buf;
-    ret = statfs(argv[1], &buf);
- #elif defined(INTERIX)
diff --git a/parallel/sge/patches/patch-bl b/parallel/sge/patches/patch-bl
index ec318498a9a..402226f479b 100644
--- a/parallel/sge/patches/patch-bl
+++ b/parallel/sge/patches/patch-bl
@@ -1,55 +1,47 @@
-$NetBSD: patch-bl,v 1.1 2006/10/19 11:51:27 markd Exp $
+$NetBSD: patch-bl,v 1.2 2007/08/15 02:03:09 markd Exp $
 
---- source/libs/comm/cl_ssl_framework.c.orig	2006-10-08 23:52:33.000000000 +1300
+--- source/libs/comm/cl_ssl_framework.c.orig	2006-07-17 20:25:05.000000000 +1200
 +++ source/libs/comm/cl_ssl_framework.c
-@@ -988,6 +988,9 @@ static int cl_com_ssl_build_symbol_table
+@@ -988,7 +988,7 @@ static int cl_com_ssl_build_symbol_table
     {
        char* func_name = NULL;
        int had_errors = 0;
+-#if defined(FREEBSD)
 +#if defined(FREEBSD) || defined(NETBSD)
-+      void* cl_com_ssl_crypto_handle_saved = NULL;
-+#endif
+       void* cl_com_ssl_crypto_handle_saved = NULL;
+ #endif
  
- 
-       CL_LOG(CL_LOG_INFO,"loading ssl library functions with dlopen() ...");
-@@ -1002,9 +1005,16 @@ static int cl_com_ssl_build_symbol_table
+@@ -1004,12 +1004,12 @@ static int cl_com_ssl_build_symbol_table
  
  #if defined(DARWIN)
  #ifdef RTLD_NODELETE
 -      cl_com_ssl_crypto_handle = dlopen ("libssl.bundle", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
 +      cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
-+#else
-+      cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL );
-+#endif /* RTLD_NODELETE */
-+
-+#elif defined(FREEBSD) || defined(NETBSD)
-+#ifdef RTLD_NODELETE
-+      cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
  #else
 -      cl_com_ssl_crypto_handle = dlopen ("libssl.bundle", RTLD_NOW | RTLD_GLOBAL );
-+      cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL);
++      cl_com_ssl_crypto_handle = dlopen ("libssl.dylib", RTLD_NOW | RTLD_GLOBAL );
  #endif /* RTLD_NODELETE */
  
- #elif defined(HP11)
-@@ -1029,6 +1039,10 @@ static int cl_com_ssl_build_symbol_table
+-#elif defined(FREEBSD)
++#elif defined(FREEBSD) || defined(NETBSD)
+ #ifdef RTLD_NODELETE
+       cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
+ #else
+@@ -1038,7 +1038,7 @@ static int cl_com_ssl_build_symbol_table
           return CL_RETVAL_SSL_DLOPEN_SSL_LIB_FAILED;
        }
        
+-#if defined(FREEBSD)
 +#if defined(FREEBSD) || defined(NETBSD)
-+      cl_com_ssl_crypto_handle_saved = cl_com_ssl_crypto_handle;
-+      cl_com_ssl_crypto_handle = RTLD_DEFAULT;
-+#endif
- 
- 
-       /* setting up crypto function pointers */
-@@ -1649,6 +1663,10 @@ static int cl_com_ssl_build_symbol_table
+       cl_com_ssl_crypto_handle_saved = cl_com_ssl_crypto_handle;
+       cl_com_ssl_crypto_handle = RTLD_DEFAULT;
+ #endif
+@@ -1661,7 +1661,7 @@ static int cl_com_ssl_build_symbol_table
           return CL_RETVAL_SSL_CANT_LOAD_ALL_FUNCTIONS;
        }
  
+-#if defined(FREEBSD)
 +#if defined(FREEBSD) || defined(NETBSD)
-+      cl_com_ssl_crypto_handle = cl_com_ssl_crypto_handle_saved;
-+#endif
-+
-       pthread_mutex_unlock(&cl_com_ssl_crypto_handle_mutex);
-       CL_LOG(CL_LOG_INFO,"loading ssl library functions with dlopen() done");
+       cl_com_ssl_crypto_handle = cl_com_ssl_crypto_handle_saved;
+ #endif