[pkgsrc/trunk]: pkgsrc/mail/distribute PR 28609 Georg Schwarz mail/distribute...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5826df8de91c
branches:  trunk
changeset: 379757:5826df8de91c
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon May 23 03:45:35 2022 +0000

description:
PR 28609 Georg Schwarz mail/distribute doesn't build on Irix

 - Set STRSEP_MISSING on Irix.
 - Remove patch-ab, which #if'd out a fallback definition for
   _PATH_SENDMAIL; that's completely pointless.

diffstat:

 mail/distribute/Makefile         |   9 ++++++++-
 mail/distribute/distinfo         |   5 ++---
 mail/distribute/patches/patch-aa |   4 ++--
 mail/distribute/patches/patch-ab |  15 ---------------
 4 files changed, 12 insertions(+), 21 deletions(-)

diffs (78 lines):

diff -r b74d190fa451 -r 5826df8de91c mail/distribute/Makefile
--- a/mail/distribute/Makefile  Mon May 23 03:18:45 2022 +0000
+++ b/mail/distribute/Makefile  Mon May 23 03:45:35 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2021/05/24 19:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2022/05/23 03:45:35 dholland Exp $
 
 DISTNAME=      distribute-2.1-pl19
 PKGNAME=       distribute-2.1.26
@@ -43,6 +43,13 @@
                INSTALL=${INSTALL:Q} \
                INSTALL_MAN=${INSTALL_MAN:Q}
 
+.include "../../mk/bsd.prefs.mk"
+
+# Reported against Irix 5; assume all versions until proven otherwise
+.if ${OPSYS} == "IRIX"
+MAKE_ENV+=     MOREOPTIONS=-DSTRSEP_MISSING
+.endif
+
 pre-build:
        ${TOUCH} ${WRKSRC}/logging.h ${WRKSRC}/strsep.c
 
diff -r b74d190fa451 -r 5826df8de91c mail/distribute/distinfo
--- a/mail/distribute/distinfo  Mon May 23 03:18:45 2022 +0000
+++ b/mail/distribute/distinfo  Mon May 23 03:45:35 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:53:57 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/05/23 03:45:35 dholland Exp $
 
 BLAKE2s (distribute/distribute-2.1-pl19.tar.gz) = 6d31f088c79d2a181790e852d2f98e723447e813a6a0b96dd62b8ccecbf31105
 SHA512 (distribute/distribute-2.1-pl19.tar.gz) = 1ece4fd98c86ce6a4087e25b35d46d8cb4d6d9882de13d210c2d4a6885385c38e2fbb31de529886ee3dd24ee3ef2f48858315324fd11e4add8e08b4653b30efa
@@ -24,7 +24,6 @@
 BLAKE2s (distribute/patch.26e.gz) = 666bf899f71fd957125bd1e751eafd21949fa56cf053256b64ebb8988e5f4304
 SHA512 (distribute/patch.26e.gz) = c0c1de2467d1b28320585cb4933029182932345e7e8b38fda79eed513ec30e7dea7cef1bd8c7f2ca551aae7c1e5930fc361451f73ce5bd7d1027460df4bef81e
 Size (distribute/patch.26e.gz) = 12560 bytes
-SHA1 (patch-aa) = d3f11bc9ae82a6bb7c644ebba8f929e4ae13e3f3
-SHA1 (patch-ab) = 4c07a6ae9bb1e9dacd33db96624d2c2fefbb9240
+SHA1 (patch-aa) = fd8a98d613fbec3f057a2b9187306cc89eadd2bf
 SHA1 (patch-ac) = 89873e55470070a2ceff7bc06fa63d2673aee766
 SHA1 (patch-tmpl2c.pl) = 5cdf21381f98df64b37609173e35448427edf231
diff -r b74d190fa451 -r 5826df8de91c mail/distribute/patches/patch-aa
--- a/mail/distribute/patches/patch-aa  Mon May 23 03:18:45 2022 +0000
+++ b/mail/distribute/patches/patch-aa  Mon May 23 03:45:35 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2017/08/19 00:20:13 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2022/05/23 03:45:35 dholland Exp $
 
 --- Makefile.orig      2017-08-13 00:33:32.000000000 +0000
 +++ Makefile
@@ -7,7 +7,7 @@
  #
  OPTIONS= -DSYSLOG -DISSUE -DSUBJALIAS -DADDVERSION \
 -      -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL -DUSEMIMEKIT
-+      -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL
++      -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL $(MOREOPTIONS)
 +#OPTIONS+= -DMIMEKIT
  
  #
diff -r b74d190fa451 -r 5826df8de91c mail/distribute/patches/patch-ab
--- a/mail/distribute/patches/patch-ab  Mon May 23 03:18:45 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/02/13 19:39:51 fredb Exp $
-
---- config.h.orig      Sun Sep 14 09:25:53 1997
-+++ config.h   Sun Sep 14 09:26:01 1997
-@@ -97,8 +97,10 @@
-  * this default should be set to 'goold-old-time' default value.
-  */
- 
-+#if 0
- #ifndef _PATH_SENDMAIL
- # define      _PATH_SENDMAIL  "/usr/lib/sendmail" /* default */
-+#endif
- #endif
- 
- #endif