summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorrichard <richard>2013-07-24 20:11:40 +0000
committerrichard <richard>2013-07-24 20:11:40 +0000
commit313baad812b8ce42f9da47969d53b15631c4627b (patch)
tree24c226aed76c967087d65346edc9b13759d1df2c /mail
parent6efc69ff8665faa0e337a6be28eac29220cdf13c (diff)
downloadpkgsrc-313baad812b8ce42f9da47969d53b15631c4627b.tar.gz
fix to claws-mail to build on systems without flock (namely SunOS)
Diffstat (limited to 'mail')
-rw-r--r--mail/claws-mail/distinfo3
-rw-r--r--mail/claws-mail/patches/patch-src_main.c18
2 files changed, 20 insertions, 1 deletions
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index b2f1382645e..dd5f09c4700 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2013/07/24 15:26:11 drochner Exp $
+$NetBSD: distinfo,v 1.24 2013/07/24 20:11:40 richard Exp $
SHA1 (claws-mail-3.9.2.tar.bz2) = 73c91b3c742d1ababc734bfac39961831e55eb38
RMD160 (claws-mail-3.9.2.tar.bz2) = 7a8d201913a078708761ae492e7e362848a36df1
@@ -10,3 +10,4 @@ SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
SHA1 (patch-ai) = 22b9ad0763ee3053f8b3082a639991b6574e6f65
SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
+SHA1 (patch-src_main.c) = 6cb30f2813d3ccb8319654c7ef462efec2ece9de
diff --git a/mail/claws-mail/patches/patch-src_main.c b/mail/claws-mail/patches/patch-src_main.c
new file mode 100644
index 00000000000..c914c49ebec
--- /dev/null
+++ b/mail/claws-mail/patches/patch-src_main.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_main.c,v 1.1 2013/07/24 20:11:40 richard Exp $
+
+unhide variable declaration behind flock conditional.
+
+--- src/main.c.orig 2013-03-20 11:13:35.000000000 +0000
++++ src/main.c
+@@ -2367,10 +2367,10 @@ static gint prohibit_duplicate_launch(vo
+ x_display = g_strdup(g_getenv("DISPLAY"));
+
+ if (uxsock < 0) {
++ gint ret;
+ #if HAVE_FLOCK
+ gchar *socket_lock;
+ gint lock_fd;
+- gint ret;
+ /* If connect failed, no other process is running.
+ * Unlink the potentially existing socket, then
+ * open it. This has to be done locking a temporary