From 0b0e36b06b2e77fd17534c844760d8ab292fe74c Mon Sep 17 00:00:00 2001
From: schwarz <schwarz@pkgsrc.org>
Date: Sun, 6 Aug 2006 18:55:46 +0000
Subject: added patches to fix pkg/28638 as well as increase compatibility with
 IRIX 5

---
 mail/imapproxy/distinfo         |  4 +++-
 mail/imapproxy/patches/patch-ac | 48 +++++++++++++++++++++++++++++++++++++++++
 mail/imapproxy/patches/patch-ad | 12 +++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 mail/imapproxy/patches/patch-ac
 create mode 100644 mail/imapproxy/patches/patch-ad

diff --git a/mail/imapproxy/distinfo b/mail/imapproxy/distinfo
index 542c9023a79..856a418d09c 100644
--- a/mail/imapproxy/distinfo
+++ b/mail/imapproxy/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 16:00:41 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/08/06 18:55:46 schwarz Exp $
 
 SHA1 (imapproxy-1.0.tar.gz) = 844acba24633430d15cb9b3a586164aef5051583
 RMD160 (imapproxy-1.0.tar.gz) = 0e0ab29c476c55a09229a21c0cbdc05e8ef885cd
 Size (imapproxy-1.0.tar.gz) = 75668 bytes
 SHA1 (patch-aa) = 2148477ad9e5e3c50854cba3b042220d469c5ace
 SHA1 (patch-ab) = 745129d5bf2d5e950d6bfb9c8178f1f626b6f4e5
+SHA1 (patch-ac) = 8f005441354b5728988c6a1e8164a3d17c31f81b
+SHA1 (patch-ad) = 502840ba54d72ffacc0418e691b5e2fbd3668f50
diff --git a/mail/imapproxy/patches/patch-ac b/mail/imapproxy/patches/patch-ac
new file mode 100644
index 00000000000..eed62e00ddc
--- /dev/null
+++ b/mail/imapproxy/patches/patch-ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-ac,v 1.1 2006/08/06 18:55:46 schwarz Exp $
+
+--- configfile.c.orig	2006-08-06 19:27:25.000000000 +0200
++++ configfile.c	2006-08-06 20:41:51.000000000 +0200
+@@ -19,6 +19,7 @@
+  */
+ 
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <strings.h>
+@@ -95,7 +96,7 @@
+ 
+ int check_and_set_log_facility(char *var,char *val)
+ {
+-#ifdef SOLARIS /* Solaris */
++#if defined(SOLARIS) || defined(__sgi) /* Solaris or IRIX */
+     char *values[] = { 	"LOG_AUTH", "LOG_CRON", "LOG_DAEMON", "LOG_KERN", 
+ 			"LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4", 
+ 			"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", "LOG_MAIL", "LOG_NEWS", 
+@@ -113,7 +114,7 @@
+ 			LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, 
+ 			LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NEWS, 
+ 			LOG_SYSLOG, LOG_USER, LOG_UUCP };
+-#endif /* Solaris */
++#endif /* Solaris or IRIX */
+ 
+     int i = 0;
+     
+@@ -482,7 +483,7 @@
+ 
+ char *log_facility_to_str(int x)
+ {
+-#ifdef SOLARIS /* Solaris */
++#if defined(SOLARIS) || defined(__sgi) /* Solaris or IRIX */
+     char *values[] = { 	"LOG_AUTH", "LOG_CRON", "LOG_DAEMON", "LOG_KERN", 
+ 			"LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4", 
+ 			"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", "LOG_MAIL", "LOG_NEWS", 
+@@ -500,7 +501,7 @@
+ 			LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, 
+ 			LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NEWS, 
+ 			LOG_SYSLOG, LOG_USER, LOG_UUCP };
+-#endif /* Solaris */
++#endif /* Solaris or IRIX */
+ 
+     int i = 0;
+     
diff --git a/mail/imapproxy/patches/patch-ad b/mail/imapproxy/patches/patch-ad
new file mode 100644
index 00000000000..1cd9247ed86
--- /dev/null
+++ b/mail/imapproxy/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2006/08/06 18:55:46 schwarz Exp $
+
+--- database.c.orig	2006-08-06 19:25:38.000000000 +0200
++++ database.c	2006-08-06 20:42:21.000000000 +0200
+@@ -19,6 +19,7 @@
+  */
+ 
+ 
++#include <sys/types.h>
+ #include <string.h>
+ #include <strings.h>
+ #include <stdlib.h>
-- 
cgit v1.2.3