CVS commit: pkgsrc/mail/balsa

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 13:04:03 UTC 2017

Modified Files:
        pkgsrc/mail/balsa: Makefile distinfo
        pkgsrc/mail/balsa/patches: patch-ag
Added Files:
        pkgsrc/mail/balsa/patches: patch-libbalsa_misc.c

Log Message:
Various patches to fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/mail/balsa/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/balsa/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/balsa/patches/patch-ag
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/balsa/patches/patch-libbalsa_misc.c

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

Modified files:

Index: pkgsrc/mail/balsa/Makefile
diff -u pkgsrc/mail/balsa/Makefile:1.128 pkgsrc/mail/balsa/Makefile:1.129
--- pkgsrc/mail/balsa/Makefile:1.128    Sat Apr 22 21:03:41 2017
+++ pkgsrc/mail/balsa/Makefile  Mon May 15 13:04:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2017/04/22 21:03:41 adam Exp $
+# $NetBSD: Makefile,v 1.129 2017/05/15 13:04:03 jperkin Exp $
 
 DISTNAME=      balsa-2.4.14
 PKGREVISION=   24
@@ -29,6 +29,8 @@ CONFIGURE_ENV+=               ac_cv_lib_iconv_iconv_o
 EGDIR=         ${PREFIX}/share/examples/balsa
 CONF_FILES=    ${EGDIR}/balsa.soundlist ${PKG_SYSCONFDIR}/sound/events/balsa.soundlist
 
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/mail/balsa/distinfo
diff -u pkgsrc/mail/balsa/distinfo:1.19 pkgsrc/mail/balsa/distinfo:1.20
--- pkgsrc/mail/balsa/distinfo:1.19     Tue Nov  3 23:27:01 2015
+++ pkgsrc/mail/balsa/distinfo  Mon May 15 13:04:03 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/11/03 23:27:01 agc Exp $
+$NetBSD: distinfo,v 1.20 2017/05/15 13:04:03 jperkin Exp $
 
 SHA1 (balsa-2.4.14.tar.bz2) = 7541b10cd268d06d7e4c483c3e4659db901d4581
 RMD160 (balsa-2.4.14.tar.bz2) = 809c0a455097d08a0c2214f000adb2e6497b5380
@@ -7,6 +7,7 @@ Size (balsa-2.4.14.tar.bz2) = 4092848 by
 SHA1 (patch-aa) = 2c5e6d7621ad4ce66f6bcd355c1fcf7af1a42539
 SHA1 (patch-ab) = abfb66c9cb552e291f48dc9fe38608df2de5c7d3
 SHA1 (patch-ac) = 061f956f7980ed0694e007be39e209f07f3ed2b7
-SHA1 (patch-ag) = f9cc4534c5dd496b5dd7565794e4273fdeed2b5d
+SHA1 (patch-ag) = ca5a38d07e8b9c4c229776072ae5b442c6b921b6
 SHA1 (patch-ak) = abe90f5117fdcd3381c2a7061cf3ab29e9a3f025
 SHA1 (patch-ba) = 2410b1e5e19c131a9417fbdcc82b62e67e8db5a8
+SHA1 (patch-libbalsa_misc.c) = ac237e4600607c8f0cc5491bef9192004da41885

Index: pkgsrc/mail/balsa/patches/patch-ag
diff -u pkgsrc/mail/balsa/patches/patch-ag:1.6 pkgsrc/mail/balsa/patches/patch-ag:1.7
--- pkgsrc/mail/balsa/patches/patch-ag:1.6      Tue Dec 25 21:07:13 2012
+++ pkgsrc/mail/balsa/patches/patch-ag  Mon May 15 13:04:03 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2012/12/25 21:07:13 joerg Exp $
+$NetBSD: patch-ag,v 1.7 2017/05/15 13:04:03 jperkin Exp $
 
---- libbalsa/imap/imap-handle.c.orig   2010-08-13 19:15:36.000000000 +0000
+--- libbalsa/imap/imap-handle.c.orig   2012-10-29 22:33:31.000000000 +0000
 +++ libbalsa/imap/imap-handle.c
-@@ -16,11 +16,13 @@
+@@ -16,11 +16,15 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
   * 02111-1307, USA.
   */
@@ -10,7 +10,9 @@ $NetBSD: patch-ag,v 1.6 2012/12/25 21:07
  
  #define _POSIX_C_SOURCE 199506L
 -#define _XOPEN_SOURCE 500
++#ifndef __sun
 +#define _XOPEN_SOURCE 520
++#endif
  #define _BSD_SOURCE     1
 +#define _NETBSD_SOURCE
 +

Added files:

Index: pkgsrc/mail/balsa/patches/patch-libbalsa_misc.c
diff -u /dev/null pkgsrc/mail/balsa/patches/patch-libbalsa_misc.c:1.1
--- /dev/null   Mon May 15 13:04:03 2017
+++ pkgsrc/mail/balsa/patches/patch-libbalsa_misc.c     Mon May 15 13:04:03 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-libbalsa_misc.c,v 1.1 2017/05/15 13:04:03 jperkin Exp $
+
+Need fcntl for flock.
+
+--- libbalsa/misc.c.orig       2012-10-29 22:33:31.000000000 +0000
++++ libbalsa/misc.c
+@@ -31,6 +31,7 @@
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <errno.h>
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>