[pkgsrc/trunk]: pkgsrc/mail/sendmail Get rid of the ugly hacks.mk and always ...

[jnemeth <jnemeth%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d82bc29c098
branches:  trunk
changeset: 568640:7d82bc29c098
user:      jnemeth <jnemeth%pkgsrc.org@localhost>
date:      Wed Dec 16 13:41:41 2009 +0000

description:
Get rid of the ugly hacks.mk and always define SM_CONF_STDBOOL_H on
NetBSD.  All supported NetBSD versions (and some unsupported) have it.

XXX  This should not cause any change in functionality, so no revbump.

diffstat:

 mail/sendmail/distinfo         |   4 ++--
 mail/sendmail/hacks.mk         |  16 ----------------
 mail/sendmail/patches/patch-aa |  13 ++++++++-----
 3 files changed, 10 insertions(+), 23 deletions(-)

diffs (57 lines):

diff -r f6168a0d1d1d -r 7d82bc29c098 mail/sendmail/distinfo
--- a/mail/sendmail/distinfo    Wed Dec 16 13:30:53 2009 +0000
+++ b/mail/sendmail/distinfo    Wed Dec 16 13:41:41 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2009/12/16 09:46:36 jnemeth Exp $
+$NetBSD: distinfo,v 1.43 2009/12/16 13:41:41 jnemeth Exp $
 
 SHA1 (sendmail.8.14.3.tar.gz) = 814c54c3917aa6b0981b5ea99fb34e0c02f31489
 RMD160 (sendmail.8.14.3.tar.gz) = 5423360ce908c985827cf6524a6de87e3451c27a
 Size (sendmail.8.14.3.tar.gz) = 2069209 bytes
-SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
+SHA1 (patch-aa) = 0f2273f7c089e8137aae1d3503006ac2bc18166d
 SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
 SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
 SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
diff -r f6168a0d1d1d -r 7d82bc29c098 mail/sendmail/hacks.mk
--- a/mail/sendmail/hacks.mk    Wed Dec 16 13:30:53 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2008/11/14 14:09:20 tron Exp $
-
-.if !defined(SENDMAIL_HACKS_MK)
-SENDMAIL_HACKS_MK=     # defined
-
-### Work around build problems under NetBSD 5.0_BETA and newer because
-### of redefinition of the "boolean" type. See PR pkg/38983 for details.
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if ${OPSYS} == "NetBSD" && exists(/usr/bin/c99)
-PKG_HACKS+=    c99
-
-post-configure:
-       ${CHMOD} +w ${WRKSRC}/devtools/OS/NetBSD
-       ${ECHO} "define(\`confCC', \`c99')" >>${WRKSRC}/devtools/OS/NetBSD
-.  endif
-.endif
diff -r f6168a0d1d1d -r 7d82bc29c098 mail/sendmail/patches/patch-aa
--- a/mail/sendmail/patches/patch-aa    Wed Dec 16 13:30:53 2009 +0000
+++ b/mail/sendmail/patches/patch-aa    Wed Dec 16 13:41:41 2009 +0000
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.18 2004/08/30 20:16:28 adrianp Exp $
+$NetBSD: patch-aa,v 1.19 2009/12/16 13:41:41 jnemeth Exp $
 
---- devtools/OS/NetBSD.orig    Sun Jun 27 00:19:35 2004
-+++ devtools/OS/NetBSD Sun Jun 27 00:24:11 2004
-@@ -7,13 +7,14 @@
+--- devtools/OS/NetBSD.orig    2004-06-16 17:50:00.000000000 +0000
++++ devtools/OS/NetBSD
+@@ -5,15 +5,16 @@ dnl  Place personal settings in devtools/
+ 
+ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
  define(`confLIBS', `-lutil')
- define(`confENVDEF', ` -DNETISO')
+-define(`confENVDEF', ` -DNETISO')
++define(`confENVDEF', ` -DNETISO -DSM_CONF_STDBOOL_H=1')
  define(`confDEPEND_TYPE', `CC-M')
 -define(`confSBINGRP', `wheel')
 -define(`confUBINOWN', `root')