CVS commit: pkgsrc/mail/bincimap

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jan 15 22:01:29 UTC 2021

Modified Files:
        pkgsrc/mail/bincimap: distinfo
        pkgsrc/mail/bincimap/patches: patch-src_convert.h
Added Files:
        pkgsrc/mail/bincimap/patches: patch-src_greeting.cc patch-src_tools.cc

Log Message:
Fix build on at least FreeBSD, CentOS, NetBSD, and Tribblix.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/bincimap/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/bincimap/patches/patch-src_convert.h
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/bincimap/patches/patch-src_greeting.cc \
    pkgsrc/mail/bincimap/patches/patch-src_tools.cc

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

Modified files:

Index: pkgsrc/mail/bincimap/distinfo
diff -u pkgsrc/mail/bincimap/distinfo:1.1 pkgsrc/mail/bincimap/distinfo:1.2
--- pkgsrc/mail/bincimap/distinfo:1.1   Fri Jan 15 19:50:25 2021
+++ pkgsrc/mail/bincimap/distinfo       Fri Jan 15 22:01:29 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2021/01/15 19:50:25 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2021/01/15 22:01:29 schmonz Exp $
 
 SHA1 (bincimap-1.2.13final.tar.gz) = 76e9e96125ef683c7ca3474363723162569e5ec3
 RMD160 (bincimap-1.2.13final.tar.gz) = 454bc8d34c52b5cc1af68e55bfdc82ac0f36ced3
@@ -9,4 +9,6 @@ SHA1 (patch-conf_Makefile.in) = 8a979b15
 SHA1 (patch-conf_bincimap.conf.in) = d1083ebf2b12704545de8797d07c02c309f1ddfa
 SHA1 (patch-doc_manual_Makefile.in) = 713308a43bfdfc408de368692ae50b159a7db298
 SHA1 (patch-man_bincimap-up.1) = e052a7575754a6df7904d61718ad433d2d00eb0f
-SHA1 (patch-src_convert.h) = 387c56e49ded666f32680ff6983e1f155024bfde
+SHA1 (patch-src_convert.h) = 5425eefd9511746639c5ec9d428bb3dd2356402f
+SHA1 (patch-src_greeting.cc) = 99466bd65eadf734dbe84800639cdc25a2f1eaa7
+SHA1 (patch-src_tools.cc) = ead7735ee234b2324c59d55bd4a7ca20a306971f

Index: pkgsrc/mail/bincimap/patches/patch-src_convert.h
diff -u pkgsrc/mail/bincimap/patches/patch-src_convert.h:1.1 pkgsrc/mail/bincimap/patches/patch-src_convert.h:1.2
--- pkgsrc/mail/bincimap/patches/patch-src_convert.h:1.1        Fri Jan 15 19:50:25 2021
+++ pkgsrc/mail/bincimap/patches/patch-src_convert.h    Fri Jan 15 22:01:29 2021
@@ -1,10 +1,24 @@
-$NetBSD: patch-src_convert.h,v 1.1 2021/01/15 19:50:25 schmonz Exp $
+$NetBSD: patch-src_convert.h,v 1.2 2021/01/15 22:01:29 schmonz Exp $
 
 Fix "assigning to 'char *' from incompatible type 'const char *'".
 
+Fix "error: 'strchr' was not declared in this scope" on at least NetBSD
+and Tribblix.
+
+Fix "error: '::atoi' has not been declared" on at least CentOS 7.
+
 --- src/convert.h.orig 2005-02-08 20:30:22.000000000 +0000
 +++ src/convert.h
-@@ -111,7 +111,7 @@ namespace Binc {
+@@ -43,6 +43,8 @@
+ #include <iostream>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <sys/stat.h>
+ 
+ #include "address.h"
+@@ -111,7 +113,7 @@ namespace Binc {
        unsigned char c = *i;
        unsigned char d = *(i + 1);
        

Added files:

Index: pkgsrc/mail/bincimap/patches/patch-src_greeting.cc
diff -u /dev/null pkgsrc/mail/bincimap/patches/patch-src_greeting.cc:1.1
--- /dev/null   Fri Jan 15 22:01:29 2021
+++ pkgsrc/mail/bincimap/patches/patch-src_greeting.cc  Fri Jan 15 22:01:29 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_greeting.cc,v 1.1 2021/01/15 22:01:29 schmonz Exp $
+
+Fix "error: invalid suffix on literal; C++11 requires a space between
+literal and identifier" on at least FreeBSD.
+
+--- src/greeting.cc.orig       2005-03-22 09:47:34.000000000 +0000
++++ src/greeting.cc
+@@ -69,7 +69,7 @@ void Binc::showGreeting(void)
+   string tmp = session.globalconfig["Security"]["version in greeting"];
+   lowercase(tmp);
+   if (tmp == "yes")
+-    version = "v"VERSION" ";
++    version = "v" VERSION" ";
+ 
+   com << "* OK Welcome to Binc IMAP " << version 
+       << "Copyright (C) 2002-2005 Andreas Aardal Hanssen at "
Index: pkgsrc/mail/bincimap/patches/patch-src_tools.cc
diff -u /dev/null pkgsrc/mail/bincimap/patches/patch-src_tools.cc:1.1
--- /dev/null   Fri Jan 15 22:01:29 2021
+++ pkgsrc/mail/bincimap/patches/patch-src_tools.cc     Fri Jan 15 22:01:29 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_tools.cc,v 1.1 2021/01/15 22:01:29 schmonz Exp $
+
+Fix "error: 'strdup' was not declared in this scope" on at least NetBSD
+and Tribblix.
+
+Fix "error: '::getenv' has not been declared" on at least CentOS 7.
+
+--- src/tools.cc.orig  2005-01-08 10:20:48.000000000 +0000
++++ src/tools.cc
+@@ -35,6 +35,8 @@
+ #include <config.h>
+ #endif
+ #include <errno.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "tools.h"
+