From 3d6e5f782edbe0dea01f837f3a56d5fae3dacb2c Mon Sep 17 00:00:00 2001
From: fhajny <fhajny>
Date: Mon, 12 Mar 2012 12:53:12 +0000
Subject: Work around the assumption that SunOS 5.11 must be Solaris 11, and
 that path.h must be present thus.

---
 mail/sendmail/Makefile.common  |  6 +++++-
 mail/sendmail/distinfo         |  4 ++--
 mail/sendmail/patches/patch-ag | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 94aa805af9d..fdcf960f596 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2011/06/11 04:44:08 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.55 2012/03/12 12:53:12 fhajny Exp $
 #
 # used by mail/libmilter/Makefile
 # used by mail/sendmail/Makefile
@@ -34,6 +34,10 @@ WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_TOOLS+=	gm4
 MAKE_ENV+=	M4=${TOOLS_M4}
 
+.if ${OPSYS} == "SunOS" && exists(/usr/include/paths.h)
+CFLAGS+=	-DSOLARIS_HAS_PATHS_H
+.endif
+
 .PHONY: make-sendmail-siteconfig
 make-sendmail-siteconfig:
 	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 6d056b96d5f..b0490d409e4 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2011/06/11 04:44:08 jnemeth Exp $
+$NetBSD: distinfo,v 1.46 2012/03/12 12:53:13 fhajny Exp $
 
 SHA1 (sendmail.8.14.5.tar.gz) = 86dd2a8ad5eac892cd02cf67792a25efccacc100
 RMD160 (sendmail.8.14.5.tar.gz) = 0961ed4d6bcda73908670c20c8de6c14cac4d0dd
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
 SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
 SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
 SHA1 (patch-af) = f1fb00d9d27f512c550ad7dbcd014563122488b5
-SHA1 (patch-ag) = 1889e8d7938664af926a9a169bb53f6da924f0bb
+SHA1 (patch-ag) = f76de45c7e8d16207670e151265b7edbca4c045c
 SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
 SHA1 (patch-ai) = aca71358618e8c1dc785a8b2dc049b97232b8795
 SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
diff --git a/mail/sendmail/patches/patch-ag b/mail/sendmail/patches/patch-ag
index 5538f878ec7..89bd83ec073 100644
--- a/mail/sendmail/patches/patch-ag
+++ b/mail/sendmail/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.13 2007/04/26 06:26:27 jnemeth Exp $
+$NetBSD: patch-ag,v 1.14 2012/03/12 12:53:13 fhajny Exp $
 
---- include/sm/conf.h.orig	2007-03-21 16:56:18.000000000 -0700
+--- include/sm/conf.h.orig	2011-05-03 16:24:00.000000000 +0000
 +++ include/sm/conf.h
-@@ -806,7 +806,11 @@ extern unsigned int sleepX __P((unsigned
+@@ -381,7 +381,7 @@ typedef int		pid_t;
+ #   ifndef __svr4__
+ #    define __svr4__		/* use all System V Release 4 defines below */
+ #   endif /* ! __svr4__ */
+-#   if SOLARIS >= 21100
++#   if SOLARIS >= 21100 && defined(SOLARIS_HAS_PATHS_H)
+ #    include <paths.h>
+ #   endif /* SOLARIS >= 21100 */
+ #   ifndef _PATH_VARRUN
+@@ -818,7 +818,11 @@ extern unsigned int sleepX __P((unsigned
  #  ifndef LA_TYPE
  #   define LA_TYPE	LA_SUBR
  #  endif /* ! LA_TYPE */
-- 
cgit v1.2.3