Fix SCO OpenServer 5.0.7/3.2 build.

6 files changed, 47 insertions, 4 deletions

diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index c17c02c8d5c..685fb9d649d 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/02/12 23:17:39 tron Exp $
+# $NetBSD: Makefile,v 1.17 2014/07/18 11:31:25 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
 PKGREVISION=	1
@@ -16,5 +16,10 @@ CNFS=			ldap.conf
 
 .include "options.mk"
 
+.if ${OS_VARIANT} == "SCOOSR5"
+# SCO OpenServer 5.0.7/3.2 has sockelen_t definition in pthread.h of GNU pth.
+CONFIGURE_ENV+=		ac_cv_type_socklen_t=yes
+.endif
+
 .include "../../databases/openldap/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 4e5207e5515..d0eabb83e79 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2014/05/09 08:12:00 tron Exp $
+$NetBSD: distinfo,v 1.96 2014/07/18 11:31:25 ryoon Exp $
 
 SHA1 (openldap-2.4.39.tgz) = 2b8e8401214867c361f7212e7058f95118b5bd6c
 RMD160 (openldap-2.4.39.tgz) = da68043bd38e9d58811599d43bfdbc8f6c9b6f58
@@ -18,4 +18,5 @@ SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae
 SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4
 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
 SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198
+SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
 SHA1 (patch-libraries_librewrite_session.c) = e698d168556750ea790c563d439dd2fd8c87038e
diff --git a/databases/openldap/patches/patch-libraries_libldap_os-local.c b/databases/openldap/patches/patch-libraries_libldap_os-local.c
new file mode 100644
index 00000000000..c3beb920da0
--- /dev/null
+++ b/databases/openldap/patches/patch-libraries_libldap_os-local.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-libraries_libldap_os-local.c,v 1.1 2014/07/18 11:31:25 ryoon Exp $
+
+--- libraries/libldap/os-local.c.orig	2014-01-25 13:36:15.000000000 +0000
++++ libraries/libldap/os-local.c
+@@ -202,6 +202,11 @@ sendcred:
+ 				struct msghdr msg = {0};
+ # ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+ # ifndef CMSG_SPACE
++#  if defined(_SCO_DS)
++/* SCO OpenServer 5.0.7/3.2 has no cmsg macros. */
++#define __ALIGNBYTES		(sizeof(long) - 1)
++#define _CMSG_ALIGN(n)		(((n) + __ALIGNBYTES) & ~__ALIGNBYTES)
++#  endif
+ # define CMSG_SPACE(len)	(_CMSG_ALIGN( sizeof(struct cmsghdr)) + _CMSG_ALIGN(len) )
+ # endif
+ # ifndef CMSG_LEN
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 55635f2d141..166ea76d770 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2014/06/05 15:10:20 adam Exp $
+# $NetBSD: Makefile,v 1.80 2014/07/18 11:25:14 ryoon Exp $
 
 DISTNAME=	sqlite-autoconf-3080500
 PKGNAME=	sqlite3-3.8.5
@@ -43,6 +43,10 @@ CFLAGS+=		-DSQLITE_ENABLE_LOAD_EXTENSION
 # See http://www.sqlite.org/cvstrac/tktview?tn=3555
 LIBS+=			${BUILDLINK_LDADD.dl}
 
+.if ${OS_VARIANT} == "SCOOSR5"
+LDFLAGS.SCO_SV+=	-lpthread
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index 6899a917035..d48efc6ff9e 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.89 2014/06/05 15:10:20 adam Exp $
+$NetBSD: distinfo,v 1.90 2014/07/18 11:25:14 ryoon Exp $
 
 SHA1 (sqlite-autoconf-3080500.tar.gz) = 7f667e10ccebc26ab2086b8a30cb0a600ca0acae
 RMD160 (sqlite-autoconf-3080500.tar.gz) = b8da5ec594ac808da85469349c7506bd343946bf
 Size (sqlite-autoconf-3080500.tar.gz) = 1957050 bytes
+SHA1 (patch-sqlite3.c) = 00399cf79308a4f6395d90f263dd2da9ae7de81b
diff --git a/databases/sqlite3/patches/patch-sqlite3.c b/databases/sqlite3/patches/patch-sqlite3.c
new file mode 100644
index 00000000000..4c7d0eb1de4
--- /dev/null
+++ b/databases/sqlite3/patches/patch-sqlite3.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-sqlite3.c,v 1.3 2014/07/18 11:25:14 ryoon Exp $
+
+--- sqlite3.c.orig	2014-02-11 19:42:03.000000000 +0000
++++ sqlite3.c
+@@ -25,6 +25,11 @@
+ #ifndef SQLITE_API
+ # define SQLITE_API
+ #endif
++/* GNU pth requires these headers in very early stage. */
++#if defined(_SCO_DS)
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
+ /************** Begin file sqlite3.h *****************************************/
+ /*
+ ** 2001 September 15