upgrade to 0.6.9

3 files changed, 129 insertions, 125 deletions

diff --git a/news/pyne/Makefile b/news/pyne/Makefile
index b0aef970f44d..202461b59c0d 100644
--- a/news/pyne/Makefile
+++ b/news/pyne/Makefile
@@ -7,22 +7,25 @@
 #
 
 PORTNAME=	pyne
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.9
 CATEGORIES=	news python mail
-MASTER_SITES=	http://www.yikesstation.freeserve.co.uk/pyne/
+MASTER_SITES=	http://www.soul-less.pwp.blueyonder.co.uk/pyne/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 offline Newsreader/Emailer
 
-BROKEN=		"Does not compile"
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk \
+		${PYTHON_SITELIBDIR}/gtkextra/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkextra
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk \
+		${PYTHON_SITELIBDIR}/gtkextra/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkextra
 
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
+GNU_CONFIGURE=	yes
 NO_BUILD=	yes
+MAKE_ENV=	PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}"
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,^PREFIX,#PREFIX,g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s@[(]PREFIX[)]\/lib@(PYTHON_SITELIBDIR)@g" ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/news/pyne/distinfo b/news/pyne/distinfo
index 4ddb429511f7..dda3cbaca9fb 100644
--- a/news/pyne/distinfo
+++ b/news/pyne/distinfo
@@ -1 +1 @@
-MD5 (pyne-0.6.7.tar.gz) = 8307bc575349ee85a4d4d1d2f70b4ea6
+MD5 (pyne-0.6.9.tar.gz) = 5ee0f2df56900cb42cbd7a6094edabd0
diff --git a/news/pyne/pkg-plist b/news/pyne/pkg-plist
index 76f6911bb801..055494dc381d 100644
--- a/news/pyne/pkg-plist
+++ b/news/pyne/pkg-plist
@@ -1,119 +1,120 @@
 bin/pyne
-lib/pyne/addressbook.py
-lib/pyne/addressbook.pyc
-lib/pyne/boxformats/__init__.py
-lib/pyne/boxformats/__init__.pyc
-lib/pyne/boxformats/configbox.py
-lib/pyne/boxformats/configbox.pyc
-lib/pyne/boxformats/flatfilebox.py
-lib/pyne/boxformats/flatfilebox.pyc
-lib/pyne/boxformats/mhbox.py
-lib/pyne/boxformats/mhbox.pyc
-lib/pyne/boxformats/pynebox.py
-lib/pyne/boxformats/pynebox.pyc
-lib/pyne/boxformats/superbox.py
-lib/pyne/boxformats/superbox.pyc
-lib/pyne/boxtypes/__init__.py
-lib/pyne/boxtypes/__init__.pyc
-lib/pyne/boxtypes/deletedbox.py
-lib/pyne/boxtypes/deletedbox.pyc
-lib/pyne/boxtypes/mail_recv/__init__.py
-lib/pyne/boxtypes/mail_recv/__init__.pyc
-lib/pyne/boxtypes/mail_recv/imap4_recv.py
-lib/pyne/boxtypes/mail_recv/imap4_recv.pyc
-lib/pyne/boxtypes/mail_recv/null_recv.py
-lib/pyne/boxtypes/mail_recv/null_recv.pyc
-lib/pyne/boxtypes/mail_recv/pop3_recv.py
-lib/pyne/boxtypes/mail_recv/pop3_recv.pyc
-lib/pyne/boxtypes/mail_recv/recv.py
-lib/pyne/boxtypes/mail_recv/recv.pyc
-lib/pyne/boxtypes/mail_send/__init__.py
-lib/pyne/boxtypes/mail_send/__init__.pyc
-lib/pyne/boxtypes/mail_send/null_send.py
-lib/pyne/boxtypes/mail_send/null_send.pyc
-lib/pyne/boxtypes/mail_send/smtp_send.py
-lib/pyne/boxtypes/mail_send/smtp_send.pyc
-lib/pyne/boxtypes/mailbox.py
-lib/pyne/boxtypes/mailbox.pyc
-lib/pyne/boxtypes/nntpbox.py
-lib/pyne/boxtypes/nntpbox.pyc
-lib/pyne/boxtypes/outbox.py
-lib/pyne/boxtypes/outbox.pyc
-lib/pyne/boxtypes/popbox.py
-lib/pyne/boxtypes/popbox.pyc
-lib/pyne/boxtypes/storebox.py
-lib/pyne/boxtypes/storebox.pyc
-lib/pyne/boxtypes/superbox.py
-lib/pyne/boxtypes/superbox.pyc
-lib/pyne/convert-0.5.4.py
-lib/pyne/icons/_envelope.xpm
-lib/pyne/icons/_msg.xpm
-lib/pyne/icons/button_apply.xpm
-lib/pyne/icons/button_cancel.xpm
-lib/pyne/icons/button_ok.xpm
-lib/pyne/icons/logo.xpm
-lib/pyne/icons/msg_read.xpm
-lib/pyne/icons/msg_read_marked.xpm
-lib/pyne/icons/msg_read_replied.xpm
-lib/pyne/icons/msg_read_replied_marked.xpm
-lib/pyne/icons/msg_uncached.xpm
-lib/pyne/icons/msg_uncached_marked.xpm
-lib/pyne/icons/msg_unread.xpm
-lib/pyne/icons/msg_unread_marked.xpm
-lib/pyne/icons/msg_unread_replied.xpm
-lib/pyne/icons/msg_unread_replied_marked.xpm
-lib/pyne/icons/pyne.xpm
-lib/pyne/icons/tb_address_book.xpm
-lib/pyne/icons/tb_delete_message.xpm
-lib/pyne/icons/tb_edit_message.xpm
-lib/pyne/icons/tb_forward_message.xpm
-lib/pyne/icons/tb_msg_down.xpm
-lib/pyne/icons/tb_msg_up.xpm
-lib/pyne/icons/tb_new_message.xpm
-lib/pyne/icons/tb_print_message.xpm
-lib/pyne/icons/tb_reply_message.xpm
-lib/pyne/icons/tb_replyall_message.xpm
-lib/pyne/icons/tb_shred_message.xpm
-lib/pyne/icons/tb_update_mail.xpm
-lib/pyne/icons/tb_updateall_mail.xpm
-lib/pyne/mainwin.py
-lib/pyne/mainwin.pyc
-lib/pyne/msgeditbox.py
-lib/pyne/msgeditbox.pyc
-lib/pyne/msgfilter.py
-lib/pyne/msgfilter.pyc
-lib/pyne/printmodule.py
-lib/pyne/ptk/__init__.py
-lib/pyne/ptk/__init__.pyc
-lib/pyne/ptk/big_edit_box.py
-lib/pyne/ptk/big_edit_box.pyc
-lib/pyne/ptk/folder_tree.py
-lib/pyne/ptk/folder_tree.pyc
-lib/pyne/ptk/menu_maker.py
-lib/pyne/ptk/menu_maker.pyc
-lib/pyne/ptk/message_tree.py
-lib/pyne/ptk/message_tree.pyc
-lib/pyne/ptk/misc_widgets.py
-lib/pyne/ptk/msg_view_box.py
-lib/pyne/ptk/msg_view_box.pyc
-lib/pyne/pyne.py
-lib/pyne/pyne.pyc
-lib/pyne/pyneheaders.py
-lib/pyne/pyneheaders.pyc
-lib/pyne/pynei18n.py
-lib/pyne/pynei18n.pyc
-lib/pyne/pynemsg.py
-lib/pyne/pynemsg.pyc
-lib/pyne/sort.py
-lib/pyne/sort.pyc
-lib/pyne/utils.py
-lib/pyne/utils.pyc
-lib/pyne/viewattach.py
-lib/pyne/viewattach.pyc
-@dirrm lib/pyne/boxformats
-@dirrm lib/pyne/boxtypes/mail_recv
-@dirrm lib/pyne/boxtypes/mail_send
-@dirrm lib/pyne/boxtypes
-@dirrm lib/pyne/icons
-@dirrm lib/pyne/ptk
-@dirrm lib/pyne
+%%PYTHON_SITELIBDIR%%/pyne/addressbook.py
+%%PYTHON_SITELIBDIR%%/pyne/addressbook.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/__init__.py
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/configbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/configbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/flatfilebox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/flatfilebox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/mhbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/mhbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/pynebox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/pynebox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/superbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxformats/superbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/__init__.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/deletedbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/deletedbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/__init__.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/imap4_recv.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/imap4_recv.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/null_recv.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/null_recv.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/pop3_recv.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/pop3_recv.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv/recv.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send/__init__.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send/null_send.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send/null_send.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send/smtp_send.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send/smtp_send.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mailbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/mailbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/net_exceptions.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/net_exceptions.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/nntpbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/nntpbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/outbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/outbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/popbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/storebox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/storebox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/superbox.py
+%%PYTHON_SITELIBDIR%%/pyne/boxtypes/superbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/convert-0.5.4.py
+%%PYTHON_SITELIBDIR%%/pyne/icons/button_apply.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/button_cancel.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/button_ok.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/logo.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_read.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_read_marked.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_read_replied.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_read_replied_marked.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_uncached.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_uncached_marked.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_unread.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_unread_marked.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_unread_replied.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/msg_unread_replied_marked.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/pyne.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_address_book.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_delete_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_edit_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_forward_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_msg_down.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_msg_up.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_new_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_print_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_reply_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_replyall_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_shred_message.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_update_mail.xpm
+%%PYTHON_SITELIBDIR%%/pyne/icons/tb_updateall_mail.xpm
+%%PYTHON_SITELIBDIR%%/pyne/mainwin.py
+%%PYTHON_SITELIBDIR%%/pyne/mainwin.pyc
+%%PYTHON_SITELIBDIR%%/pyne/msgeditbox.py
+%%PYTHON_SITELIBDIR%%/pyne/msgeditbox.pyc
+%%PYTHON_SITELIBDIR%%/pyne/msgfilter.py
+%%PYTHON_SITELIBDIR%%/pyne/msgfilter.pyc
+%%PYTHON_SITELIBDIR%%/pyne/printmodule.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/__init__.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyne/ptk/big_edit_box.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/big_edit_box.pyc
+%%PYTHON_SITELIBDIR%%/pyne/ptk/folder_tree.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/folder_tree.pyc
+%%PYTHON_SITELIBDIR%%/pyne/ptk/menu_maker.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/menu_maker.pyc
+%%PYTHON_SITELIBDIR%%/pyne/ptk/message_tree.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/message_tree.pyc
+%%PYTHON_SITELIBDIR%%/pyne/ptk/misc_widgets.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/misc_widgets.pyc
+%%PYTHON_SITELIBDIR%%/pyne/ptk/msg_view_box.py
+%%PYTHON_SITELIBDIR%%/pyne/ptk/msg_view_box.pyc
+%%PYTHON_SITELIBDIR%%/pyne/pyne.py
+%%PYTHON_SITELIBDIR%%/pyne/pyne.pyc
+%%PYTHON_SITELIBDIR%%/pyne/pyneheaders.py
+%%PYTHON_SITELIBDIR%%/pyne/pyneheaders.pyc
+%%PYTHON_SITELIBDIR%%/pyne/pynei18n.py
+%%PYTHON_SITELIBDIR%%/pyne/pynei18n.pyc
+%%PYTHON_SITELIBDIR%%/pyne/pynemsg.py
+%%PYTHON_SITELIBDIR%%/pyne/pynemsg.pyc
+%%PYTHON_SITELIBDIR%%/pyne/sort.py
+%%PYTHON_SITELIBDIR%%/pyne/sort.pyc
+%%PYTHON_SITELIBDIR%%/pyne/timeoutsocket.py
+%%PYTHON_SITELIBDIR%%/pyne/timeoutsocket.pyc
+%%PYTHON_SITELIBDIR%%/pyne/utils.py
+%%PYTHON_SITELIBDIR%%/pyne/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyne/viewattach.py
+%%PYTHON_SITELIBDIR%%/pyne/viewattach.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxformats
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/icons
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/ptk
+@dirrm %%PYTHON_SITELIBDIR%%/pyne