CVS commit: pkgsrc/mail/distribute

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon May 23 03:45:35 UTC 2022

Modified Files:
        pkgsrc/mail/distribute: Makefile distinfo
        pkgsrc/mail/distribute/patches: patch-aa
Removed Files:
        pkgsrc/mail/distribute/patches: patch-ab

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/distribute/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/distribute/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/distribute/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/mail/distribute/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/distribute/Makefile
diff -u pkgsrc/mail/distribute/Makefile:1.38 pkgsrc/mail/distribute/Makefile:1.39
--- pkgsrc/mail/distribute/Makefile:1.38        Mon May 24 19:52:39 2021
+++ pkgsrc/mail/distribute/Makefile     Mon May 23 03:45:35 2022
@@ -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 @@ MAKE_ENV+=   DEFAULTCONFIG='-DDEF_SEQ_PATH
                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
 

Index: pkgsrc/mail/distribute/distinfo
diff -u pkgsrc/mail/distribute/distinfo:1.13 pkgsrc/mail/distribute/distinfo:1.14
--- pkgsrc/mail/distribute/distinfo:1.13        Tue Oct 26 10:53:57 2021
+++ pkgsrc/mail/distribute/distinfo     Mon May 23 03:45:35 2022
@@ -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 @@ Size (distribute/patch.25e.gz) = 7374 by
 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

Index: pkgsrc/mail/distribute/patches/patch-aa
diff -u pkgsrc/mail/distribute/patches/patch-aa:1.4 pkgsrc/mail/distribute/patches/patch-aa:1.5
--- pkgsrc/mail/distribute/patches/patch-aa:1.4 Sat Aug 19 00:20:13 2017
+++ pkgsrc/mail/distribute/patches/patch-aa     Mon May 23 03:45:35 2022
@@ -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 @@ $NetBSD: patch-aa,v 1.4 2017/08/19 00:20
  #
  OPTIONS= -DSYSLOG -DISSUE -DSUBJALIAS -DADDVERSION \
 -      -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL -DUSEMIMEKIT
-+      -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL
++      -DSYSLOG_FACILITY=LOG_LOCAL4 -DCCMAIL $(MOREOPTIONS)
 +#OPTIONS+= -DMIMEKIT
  
  #