Update to 0.5.8.

8 files changed, 7 insertions, 458 deletions

diff --git a/mail/pygmy/Makefile b/mail/pygmy/Makefile
index 9062bdd9aa3b..1856688a24b6 100644
--- a/mail/pygmy/Makefile
+++ b/mail/pygmy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pygmy
-PORTVERSION=	0.5.7
-PORTREVISION=	1
+PORTVERSION=	0.5.8
 CATEGORIES=	mail python gnome
 MASTER_SITES=	http://pygmy.sourceforge.net/
 
diff --git a/mail/pygmy/distinfo b/mail/pygmy/distinfo
index 22769f298db8..415846b83403 100644
--- a/mail/pygmy/distinfo
+++ b/mail/pygmy/distinfo
@@ -1 +1 @@
-MD5 (pygmy-0.5.7.tar.gz) = 29147d4734728a750c1d339ad145d419
+MD5 (pygmy-0.5.8.tar.gz) = 483d7b045cf14d31724cb50b7cb259d2
diff --git a/mail/pygmy/files/patch-aa b/mail/pygmy/files/patch-aa
index a1e4da5a3944..e10d7b9d81f6 100644
--- a/mail/pygmy/files/patch-aa
+++ b/mail/pygmy/files/patch-aa
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- Makefile.orig	Fri May 11 16:44:12 2001
-+++ Makefile	Fri May 11 20:04:55 2001
+--- Makefile.orig	Fri May 18 18:26:45 2001
++++ Makefile	Sun May 20 09:28:32 2001
 @@ -1,10 +1,10 @@
- # $Id: Makefile,v 1.18 2001/05/07 10:06:00 kjetilja Exp $
+ # $Id: Makefile,v 1.19 2001/05/12 11:50:11 kjetilja Exp $
  
  # Installation prefix -- modify to your preferences
 -PREFIX=/usr/local
@@ -16,11 +16,3 @@ $FreeBSD$
  PYTHONLIBPATH=`$(PYTHON) -c "import sys; print sys.modules['site'].__file__[:-8]"`
  COMPILEPROG=compileall.py
  COMPILEPROGOPT=-l .
-@@ -31,6 +31,7 @@
- 
- mkprefix:
- 	@$(ECHO) "PYGMY_PREFIX='$(PREFIX)'" > prefix.py
-+	@$(ECHO) "PYGMY_ICONDIR='$(PREFIX)/share/pixmaps/pygmy'" >> prefix.py
- 	@$(ECHO) "** Code files are installed in '$(PREFIX)/share/pygmy'"
- 	@$(ECHO) "** Pixmaps are installed in '$(PREFIX)/share/pixmaps/pygmy'"
- 	@$(ECHO) "** The 'pygmy' executable is '$(PREFIX)/bin/pygmy'"
diff --git a/mail/pygmy/files/patch-ab b/mail/pygmy/files/patch-ab
index a408254ab875..53ec5978f077 100644
--- a/mail/pygmy/files/patch-ab
+++ b/mail/pygmy/files/patch-ab
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- msg.py.orig	Fri May 11 16:44:12 2001
-+++ msg.py	Fri May 11 19:33:17 2001
+--- msg.py.orig	Fri May 18 18:26:45 2001
++++ msg.py	Sun May 20 09:28:55 2001
 @@ -20,7 +20,7 @@
  
  ## Fonts
@@ -12,36 +12,3 @@ $FreeBSD$
  
  ## Error messages from the GUI
  err1 = """Error opening destination file"""
-@@ -107,6 +107,8 @@
-     ##
-     ##
-     def create_menu(self):
-+        from prefix import PYGMY_ICONDIR
-+
-         file_menu = [
-             UIINFO_ITEM_STOCK('Save As...', None, self.saveas, STOCK_MENU_SAVE_AS),
-             UIINFO_SEPARATOR,
-@@ -123,7 +125,7 @@
-             UIINFO_ITEM_STOCK('Reply', None, self.reply_callback,
-                               STOCK_MENU_MAIL_RPL),
-             UIINFO_ITEM_STOCK('Reply All', None, self.replyall_callback,
--                              STOCK_MENU_MAIL_RPL),
-+                              PYGMY_ICONDIR+"/reply_to_all_menu.xpm"),
-             UIINFO_ITEM_STOCK('Forward', None, self.fwd_callback,
-                               STOCK_MENU_MAIL_FWD),
-             UIINFO_ITEM_STOCK('View All Headers', None, self.all_headers,
-@@ -149,11 +151,13 @@
-     ##
-     ##
-     def create_toolbar(self):
-+        from prefix import PYGMY_ICONDIR
-+
-         toolbar_info = [
-             UIINFO_ITEM_STOCK('Reply', None, self.reply_callback,
-                               STOCK_PIXMAP_MAIL_RPL),
-             UIINFO_ITEM_STOCK('Reply All', None, self.replyall_callback,
--                              STOCK_PIXMAP_MAIL_RPL),
-+                              PYGMY_ICONDIR+"/reply_to_all.xpm"),
-             UIINFO_ITEM_STOCK('Forward', None, self.fwd_callback,
-                               STOCK_PIXMAP_MAIL_FWD),
-             UIINFO_SEPARATOR,
diff --git a/mail/pygmy/files/patch-edit.py b/mail/pygmy/files/patch-edit.py
deleted file mode 100644
index e01607967b2c..000000000000
--- a/mail/pygmy/files/patch-edit.py
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- edit.py.orig	Fri May 11 16:44:12 2001
-+++ edit.py	Fri May 11 21:01:18 2001
-@@ -350,9 +350,9 @@
-             for a in self.prefs.accounts.keys():
-                 username, emailaddr, sigfile, replyaddr = self.prefs.accounts[a]
-                 if emailaddr != '':
--                    ownaddrs.append(emailaddr)
-+                    ownaddrs.append(emailaddr.lower())
-                 if replyaddr != '':
--                    ownaddrs.append(replyaddr)
-+                    ownaddrs.append(replyaddr.lower())
- 
-             # Get all the target addresses
-             to = rfc822.AddressList(rt) + \
-@@ -361,12 +361,12 @@
-             tostr = []
- 
-             for i in to.addresslist:
--                if i[1] not in ownaddrs and i[1] != None:
-+                if i[1].lower() not in ownaddrs and i[1] != None:
-                     tostr.append(i[1])
-             ccstr = []
- 
-             for i in cc.addresslist:
--                if i[1] not in ownaddrs and i[1] != None:
-+                if i[1].lower() not in ownaddrs and i[1] != None:
-                     ccstr.append(i[1])
-                     
-             self.e1.set_text(mimify.mime_decode_header(string.join(tostr, ', ')))
-@@ -444,9 +444,8 @@
-     ##
-     ##
-     def create_menu(self):
--        from prefix import PYGMY_PREFIX
-+        from prefix import PYGMY_ICONDIR
-         import os.path
--        icondir = os.path.join(PYGMY_PREFIX, "share/pixmaps/pygmy")
- 
-         file_menu = [
-             UIINFO_ITEM_STOCK('Insert File', None, self.insert_file, STOCK_MENU_OPEN),
-@@ -470,7 +469,7 @@
-                               STOCK_MENU_TIMER),
-             UIINFO_SEPARATOR,
-             UIINFO_ITEM_STOCK('Security', None, self.privacy_dialog,
--                              icondir+"/encrypt.xpm"), 
-+                              PYGMY_ICONDIR+"/encrypt.xpm"), 
-             UIINFO_SEPARATOR,
-             UIINFO_ITEM_STOCK('Add Signature', None, self.add_sig,
-                               STOCK_MENU_BLANK), 
diff --git a/mail/pygmy/files/patch-folder.py b/mail/pygmy/files/patch-folder.py
deleted file mode 100644
index 8ac127be4b29..000000000000
--- a/mail/pygmy/files/patch-folder.py
+++ /dev/null
@@ -1,73 +0,0 @@
-
-$FreeBSD$
-
---- folder.py.orig	Fri May 11 16:44:12 2001
-+++ folder.py	Fri May 11 19:33:58 2001
-@@ -371,23 +371,22 @@
-     ##
-     ##
-     def init_pixmaps(self):
--        from prefix import PYGMY_PREFIX
--        icondir = os.path.join(PYGMY_PREFIX, "share/pixmaps/pygmy")
-+        from prefix import PYGMY_ICONDIR
-         # Create a pixmaps
-         self.open_dir, self.open_dir_mask = create_pixmap_from_xpm(self.win, None,
--                                                                   icondir+"/dir-open.xpm")
-+                                                                   PYGMY_ICONDIR+"/dir-open.xpm")
-         self.close_dir, self.close_dir_mask = create_pixmap_from_xpm(self.win, None,
--                                                                     icondir+"/dir-close.xpm")
-+                                                                     PYGMY_ICONDIR+"/dir-close.xpm")
-         self.trash, self.trash_mask = create_pixmap_from_xpm(self.win, None,
--                                                             icondir+"/trash.xpm")
-+                                                             PYGMY_ICONDIR+"/trash.xpm")
-         self.inbox, self.inbox_mask = create_pixmap_from_xpm(self.win, None,
--                                                             icondir+"/inbox.xpm")
-+                                                             PYGMY_ICONDIR+"/inbox.xpm")
-         self.outbox, self.outbox_mask = create_pixmap_from_xpm(self.win, None,
--                                                               icondir+"/outbox.xpm")
-+                                                               PYGMY_ICONDIR+"/outbox.xpm")
-         self.empty, self.empty_mask = create_pixmap_from_xpm(self.win, None,
--                                                             icondir+"/tray_empty.xpm")
-+                                                             PYGMY_ICONDIR+"/tray_empty.xpm")
-         self.full, self.full_mask = create_pixmap_from_xpm(self.win, None,
--                                                           icondir+"/tray_full.xpm")
-+                                                           PYGMY_ICONDIR+"/tray_full.xpm")
- 
-     ##
-     ## Method create_menu (self)
-@@ -396,8 +395,7 @@
-     ##
-     ##
-     def create_menu(self):
--        from prefix import PYGMY_PREFIX
--        icondir = os.path.join(PYGMY_PREFIX, "share/pixmaps/pygmy")
-+        from prefix import PYGMY_ICONDIR
-         
-         file_menu = [
-             UIINFO_ITEM_STOCK('Save As...', None, self.saveas, STOCK_MENU_SAVE_AS),
-@@ -442,7 +440,7 @@
-             UIINFO_ITEM_STOCK('Reply', None, self.reply_callback,
-                               STOCK_MENU_MAIL_RPL),
-             UIINFO_ITEM_STOCK('Reply All', None, self.replyall_callback,
--                              STOCK_MENU_MAIL_RPL),
-+                              PYGMY_ICONDIR+"/reply_to_all_menu.xpm"),
-             UIINFO_ITEM_STOCK('Forward', None, self.forward_callback,
-                               STOCK_MENU_MAIL_FWD),
-             UIINFO_ITEM_STOCK('Delete', None, self.trash_msg,
-@@ -451,14 +449,14 @@
-                               STOCK_MENU_OPEN),
-             UIINFO_SEPARATOR,
-             UIINFO_ITEM_STOCK('Move', None, self.move_msg,
--                              icondir+"/move_message.xpm"),
-+                              PYGMY_ICONDIR+"/move_message.xpm"),
-             UIINFO_SEPARATOR,
-             UIINFO_ITEM_STOCK('Next', None, self.next_msg_callback,
-                               STOCK_MENU_FORWARD), 
-             UIINFO_ITEM_STOCK('Prev', None, self.prev_msg_callback,
-                               STOCK_MENU_BACK), 
-             UIINFO_SEPARATOR,
--            UIINFO_SUBTREE_STOCK('Mark', mark_menu, icondir+"/mark.xpm")
-+            UIINFO_SUBTREE_STOCK('Mark', mark_menu, PYGMY_ICONDIR+"/mark.xpm")
-            ]
-         tools_menu = [
-             UIINFO_ITEM_STOCK('Address List', None, self.addresslist, STOCK_MENU_BLANK),
diff --git a/mail/pygmy/files/patch-icons::reply_to_all.xpm b/mail/pygmy/files/patch-icons::reply_to_all.xpm
deleted file mode 100644
index b0487a77b5b1..000000000000
--- a/mail/pygmy/files/patch-icons::reply_to_all.xpm
+++ /dev/null
@@ -1,157 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri May 11 18:41:02 2001
-+++ icons/reply_to_all.xpm	Fri May 11 18:40:47 2001
-@@ -0,0 +1,151 @@
-+/* XPM */
-+static char * reply_to_all_xpm[] = {
-+"24 24 124 2",
-+"  	c None",
-+". 	c #000000",
-+"+ 	c #7B7B78",
-+"@ 	c #C7C7C3",
-+"# 	c #F1F0EB",
-+"$ 	c #BFBFBC",
-+"% 	c #5F5E5E",
-+"& 	c #E3E3DF",
-+"* 	c #F3F3EF",
-+"= 	c #F2F2EE",
-+"- 	c #F1F1EC",
-+"; 	c #F0EFEB",
-+"> 	c #D2D2CD",
-+", 	c #969592",
-+"' 	c #616060",
-+") 	c #B5B5B4",
-+"! 	c #F8F8F6",
-+"~ 	c #F7F7F5",
-+"{ 	c #F6F6F3",
-+"] 	c #F5F5F2",
-+"^ 	c #F4F4F0",
-+"/ 	c #F2F1ED",
-+"( 	c #F1F0EC",
-+"_ 	c #F0EFEA",
-+": 	c #EFEEE9",
-+"< 	c #4F4F4D",
-+"[ 	c #BDBCB8",
-+"} 	c #A7A6A3",
-+"| 	c #C6C6C4",
-+"1 	c #7C7C7B",
-+"2 	c #525251",
-+"3 	c #DBDBD9",
-+"4 	c #F5F4F1",
-+"5 	c #F4F3F0",
-+"6 	c #F3F2EE",
-+"7 	c #999894",
-+"8 	c #62625F",
-+"9 	c #BCBCB6",
-+"0 	c #EBE9E3",
-+"a 	c #838381",
-+"b 	c #D7D6D4",
-+"c 	c #A8A8A6",
-+"d 	c #515150",
-+"e 	c #7E7D7C",
-+"f 	c #DAD9D5",
-+"g 	c #EFEEE8",
-+"h 	c #EEEDE7",
-+"i 	c #4F4E4C",
-+"j 	c #BCBBB6",
-+"k 	c #EBE9E2",
-+"l 	c #EAE8E1",
-+"m 	c #F6F5F2",
-+"n 	c #F4F3EF",
-+"o 	c #B5B4B1",
-+"p 	c #9B9A97",
-+"q 	c #646361",
-+"r 	c #92918E",
-+"s 	c #EEEDE8",
-+"t 	c #EDECE6",
-+"u 	c #4E4E4C",
-+"v 	c #797976",
-+"w 	c #797874",
-+"x 	c #E9E8E1",
-+"y 	c #E8E7DF",
-+"z 	c #B4B3AF",
-+"A 	c #D0D0CD",
-+"B 	c #F2F2ED",
-+"C 	c #BFBEBA",
-+"D 	c #BEBDB9",
-+"E 	c #7A7A77",
-+"F 	c #979691",
-+"G 	c #EAE9E2",
-+"H 	c #959590",
-+"I 	c #787773",
-+"J 	c #B8B7B0",
-+"K 	c #E6E4DC",
-+"L 	c #A9A9A6",
-+"M 	c #626260",
-+"N 	c #ECEBE4",
-+"O 	c #EBEAE3",
-+"P 	c #E9E7E0",
-+"Q 	c #E8E6DF",
-+"R 	c #E7E5DD",
-+"S 	c #777671",
-+"T 	c #93918C",
-+"U 	c #BEBDB8",
-+"V 	c #989793",
-+"W 	c #ECEAE4",
-+"X 	c #E8E6DE",
-+"Y 	c #E6E4DB",
-+"Z 	c #E4E3DA",
-+"` 	c #75746F",
-+" .	c #91908A",
-+"..	c #EEECE7",
-+"+.	c #62615F",
-+"@.	c #EBEAE4",
-+"#.	c #E7E6DE",
-+"$.	c #E6E5DC",
-+"%.	c #E5E4DB",
-+"&.	c #E4E2DA",
-+"*.	c #CCCBC4",
-+"=.	c #A3A29D",
-+"-.	c #B6B5B2",
-+";.	c #BCBCB7",
-+">.	c #CDCCC6",
-+",.	c #959490",
-+"'.	c #ECEBE5",
-+").	c #61615E",
-+"!.	c #E9E8E0",
-+"~.	c #CECDC7",
-+"{.	c #797875",
-+"].	c #969590",
-+"^.	c #CFCEC8",
-+"/.	c #E0D8B0",
-+"(.	c #B39C82",
-+"_.	c #BCA488",
-+":.	c #C5AC8F",
-+"<.	c #AA947B",
-+"[.	c #A18D75",
-+"}.	c #98856E",
-+"|.	c #8F7D68",
-+"1.	c #867561",
-+"2.	c #7D6D5B",
-+"3.	c #746554",
-+"                                                ",
-+"                                                ",
-+"                          . . . .               ",
-+"                . . . . . + @ # $ .             ",
-+"      . . . . . % $ & * = - ; > , .             ",
-+"    . ' ) ! ~ { ] ^ * / ( _ : < [ } .           ",
-+"    . | 1 2 3 4 5 6 / # _ : 7 8 9 0 .           ",
-+"    . a b c d e f / # _ g h i j k l .           ",
-+"      . m 4 n o p q r s t u v w x y z .         ",
-+"      . A * B ( ; C D E u F G H I J K .         ",
-+"      . L / ( _ : M t N O l P Q R S T .         ",
-+"        . # _ g U V W 0 l P X R Y Z `  ..       ",
-+"        . ; g ..+.@.G x y #.$.%.&.*.=.. .       ",
-+"        . -.t ;.F G x y #.K >.,.. . .           ",
-+"          . '.).G !.. ~.H . . .       .         ",
-+"          . {.].^.. /.. .           . /..       ",
-+"          . . . . /././..   . .   . /././..     ",
-+"        . (..     . /././.. (..     . /././..   ",
-+"      . _.(.. . . . . . . _.(.. . . . . . . .   ",
-+"    . :._.(.<.[.}.|.1.. :._.(.<.[.}.|.1.2.3..   ",
-+"    . :._.(.<.[.}.|.1.. :._.(.<.[.}.|.1.2..     ",
-+"      . _.(.. . . . .   . _.(.. . . . . .       ",
-+"        . (..             . (..                 ",
-+"          . .               . .                 "};
diff --git a/mail/pygmy/files/patch-icons::reply_to_all_menu.xpm b/mail/pygmy/files/patch-icons::reply_to_all_menu.xpm
deleted file mode 100644
index 2b59277ab502..000000000000
--- a/mail/pygmy/files/patch-icons::reply_to_all_menu.xpm
+++ /dev/null
@@ -1,127 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Fri May 11 18:41:02 2001
-+++ icons/reply_to_all_menu.xpm	Fri May 11 18:40:47 2001
-@@ -0,0 +1,121 @@
-+/* XPM */
-+static char * reply_to_all_menu_xpm[] = {
-+"16 15 103 2",
-+"  	c None",
-+". 	c #101010",
-+"+ 	c #191818",
-+"@ 	c #000000",
-+"# 	c #1A1A1A",
-+"$ 	c #515150",
-+"% 	c #4A4A4A",
-+"& 	c #6D6D6A",
-+"* 	c #C6C5C1",
-+"= 	c #BBBAB6",
-+"- 	c #262625",
-+"; 	c #737372",
-+"> 	c #A1A19F",
-+", 	c #C8C8C6",
-+"' 	c #D6D6D3",
-+") 	c #E0E0DD",
-+"! 	c #D5D4D0",
-+"~ 	c #E5E4E0",
-+"{ 	c #E1E0DB",
-+"] 	c #7A7A77",
-+"^ 	c #8E8D8B",
-+"/ 	c #9A9A98",
-+"( 	c #959593",
-+"_ 	c #91918F",
-+": 	c #D0CFCC",
-+"< 	c #EFEEE9",
-+"[ 	c #EFEEE8",
-+"} 	c #969591",
-+"| 	c #AFAEA9",
-+"1 	c #D9D7D1",
-+"2 	c #434342",
-+"3 	c #EAE9E6",
-+"4 	c #E5E5E1",
-+"5 	c #C0BFBC",
-+"6 	c #8F8E8B",
-+"7 	c #B7B7B3",
-+"8 	c #999894",
-+"9 	c #908F8B",
-+"0 	c #979691",
-+"a 	c #CBCAC3",
-+"b 	c #767571",
-+"c 	c #272726",
-+"d 	c #B9B9B6",
-+"e 	c #ECEBE7",
-+"f 	c #EBEAE5",
-+"g 	c #A09F9C",
-+"h 	c #D5D4CE",
-+"i 	c #C9C8C2",
-+"j 	c #E2E0D9",
-+"k 	c #D0CEC8",
-+"l 	c #A5A49E",
-+"m 	c #686764",
-+"n 	c #848380",
-+"o 	c #E6E4DF",
-+"p 	c #AEADA9",
-+"q 	c #CFCEC8",
-+"r 	c #EAE8E2",
-+"s 	c #E8E7DF",
-+"t 	c #E7E5DD",
-+"u 	c #E5E3DB",
-+"v 	c #DCDAD2",
-+"w 	c #73726E",
-+"x 	c #151514",
-+"y 	c #4B4B49",
-+"z 	c #C7C6C1",
-+"A 	c #A6A5A0",
-+"B 	c #D6D5CE",
-+"C 	c #D0CFC9",
-+"D 	c #C5C5BE",
-+"E 	c #A2A19B",
-+"F 	c #5A5A57",
-+"G 	c #1A1A19",
-+"H 	c #0D0D0D",
-+"I 	c #8E8D89",
-+"J 	c #BBBAB4",
-+"K 	c #68675C",
-+"L 	c #626056",
-+"M 	c #252524",
-+"N 	c #2E2C24",
-+"O 	c #29231D",
-+"P 	c #A7A183",
-+"Q 	c #DFD7AF",
-+"R 	c #37352B",
-+"S 	c #2C2620",
-+"T 	c #3F372D",
-+"U 	c #A69178",
-+"V 	c #14120F",
-+"W 	c #13100E",
-+"X 	c #24211B",
-+"Y 	c #3D3A30",
-+"Z 	c #645B4B",
-+"` 	c #484337",
-+" .	c #2F2C24",
-+"..	c #C2A98C",
-+"+.	c #B69E84",
-+"@.	c #A79179",
-+"#.	c #9B8770",
-+"$.	c #8C7A65",
-+"%.	c #2C2720",
-+"&.	c #806F5D",
-+"*.	c #26211C",
-+"=.	c #110F0C",
-+"-.	c #0F0D0B",
-+"                                ",
-+"                  . +           ",
-+"    @ @ @ # $ % & * = -         ",
-+"  @ ; > , ' ) ! ~ { ] ^ @       ",
-+"  @ / ( _ : < < [ } | 1 @       ",
-+"    2 3 4 5 6 7 8 9 0 a b       ",
-+"    c d e f g h i j k l m       ",
-+"      n o p q r s t u v w x     ",
-+"      y z A B C D E F G H       ",
-+"      @ I J K L M       N N     ",
-+"      O @ @ P Q R S @   P Q R   ",
-+"    T U V W X Y Z U V W X `  .  ",
-+"  @ ..+.@.#.$.%...+.@.#.$.&.*.  ",
-+"    T U V W =.  T U V W =.-.    ",
-+"      S @         S @           "};