Fix SCO OpenServer 5.0.7 build.

Functionality is not tested.

5 files changed, 50 insertions, 8 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 4a64f9d7004..10316bd00af 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2014/02/12 23:18:08 tron Exp $
+# $NetBSD: Makefile,v 1.141 2014/07/18 10:40:28 ryoon Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -66,6 +66,9 @@ BUILD_TARGET.IRIX=	sgi
 BUILD_TARGET.OSF1=	osf
 BUILD_TARGET.OpenBSD=	bso
 BUILD_TARGET.*=		neb
+.if ${OS_VARIANT} == "SCOOSR5"
+BUILD_TARGET.SCO_SV=	sc5
+.endif
 MESSAGE_SRC=		${PKGDIR}/MESSAGE
 
 # XXX this is not the right approach - should either depend on pam or
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 36f91442c26..a93ed0bf803 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2012/04/05 10:41:54 wiz Exp $
+$NetBSD: distinfo,v 1.43 2014/07/18 10:40:28 ryoon Exp $
 
 SHA1 (imap-2007f.tar.Z) = 1c9935e5a261baec85dadcbc0c514b66fa3ce0a5
 RMD160 (imap-2007f.tar.Z) = 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1
@@ -26,12 +26,13 @@ SHA1 (patch-av) = 3851cbacd805dad0c16ba7ce19879d4f3f299275
 SHA1 (patch-aw) = 4aa5b487426ed583ad137c58e117247b52fef494
 SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9
 SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f
-SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5
+SHA1 (patch-az) = 3dd4367ef56b921051509e2acafcd91b460ccfa6
 SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c
 SHA1 (patch-bb) = b6b5a5294019c23376187b4ff324bf58fdbc113e
 SHA1 (patch-bc) = ae0119037fee2e94c6b60de3c9efc946ed4cfb68
-SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4
+SHA1 (patch-bd) = 044ea6110a11aea99121463d772e94c08fece9b3
 SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54
 SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
 SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f
 SHA1 (patch-bh) = c43dc5df9fb61ea44b5195fc15c697e5f540dfae
+SHA1 (patch-src_mlock_Makefile) = 6bf652f597ad21dffa44e01d6cb89525eeaf7fc9
diff --git a/mail/imap-uw/patches/patch-az b/mail/imap-uw/patches/patch-az
index b5ed220547d..cf27abe7ea0 100644
--- a/mail/imap-uw/patches/patch-az
+++ b/mail/imap-uw/patches/patch-az
@@ -1,6 +1,6 @@
-$NetBSD: patch-az,v 1.2 2007/08/03 17:03:31 obache Exp $
+$NetBSD: patch-az,v 1.3 2014/07/18 10:40:28 ryoon Exp $
 
---- src/tmail/tmail.c.orig	2007-05-21 23:26:20.000000000 +0000
+--- src/tmail/tmail.c.orig	2011-07-23 00:19:58.000000000 +0000
 +++ src/tmail/tmail.c
 @@ -29,7 +29,6 @@
  #include <stdio.h>
@@ -10,3 +10,13 @@ $NetBSD: patch-az,v 1.2 2007/08/03 17:03:31 obache Exp $
  #include <sysexits.h>
  #include <sys/file.h>
  #include <sys/stat.h>
+@@ -559,7 +558,9 @@ int delivery_unsafe (char *path,uid_t ui
+   case S_IFCHR: strcat (tmp,"character special"); break;
+   case S_IFBLK: strcat (tmp,"block special"); break;
+   case S_IFLNK: strcat (tmp,"symbolic link"); break;
++#if defined(S_IFSOCK)
+   case S_IFSOCK: strcat (tmp,"socket"); break;
++#endif
+   default:
+     sprintf (tmp + strlen (tmp),"file type %07o",(unsigned int) type);
+   }
diff --git a/mail/imap-uw/patches/patch-bd b/mail/imap-uw/patches/patch-bd
index 62f7d74d5a5..aab006b5072 100644
--- a/mail/imap-uw/patches/patch-bd
+++ b/mail/imap-uw/patches/patch-bd
@@ -1,6 +1,6 @@
-$NetBSD: patch-bd,v 1.2 2007/08/03 17:03:32 obache Exp $
+$NetBSD: patch-bd,v 1.3 2014/07/18 10:40:28 ryoon Exp $
 
---- src/dmail/dmail.c.orig	2007-06-18 23:34:41.000000000 +0000
+--- src/dmail/dmail.c.orig	2011-07-23 00:19:57.000000000 +0000
 +++ src/dmail/dmail.c
 @@ -29,7 +29,6 @@
  #include <stdio.h>
@@ -10,3 +10,13 @@ $NetBSD: patch-bd,v 1.2 2007/08/03 17:03:32 obache Exp $
  #include <sysexits.h>
  #include <sys/file.h>
  #include <sys/stat.h>
+@@ -438,7 +437,9 @@ int delivery_unsafe (char *path,struct s
+   case S_IFCHR: strcat (tmp,"character special"); break;
+   case S_IFBLK: strcat (tmp,"block special"); break;
+   case S_IFLNK: strcat (tmp,"symbolic link"); break;
++#if defined(S_IFSOCK)
+   case S_IFSOCK: strcat (tmp,"socket"); break;
++#endif
+   default:
+     sprintf (tmp + strlen (tmp),"file type %07o",(unsigned int) type);
+   }
diff --git a/mail/imap-uw/patches/patch-src_mlock_Makefile b/mail/imap-uw/patches/patch-src_mlock_Makefile
new file mode 100644
index 00000000000..c583140bd02
--- /dev/null
+++ b/mail/imap-uw/patches/patch-src_mlock_Makefile
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_mlock_Makefile,v 1.1 2014/07/18 10:40:28 ryoon Exp $
+
+--- src/mlock/Makefile.orig	2011-07-23 00:19:57.000000000 +0000
++++ src/mlock/Makefile
+@@ -32,11 +32,12 @@ SHELL = /bin/sh
+ 
+ CC = `cat $C/CCTYPE`
+ CFLAGS = `cat $C/CFLAGS`
++LDFLAGS = `cat $C/LDFLAGS`
+ 
+ all:	mlock
+ 
+ mlock:	mlock.o
+-	$(CC) $(CFLAGS) -o mlock mlock.o
++	$(CC) $(CFLAGS) ${LDFLAGS} -o mlock mlock.o
+ 
+ install: mlock
+ 	chgrp mail mlock