2 files changed, 160 insertions, 164 deletions

diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile
index f12c47d538e6..d13506635b68 100644
--- a/mail/pmail/Makefile
+++ b/mail/pmail/Makefile
@@ -16,16 +16,12 @@ BUILD_DEPENDS=	${PYTHON_LIBDIR}/site-packages/_gnomemodule.so:${PORTSDIR}/x11-to
 LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	${PYTHON_LIBDIR}/site-packages/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
 
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/mail/pmail/pkg-plist b/mail/pmail/pkg-plist
index 71f0dca9f63d..c1e42fe7968b 100644
--- a/mail/pmail/pkg-plist
+++ b/mail/pmail/pkg-plist
@@ -1,157 +1,157 @@
 bin/pmail
-share/pmail/Base.py
-share/pmail/Base.pyc
-share/pmail/Base.pyo
-share/pmail/MessageList.py
-share/pmail/MessageList.pyc
-share/pmail/MessageList.pyo
-share/pmail/MimeWriter.py
-share/pmail/MimeWriter.pyc
-share/pmail/MimeWriter.pyo
-share/pmail/PmailGtkXmHTML.py
-share/pmail/PmailGtkXmHTML.pyc
-share/pmail/PmailGtkXmHTML.pyo
-share/pmail/_pmailextensionsmodule.so
-share/pmail/config/Config.py
-share/pmail/config/Config.pyc
-share/pmail/config/Config.pyo
-share/pmail/config/__init__.py
-share/pmail/config/__init__.pyc
-share/pmail/config/__init__.pyo
-share/pmail/config/paths.py
-share/pmail/config/paths.pyc
-share/pmail/config/paths.pyo
-share/pmail/dumpconfig.py
-share/pmail/dumpconfig.pyc
-share/pmail/dumpconfig.pyo
-share/pmail/gtkf/Compose.py
-share/pmail/gtkf/Compose.pyc
-share/pmail/gtkf/Compose.pyo
-share/pmail/gtkf/FrontEnd.py
-share/pmail/gtkf/FrontEnd.pyc
-share/pmail/gtkf/FrontEnd.pyo
-share/pmail/gtkf/GladeWindow.py
-share/pmail/gtkf/GladeWindow.pyc
-share/pmail/gtkf/GladeWindow.pyo
-share/pmail/gtkf/MainWindow.py
-share/pmail/gtkf/MainWindow.pyc
-share/pmail/gtkf/MainWindow.pyo
-share/pmail/gtkf/MessageList.py
-share/pmail/gtkf/MessageList.pyc
-share/pmail/gtkf/MessageList.pyo
-share/pmail/gtkf/MozillaMsgWindow.py
-share/pmail/gtkf/MozillaMsgWindow.pyc
-share/pmail/gtkf/MozillaMsgWindow.pyo
-share/pmail/gtkf/MsgWindow.py
-share/pmail/gtkf/MsgWindow.pyc
-share/pmail/gtkf/MsgWindow.pyo
-share/pmail/gtkf/Preferences.py
-share/pmail/gtkf/Preferences.pyc
-share/pmail/gtkf/Preferences.pyo
-share/pmail/gtkf/ProgressBar.py
-share/pmail/gtkf/ProgressBar.pyc
-share/pmail/gtkf/ProgressBar.pyo
-share/pmail/gtkf/SMessageWindow.py
-share/pmail/gtkf/SMessageWindow.pyc
-share/pmail/gtkf/SMessageWindow.pyo
-share/pmail/gtkf/SearchMessages.py
-share/pmail/gtkf/SearchMessages.pyc
-share/pmail/gtkf/SearchMessages.pyo
-share/pmail/gtkf/Spell.py
-share/pmail/gtkf/Spell.pyc
-share/pmail/gtkf/Spell.pyo
-share/pmail/gtkf/TextMsgWindow.py
-share/pmail/gtkf/TextMsgWindow.pyc
-share/pmail/gtkf/TextMsgWindow.pyo
-share/pmail/gtkf/TreeWindow.py
-share/pmail/gtkf/TreeWindow.pyc
-share/pmail/gtkf/TreeWindow.pyo
-share/pmail/gtkf/XmHTMLMsgWindow.py
-share/pmail/gtkf/XmHTMLMsgWindow.pyc
-share/pmail/gtkf/XmHTMLMsgWindow.pyo
-share/pmail/gtkf/__init__.py
-share/pmail/gtkf/__init__.pyc
-share/pmail/gtkf/__init__.pyo
-share/pmail/gtkf/all.glade
-share/pmail/gtkf/gnomeapp.glade
-share/pmail/gtkf/gutil.py
-share/pmail/gtkf/gutil.pyc
-share/pmail/gtkf/gutil.pyo
-share/pmail/gtkf/mygnome.py
-share/pmail/gtkf/mygnome.pyc
-share/pmail/gtkf/mygnome.pyo
-share/pmail/gtkf/update.py
-share/pmail/gtkf/update.pyc
-share/pmail/gtkf/update.pyo
-share/pmail/imaplib.py
-share/pmail/imaplib.pyc
-share/pmail/imaplib.pyo
-share/pmail/mail/IMAP.py
-share/pmail/mail/IMAP.pyc
-share/pmail/mail/IMAP.pyo
-share/pmail/mail/MH.py
-share/pmail/mail/MH.pyc
-share/pmail/mail/MH.pyo
-share/pmail/mail/Mailbox.py
-share/pmail/mail/Mailbox.pyc
-share/pmail/mail/Mailbox.pyo
-share/pmail/mail/Message.py
-share/pmail/mail/Message.pyc
-share/pmail/mail/Message.pyo
-share/pmail/mail/NewMessage.py
-share/pmail/mail/NewMessage.pyc
-share/pmail/mail/NewMessage.pyo
-share/pmail/mail/POP.py
-share/pmail/mail/POP.pyc
-share/pmail/mail/POP.pyo
-share/pmail/mail/Plugin.py
-share/pmail/mail/Plugin.pyc
-share/pmail/mail/Plugin.pyo
-share/pmail/mail/SearchCriteria.py
-share/pmail/mail/SearchCriteria.pyc
-share/pmail/mail/SearchCriteria.pyo
-share/pmail/mail/Source.py
-share/pmail/mail/Source.pyc
-share/pmail/mail/Source.pyo
-share/pmail/mail/SpoolFile.py
-share/pmail/mail/SpoolFile.pyc
-share/pmail/mail/SpoolFile.pyo
-share/pmail/mail/__init__.py
-share/pmail/mail/__init__.pyc
-share/pmail/mail/__init__.pyo
-share/pmail/mail/config_hooks.py
-share/pmail/mail/config_hooks.pyc
-share/pmail/mail/config_hooks.pyo
-share/pmail/mail/pmailmailbox.py
-share/pmail/mail/pmailmailbox.pyc
-share/pmail/mail/pmailmailbox.pyo
-share/pmail/mail/util.py
-share/pmail/mail/util.pyc
-share/pmail/mail/util.pyo
-share/pmail/main.py
-share/pmail/main.pyc
-share/pmail/main.pyo
-share/pmail/plugins/Filters.py
-share/pmail/plugins/Filters.pyc
-share/pmail/plugins/Filters.pyo
-share/pmail/plugins/HtmlViewer.py
-share/pmail/plugins/HtmlViewer.pyc
-share/pmail/plugins/HtmlViewer.pyo
-share/pmail/plugins/__init__.py
-share/pmail/plugins/__init__.pyc
-share/pmail/plugins/__init__.pyo
-share/pmail/plugins/filters.glade
-share/pmail/plugins/myf.py
-share/pmail/plugins/myf.pyc
-share/pmail/plugins/myf.pyo
-share/pmail/pmailmimify.py
-share/pmail/pmailmimify.pyc
-share/pmail/pmailmimify.pyo
-share/pmail/posixfile.py
-share/pmail/posixfile.pyc
-share/pmail/posixfile.pyo
-@dirrm share/pmail/plugins
-@dirrm share/pmail/mail
-@dirrm share/pmail/gtkf
-@dirrm share/pmail/config
-@dirrm share/pmail
+share/gnome/pmail/Base.py
+share/gnome/pmail/Base.pyc
+share/gnome/pmail/Base.pyo
+share/gnome/pmail/MessageList.py
+share/gnome/pmail/MessageList.pyc
+share/gnome/pmail/MessageList.pyo
+share/gnome/pmail/MimeWriter.py
+share/gnome/pmail/MimeWriter.pyc
+share/gnome/pmail/MimeWriter.pyo
+share/gnome/pmail/PmailGtkXmHTML.py
+share/gnome/pmail/PmailGtkXmHTML.pyc
+share/gnome/pmail/PmailGtkXmHTML.pyo
+share/gnome/pmail/_pmailextensionsmodule.so
+share/gnome/pmail/config/Config.py
+share/gnome/pmail/config/Config.pyc
+share/gnome/pmail/config/Config.pyo
+share/gnome/pmail/config/__init__.py
+share/gnome/pmail/config/__init__.pyc
+share/gnome/pmail/config/__init__.pyo
+share/gnome/pmail/config/paths.py
+share/gnome/pmail/config/paths.pyc
+share/gnome/pmail/config/paths.pyo
+share/gnome/pmail/dumpconfig.py
+share/gnome/pmail/dumpconfig.pyc
+share/gnome/pmail/dumpconfig.pyo
+share/gnome/pmail/gtkf/Compose.py
+share/gnome/pmail/gtkf/Compose.pyc
+share/gnome/pmail/gtkf/Compose.pyo
+share/gnome/pmail/gtkf/FrontEnd.py
+share/gnome/pmail/gtkf/FrontEnd.pyc
+share/gnome/pmail/gtkf/FrontEnd.pyo
+share/gnome/pmail/gtkf/GladeWindow.py
+share/gnome/pmail/gtkf/GladeWindow.pyc
+share/gnome/pmail/gtkf/GladeWindow.pyo
+share/gnome/pmail/gtkf/MainWindow.py
+share/gnome/pmail/gtkf/MainWindow.pyc
+share/gnome/pmail/gtkf/MainWindow.pyo
+share/gnome/pmail/gtkf/MessageList.py
+share/gnome/pmail/gtkf/MessageList.pyc
+share/gnome/pmail/gtkf/MessageList.pyo
+share/gnome/pmail/gtkf/MozillaMsgWindow.py
+share/gnome/pmail/gtkf/MozillaMsgWindow.pyc
+share/gnome/pmail/gtkf/MozillaMsgWindow.pyo
+share/gnome/pmail/gtkf/MsgWindow.py
+share/gnome/pmail/gtkf/MsgWindow.pyc
+share/gnome/pmail/gtkf/MsgWindow.pyo
+share/gnome/pmail/gtkf/Preferences.py
+share/gnome/pmail/gtkf/Preferences.pyc
+share/gnome/pmail/gtkf/Preferences.pyo
+share/gnome/pmail/gtkf/ProgressBar.py
+share/gnome/pmail/gtkf/ProgressBar.pyc
+share/gnome/pmail/gtkf/ProgressBar.pyo
+share/gnome/pmail/gtkf/SMessageWindow.py
+share/gnome/pmail/gtkf/SMessageWindow.pyc
+share/gnome/pmail/gtkf/SMessageWindow.pyo
+share/gnome/pmail/gtkf/SearchMessages.py
+share/gnome/pmail/gtkf/SearchMessages.pyc
+share/gnome/pmail/gtkf/SearchMessages.pyo
+share/gnome/pmail/gtkf/Spell.py
+share/gnome/pmail/gtkf/Spell.pyc
+share/gnome/pmail/gtkf/Spell.pyo
+share/gnome/pmail/gtkf/TextMsgWindow.py
+share/gnome/pmail/gtkf/TextMsgWindow.pyc
+share/gnome/pmail/gtkf/TextMsgWindow.pyo
+share/gnome/pmail/gtkf/TreeWindow.py
+share/gnome/pmail/gtkf/TreeWindow.pyc
+share/gnome/pmail/gtkf/TreeWindow.pyo
+share/gnome/pmail/gtkf/XmHTMLMsgWindow.py
+share/gnome/pmail/gtkf/XmHTMLMsgWindow.pyc
+share/gnome/pmail/gtkf/XmHTMLMsgWindow.pyo
+share/gnome/pmail/gtkf/__init__.py
+share/gnome/pmail/gtkf/__init__.pyc
+share/gnome/pmail/gtkf/__init__.pyo
+share/gnome/pmail/gtkf/all.glade
+share/gnome/pmail/gtkf/gnomeapp.glade
+share/gnome/pmail/gtkf/gutil.py
+share/gnome/pmail/gtkf/gutil.pyc
+share/gnome/pmail/gtkf/gutil.pyo
+share/gnome/pmail/gtkf/mygnome.py
+share/gnome/pmail/gtkf/mygnome.pyc
+share/gnome/pmail/gtkf/mygnome.pyo
+share/gnome/pmail/gtkf/update.py
+share/gnome/pmail/gtkf/update.pyc
+share/gnome/pmail/gtkf/update.pyo
+share/gnome/pmail/imaplib.py
+share/gnome/pmail/imaplib.pyc
+share/gnome/pmail/imaplib.pyo
+share/gnome/pmail/mail/IMAP.py
+share/gnome/pmail/mail/IMAP.pyc
+share/gnome/pmail/mail/IMAP.pyo
+share/gnome/pmail/mail/MH.py
+share/gnome/pmail/mail/MH.pyc
+share/gnome/pmail/mail/MH.pyo
+share/gnome/pmail/mail/Mailbox.py
+share/gnome/pmail/mail/Mailbox.pyc
+share/gnome/pmail/mail/Mailbox.pyo
+share/gnome/pmail/mail/Message.py
+share/gnome/pmail/mail/Message.pyc
+share/gnome/pmail/mail/Message.pyo
+share/gnome/pmail/mail/NewMessage.py
+share/gnome/pmail/mail/NewMessage.pyc
+share/gnome/pmail/mail/NewMessage.pyo
+share/gnome/pmail/mail/POP.py
+share/gnome/pmail/mail/POP.pyc
+share/gnome/pmail/mail/POP.pyo
+share/gnome/pmail/mail/Plugin.py
+share/gnome/pmail/mail/Plugin.pyc
+share/gnome/pmail/mail/Plugin.pyo
+share/gnome/pmail/mail/SearchCriteria.py
+share/gnome/pmail/mail/SearchCriteria.pyc
+share/gnome/pmail/mail/SearchCriteria.pyo
+share/gnome/pmail/mail/Source.py
+share/gnome/pmail/mail/Source.pyc
+share/gnome/pmail/mail/Source.pyo
+share/gnome/pmail/mail/SpoolFile.py
+share/gnome/pmail/mail/SpoolFile.pyc
+share/gnome/pmail/mail/SpoolFile.pyo
+share/gnome/pmail/mail/__init__.py
+share/gnome/pmail/mail/__init__.pyc
+share/gnome/pmail/mail/__init__.pyo
+share/gnome/pmail/mail/config_hooks.py
+share/gnome/pmail/mail/config_hooks.pyc
+share/gnome/pmail/mail/config_hooks.pyo
+share/gnome/pmail/mail/pmailmailbox.py
+share/gnome/pmail/mail/pmailmailbox.pyc
+share/gnome/pmail/mail/pmailmailbox.pyo
+share/gnome/pmail/mail/util.py
+share/gnome/pmail/mail/util.pyc
+share/gnome/pmail/mail/util.pyo
+share/gnome/pmail/main.py
+share/gnome/pmail/main.pyc
+share/gnome/pmail/main.pyo
+share/gnome/pmail/plugins/Filters.py
+share/gnome/pmail/plugins/Filters.pyc
+share/gnome/pmail/plugins/Filters.pyo
+share/gnome/pmail/plugins/HtmlViewer.py
+share/gnome/pmail/plugins/HtmlViewer.pyc
+share/gnome/pmail/plugins/HtmlViewer.pyo
+share/gnome/pmail/plugins/__init__.py
+share/gnome/pmail/plugins/__init__.pyc
+share/gnome/pmail/plugins/__init__.pyo
+share/gnome/pmail/plugins/filters.glade
+share/gnome/pmail/plugins/myf.py
+share/gnome/pmail/plugins/myf.pyc
+share/gnome/pmail/plugins/myf.pyo
+share/gnome/pmail/pmailmimify.py
+share/gnome/pmail/pmailmimify.pyc
+share/gnome/pmail/pmailmimify.pyo
+share/gnome/pmail/posixfile.py
+share/gnome/pmail/posixfile.pyc
+share/gnome/pmail/posixfile.pyo
+@dirrm share/gnome/pmail/plugins
+@dirrm share/gnome/pmail/mail
+@dirrm share/gnome/pmail/gtkf
+@dirrm share/gnome/pmail/config
+@dirrm share/gnome/pmail