Sat Dec 17 16:13:43 2011 UTC ()
mail/Pantomine: Fix timezone redefinition for DragonFly
Pantomine defines a structure named "timezone" which clashes with the
system definition. It was renamed to "timezonePantomine". While
technically it may result in change in the pkg binary, no PKGREVISION
bump is necessary because it's functionally the same as the previous
version, assuming it actually built on the platform in question.
(marino)
diff -r1.8 -r1.9 pkgsrc/mail/Pantomime/distinfo
diff -r0 -r1.1 pkgsrc/mail/Pantomime/patches/patch-Framework_Pantomine_CWParser.m
--- pkgsrc/mail/Pantomime/distinfo 2011/11/25 22:00:32 1.8
+++ pkgsrc/mail/Pantomime/distinfo 2011/12/17 16:13:43 1.9
| @@ -1,7 +1,8 @@ | | | @@ -1,7 +1,8 @@ |
1 | $NetBSD: distinfo,v 1.8 2011/11/25 22:00:32 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.9 2011/12/17 16:13:43 marino Exp $ |
2 | | | 2 | |
3 | SHA1 (Pantomime-1.2.0pre3.tar.gz) = beddf538d239513bdd46f67db04e9b4d4bd7441c | | 3 | SHA1 (Pantomime-1.2.0pre3.tar.gz) = beddf538d239513bdd46f67db04e9b4d4bd7441c |
4 | RMD160 (Pantomime-1.2.0pre3.tar.gz) = 25c397080f0826d7b266e018246658707e9bbd00 | | 4 | RMD160 (Pantomime-1.2.0pre3.tar.gz) = 25c397080f0826d7b266e018246658707e9bbd00 |
5 | Size (Pantomime-1.2.0pre3.tar.gz) = 441478 bytes | | 5 | Size (Pantomime-1.2.0pre3.tar.gz) = 441478 bytes |
6 | SHA1 (patch-Framework_Pantomime_NSString+Extensions.m) = 10eb49fb504535e2f0ad8345284c330332f356bc | | 6 | SHA1 (patch-Framework_Pantomime_NSString+Extensions.m) = 10eb49fb504535e2f0ad8345284c330332f356bc |
| | | 7 | SHA1 (patch-Framework_Pantomine_CWParser.m) = 7aedb8ee39f45a1a5cbf5121bc9a2b956a5ed2f6 |
7 | SHA1 (patch-ab) = 0691970542c20876c709a07c33842948bfd536f6 | | 8 | SHA1 (patch-ab) = 0691970542c20876c709a07c33842948bfd536f6 |
$NetBSD: patch-Framework_Pantomine_CWParser.m,v 1.1 2011/12/17 16:13:43 marino Exp $
--- Framework/Pantomime/CWParser.m.orig 2007-01-28 19:46:23.000000000 +0000
+++ Framework/Pantomime/CWParser.m
@@ -40,7 +40,7 @@
//
static char *month_name[12] = {"jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"};
-static struct timezone {
+static struct timezonePantomine {
char *name; /* time zone name */
int offset; /* offset, in minutes, EAST of GMT */
} timezone_info[] = {