Tue May 27 01:57:14 2014 UTC ()
Fix build two build problems.

* Didn't pass the portability check, noted by joerg@.
* Some PLIST problem.

No bump revision since the package was broken.


(taca)
diff -r1.21 -r1.22 pkgsrc/mail/sylpheed/PLIST
diff -r1.79 -r1.80 pkgsrc/mail/sylpheed/distinfo
diff -r1.8 -r1.9 pkgsrc/mail/sylpheed/patches/patch-aa
diff -r0 -r1.1 pkgsrc/mail/sylpheed/patches/patch-macosx_bundle_launcher.sh
cvs diff -r1.21 -r1.22 pkgsrc/mail/sylpheed/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/sylpheed/PLIST 2011/06/21 03:21:46 1.21
+++ pkgsrc/mail/sylpheed/PLIST 2014/05/27 01:57:14 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2011/06/21 03:21:46 taca Exp $ 1@comment $NetBSD: PLIST,v 1.22 2014/05/27 01:57:14 taca Exp $
2bin/sylpheed 2bin/sylpheed
3include/sylpheed/plugin.h 3include/sylpheed/plugin.h
4include/sylpheed/sylph/account.h 4include/sylpheed/sylph/account.h
5include/sylpheed/sylph/base64.h 5include/sylpheed/sylph/base64.h
6include/sylpheed/sylph/codeconv.h 6include/sylpheed/sylph/codeconv.h
7include/sylpheed/sylph/customheader.h 7include/sylpheed/sylph/customheader.h
8include/sylpheed/sylph/defs.h 8include/sylpheed/sylph/defs.h
9include/sylpheed/sylph/displayheader.h 9include/sylpheed/sylph/displayheader.h
10include/sylpheed/sylph/enums.h 10include/sylpheed/sylph/enums.h
11include/sylpheed/sylph/filter.h 11include/sylpheed/sylph/filter.h
12include/sylpheed/sylph/folder.h 12include/sylpheed/sylph/folder.h
13include/sylpheed/sylph/html.h 13include/sylpheed/sylph/html.h
14include/sylpheed/sylph/imap.h 14include/sylpheed/sylph/imap.h
@@ -22,46 +22,48 @@ include/sylpheed/sylph/pop.h @@ -22,46 +22,48 @@ include/sylpheed/sylph/pop.h
22include/sylpheed/sylph/prefs.h 22include/sylpheed/sylph/prefs.h
23include/sylpheed/sylph/prefs_account.h 23include/sylpheed/sylph/prefs_account.h
24include/sylpheed/sylph/prefs_common.h 24include/sylpheed/sylph/prefs_common.h
25include/sylpheed/sylph/procheader.h 25include/sylpheed/sylph/procheader.h
26include/sylpheed/sylph/procmime.h 26include/sylpheed/sylph/procmime.h
27include/sylpheed/sylph/procmsg.h 27include/sylpheed/sylph/procmsg.h
28include/sylpheed/sylph/quoted-printable.h 28include/sylpheed/sylph/quoted-printable.h
29include/sylpheed/sylph/recv.h 29include/sylpheed/sylph/recv.h
30include/sylpheed/sylph/session.h 30include/sylpheed/sylph/session.h
31include/sylpheed/sylph/smtp.h 31include/sylpheed/sylph/smtp.h
32include/sylpheed/sylph/socket.h 32include/sylpheed/sylph/socket.h
33include/sylpheed/sylph/socks.h 33include/sylpheed/sylph/socks.h
34include/sylpheed/sylph/ssl.h 34include/sylpheed/sylph/ssl.h
 35include/sylpheed/sylph/ssl_hostname_validation.h
35include/sylpheed/sylph/stringtable.h 36include/sylpheed/sylph/stringtable.h
36include/sylpheed/sylph/syl-marshal.h 37include/sylpheed/sylph/syl-marshal.h
37include/sylpheed/sylph/sylmain.h 38include/sylpheed/sylph/sylmain.h
38include/sylpheed/sylph/unmime.h 39include/sylpheed/sylph/unmime.h
39include/sylpheed/sylph/utils.h 40include/sylpheed/sylph/utils.h
40include/sylpheed/sylph/uuencode.h 41include/sylpheed/sylph/uuencode.h
41include/sylpheed/sylph/virtual.h 42include/sylpheed/sylph/virtual.h
42include/sylpheed/sylph/xml.h 43include/sylpheed/sylph/xml.h
43lib/libsylph-0.la 44lib/libsylph-0.la
44lib/libsylpheed-plugin-0.la 45lib/libsylpheed-plugin-0.la
45share/applications/sylpheed.desktop 46share/applications/sylpheed.desktop
46share/examples/sylpheed/mime.types 47share/examples/sylpheed/mime.types
47share/locale/be/LC_MESSAGES/sylpheed.mo 48share/locale/be/LC_MESSAGES/sylpheed.mo
48share/locale/bg/LC_MESSAGES/sylpheed.mo 49share/locale/bg/LC_MESSAGES/sylpheed.mo
49share/locale/cs/LC_MESSAGES/sylpheed.mo 50share/locale/cs/LC_MESSAGES/sylpheed.mo
50share/locale/da/LC_MESSAGES/sylpheed.mo 51share/locale/da/LC_MESSAGES/sylpheed.mo
51share/locale/de/LC_MESSAGES/sylpheed.mo 52share/locale/de/LC_MESSAGES/sylpheed.mo
52share/locale/el/LC_MESSAGES/sylpheed.mo 53share/locale/el/LC_MESSAGES/sylpheed.mo
53share/locale/es/LC_MESSAGES/sylpheed.mo 54share/locale/es/LC_MESSAGES/sylpheed.mo
54share/locale/et/LC_MESSAGES/sylpheed.mo 55share/locale/et/LC_MESSAGES/sylpheed.mo
 56share/locale/eu/LC_MESSAGES/sylpheed.mo
55share/locale/fi/LC_MESSAGES/sylpheed.mo 57share/locale/fi/LC_MESSAGES/sylpheed.mo
56share/locale/fr/LC_MESSAGES/sylpheed.mo 58share/locale/fr/LC_MESSAGES/sylpheed.mo
57share/locale/gl/LC_MESSAGES/sylpheed.mo 59share/locale/gl/LC_MESSAGES/sylpheed.mo
58share/locale/hr/LC_MESSAGES/sylpheed.mo 60share/locale/hr/LC_MESSAGES/sylpheed.mo
59share/locale/hu/LC_MESSAGES/sylpheed.mo 61share/locale/hu/LC_MESSAGES/sylpheed.mo
60share/locale/it/LC_MESSAGES/sylpheed.mo 62share/locale/it/LC_MESSAGES/sylpheed.mo
61share/locale/ja/LC_MESSAGES/sylpheed.mo 63share/locale/ja/LC_MESSAGES/sylpheed.mo
62share/locale/ko/LC_MESSAGES/sylpheed.mo 64share/locale/ko/LC_MESSAGES/sylpheed.mo
63share/locale/lt/LC_MESSAGES/sylpheed.mo 65share/locale/lt/LC_MESSAGES/sylpheed.mo
64share/locale/nl/LC_MESSAGES/sylpheed.mo 66share/locale/nl/LC_MESSAGES/sylpheed.mo
65share/locale/pl/LC_MESSAGES/sylpheed.mo 67share/locale/pl/LC_MESSAGES/sylpheed.mo
66share/locale/pt_BR/LC_MESSAGES/sylpheed.mo 68share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
67share/locale/ro/LC_MESSAGES/sylpheed.mo 69share/locale/ro/LC_MESSAGES/sylpheed.mo
cvs diff -r1.79 -r1.80 pkgsrc/mail/sylpheed/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/sylpheed/distinfo 2014/05/11 09:57:22 1.79
+++ pkgsrc/mail/sylpheed/distinfo 2014/05/27 01:57:14 1.80
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.79 2014/05/11 09:57:22 taca Exp $ 1$NetBSD: distinfo,v 1.80 2014/05/27 01:57:14 taca Exp $
2 2
3SHA1 (sylpheed-3.4.1.tar.bz2) = 000f7c8b0aee188004b63b446792af04a2b71f12 3SHA1 (sylpheed-3.4.1.tar.bz2) = 000f7c8b0aee188004b63b446792af04a2b71f12
4RMD160 (sylpheed-3.4.1.tar.bz2) = 2ba464e3442ee1f754f151968e588d387b90b4fb 4RMD160 (sylpheed-3.4.1.tar.bz2) = 2ba464e3442ee1f754f151968e588d387b90b4fb
5Size (sylpheed-3.4.1.tar.bz2) = 3473101 bytes 5Size (sylpheed-3.4.1.tar.bz2) = 3473101 bytes
6SHA1 (patch-aa) = 70ba020c9d51711cc5efb3647ae82874e0c16da7 6SHA1 (patch-aa) = f7c6b53c173ca18f9e5e832aec38dd2455242f9c
 7SHA1 (patch-macosx_bundle_launcher.sh) = abfdb54b3400ee00e0c1e99fb5037a1a3c1e2a66
cvs diff -r1.8 -r1.9 pkgsrc/mail/sylpheed/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/sylpheed/patches/patch-aa 2012/06/29 14:56:16 1.8
+++ pkgsrc/mail/sylpheed/patches/patch-aa 2014/05/27 01:57:14 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.8 2012/06/29 14:56:16 taca Exp $ 1$NetBSD: patch-aa,v 1.9 2014/05/27 01:57:14 taca Exp $
2 2
3--- libsylph/prefs_common.c.orig 2012-06-20 02:49:04.000000000 +0000 3--- libsylph/prefs_common.c.orig 2014-03-19 06:56:27.000000000 +0000
4+++ libsylph/prefs_common.c 4+++ libsylph/prefs_common.c
5@@ -493,7 +493,7 @@ static PrefParam param[] = { 5@@ -504,7 +504,7 @@ static PrefParam param[] = {
6 P_STRING}, 6 P_STRING},
7  7
8 /* Update check */ 8 /* Update check */
9- {"auto_update_check", "TRUE", &prefs_common.auto_update_check, P_BOOL}, 9- {"auto_update_check", "TRUE", &prefs_common.auto_update_check, P_BOOL},
10+ {"auto_update_check", "FALSE", &prefs_common.auto_update_check, P_BOOL}, 10+ {"auto_update_check", "FALSE", &prefs_common.auto_update_check, P_BOOL},
11 {"use_http_proxy", "FALSE", &prefs_common.use_http_proxy, P_BOOL}, 11 {"use_http_proxy", "FALSE", &prefs_common.use_http_proxy, P_BOOL},
12 {"http_proxy_host", NULL, &prefs_common.http_proxy_host, P_STRING}, 12 {"http_proxy_host", NULL, &prefs_common.http_proxy_host, P_STRING},
13  13
File Added: pkgsrc/mail/sylpheed/patches/patch-macosx_bundle_launcher.sh
$NetBSD: patch-macosx_bundle_launcher.sh,v 1.1 2014/05/27 01:57:14 taca Exp $

This isn't plain shell script but bash script.

--- macosx/bundle/launcher.sh.orig	2013-12-11 05:49:28.000000000 +0000
+++ macosx/bundle/launcher.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if test "x$GTK_DEBUG_LAUNCHER" != x; then
     set -x