summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjnemeth <jnemeth>2009-12-16 13:41:41 +0000
committerjnemeth <jnemeth>2009-12-16 13:41:41 +0000
commit90e0f3a79b3dfbbb9e6092c096f6f41878933282 (patch)
tree1ed1dc1883a213d94731c3ff3f2b1e174c7e3419 /mail
parent7878082d641ab38b32e81aca82c10f97a684e41a (diff)
downloadpkgsrc-90e0f3a79b3dfbbb9e6092c096f6f41878933282.tar.gz
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 (limited to 'mail')
-rw-r--r--mail/sendmail/distinfo4
-rw-r--r--mail/sendmail/hacks.mk16
-rw-r--r--mail/sendmail/patches/patch-aa13
3 files changed, 10 insertions, 23 deletions
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 730b3f4cbcc..7b6c91a1232 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -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 --git a/mail/sendmail/hacks.mk b/mail/sendmail/hacks.mk
deleted file mode 100644
index 401c68da8f9..00000000000
--- a/mail/sendmail/hacks.mk
+++ /dev/null
@@ -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 --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index 9dcaf05703e..4fe1645b60a 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -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')