Date: Sun, 5 Oct 2003 06:41:12 +0200 (CEST) From: Pav Lucistnik <pav@oook.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Stephen Kiernan <sk-ports@vegamuse.org> Subject: ports/57589: [unbreak port] mail/mahogany to 0.65 and unbreak Message-ID: <200310050441.h954fCq3053094@hood.oook.cz> Resent-Message-ID: <200310050450.h954oEHh028083@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57589
>Category: ports
>Synopsis: [unbreak port] mail/mahogany to 0.65 and unbreak
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 04 21:50:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Thu Sep 25 01:25:46 CEST 2003 root@hood.oook.cz:/usr/obj/usr/src/sys/PAV i386
>Description:
Port mail/mahogany was last updated 2,5 years ago, and is marked
BROKEN since May. Attached patch updates it to latest version 0.65
and unbreaks. I hope I'll save this excellent mail and news client
from Kris' scythe. Maintainer is Cc'ed.
Committer please remove all old patches (files/patch-a[a-i])
and add 7 new patches. Also cvs remove pkg-message.
Changes to port:
- python interpreter works only with python 2.1 and older,
and is no longer maintained by the authors, so i disabled it
and changed CATEGORIES and COMMENT accordingly
- removed latex dependency and not installing Manual
it's weird to have to install whole latex just to build
documentation to mail client. built docs in html are available
on mahogany website.
Please close PR 30947 which contains talks about updates to older
versions.
Many thanks to Joe Marcus Clarke for finding and fixing i18n bugs
in wxGTK which caused mahogany to fail with certain locale.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/mail/mahogany/Makefile mahogany/Makefile
--- /usr/ports/mail/mahogany/Makefile Tue May 6 23:10:45 2003
+++ mahogany/Makefile Sun Oct 5 05:14:32 2003
@@ -6,40 +6,30 @@
#
PORTNAME= mahogany
-PORTVERSION= 0.60
-PORTREVISION= 1
-CATEGORIES= mail python
+PORTVERSION= 0.65
+CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mahogany
MAINTAINER= sk-ports@vegamuse.org
-COMMENT= An X11 mail and news client with an embedded Python interpreter
+COMMENT= An X11 mail and news client
-BROKEN= "Does not compile"
+LIB_DEPENDS+= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
-LIB_DEPENDS+= wx_gtk-2.2.2:${PORTSDIR}/x11-toolkits/wxgtk
-BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig11
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+= latex2html:${PORTSDIR}/textproc/latex2html
-.endif
-
-USE_PYTHON= yes
-PYTHON_VERSION= python1.5
-USE_AUTOCONF_VER= 213
+USE_X_PREFIX= yes
+GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV+= OSTYPE=${OPSYS}
-
+USE_REINPLACE= yes
+ALL_TARGET= all locales
INSTALL_TARGET= install_bin install_locale
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+= install_doc
-.endif
-MAN1= mahogany.1
+MAN1= M.1 mahogany.1
-CONFIGURE_ARGS= --with-threads
+CONFIGURE_ARGS= --with-python=none
+CONFIGURE_ENV= OSTYPE=${OPSYS} CFLAGS="${CFLAGS}"
-post-install:
- @${STRIP_CMD} ${PREFIX}/bin/mahogany
- @${CAT} ${PKGMESSAGE}
+post-patch:
+ @${REINPLACE_CMD} -e 's|-DOPENSSL_NO_KRB5||' -e 's|-O2|${CFLAGS}|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|$$(DATADIR)/locale|$$(DESTDIR)/share/locale|' ${WRKSRC}/locale/Makefile
.include <bsd.port.mk>
diff -ruN /usr/ports/mail/mahogany/distinfo mahogany/distinfo
--- /usr/ports/mail/mahogany/distinfo Fri Nov 17 21:43:33 2000
+++ mahogany/distinfo Sat Oct 4 22:24:40 2003
@@ -1 +1 @@
-MD5 (mahogany-0.60.tar.gz) = 0bd24e63a82e0366b30ab52a0378a1d8
+MD5 (mahogany-0.65.tar.gz) = acaa375cb3659c6a434649bf823e85cc
diff -ruN /usr/ports/mail/mahogany/files/patch-Makefile mahogany/files/patch-Makefile
--- /usr/ports/mail/mahogany/files/patch-Makefile Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-Makefile Sat Oct 4 23:28:42 2003
@@ -0,0 +1,12 @@
+--- Makefile.orig Mon Jul 28 23:10:47 2003
++++ Makefile Sat Oct 4 23:28:15 2003
+@@ -76,9 +76,6 @@
+ set -e; for i in \
+ $(BINDIR) \
+ $(DATADIR) \
+- $(DATADIR)/$(CANONICAL_HOST) \
+- $(DATADIR)/$(CANONICAL_HOST)/bin \
+- $(DATADIR)/$(CANONICAL_HOST)/lib \
+ $(DOCDIR) \
+ $(DOCDIR)/Tips \
+ ;do \
diff -ruN /usr/ports/mail/mahogany/files/patch-aa mahogany/files/patch-aa
--- /usr/ports/mail/mahogany/files/patch-aa Fri Nov 17 21:43:33 2000
+++ mahogany/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,91 +0,0 @@
---- configure.in.orig Wed Nov 8 10:21:36 2000
-+++ configure.in Sun Nov 12 03:40:33 2000
-@@ -309,9 +309,19 @@
- AC_SUBST(MAKE_USE_LEAKTRACER)
-
- case "$USE_THREADS" in 1)
-- AC_CHECK_LIB(pthread,main,,AC_CHECK_LIB(pthreads,main))
-+ AC_CHECK_LIB(pthread,main,threaded_lib=pthread,
-+ AC_CHECK_LIB(pthreads,main,threaded_lib=pthreads,
-+ AC_CHECK_LIB(c_r,pthread_self,threaded_lib=c_r,
-+ threaded_lib=none)
-+ )
-+ )
- AC_DEFINE(USE_THREADS)
-- LIBS="$LIBS -lpthread"
-+ case "$threaded_lib" in
-+ none) ;;
-+ pthread*) LIBS="$LIBS -lpthread" ;;
-+ c_r) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-+ LIBS="-pthread $LIBS" ;;
-+ esac
- esac
-
- dnl set debug/optimisation flags
-@@ -456,15 +466,16 @@
-
- dnl libresolv or libbind (or simply libc under FreeBSD)
- USE_RBL=1
--AC_CHECK_LIB(resolv,res_query,,
-- AC_CHECK_LIB(bind,res_query,,
-- AC_CHECK_LIB(r,res_query,,
-- [
-- AC_MSG_WARN(cannot use RBL spam checker.)
-- USE_RBL=0
-- ]
-- )
-- )
-+AC_CHECK_FUNC(res_query,,
-+ [AC_CHECK_LIB(resolv,res_query,,
-+ [AC_CHECK_LIB(bind,res_query,,
-+ [AC_CHECK_LIB(r,res_query,,
-+ [AC_MSG_WARN(cannot use RBL spam checker.)
-+ USE_RBL=0
-+ ]
-+ ])
-+ ])
-+ ])
- )
-
- case "$USE_RBL" in 1) AC_DEFINE(USE_RBL) ;; esac
---- Makefile.orig Mon Nov 6 14:58:02 2000
-+++ Makefile Sun Nov 12 06:48:56 2000
-@@ -18,7 +18,7 @@
- M := mahogany-$(M_VERSION_MAJOR).$(M_VERSION_MINOR)
-
- doc:
-- set -e; for i in extra doc; do $(MAKE) -C $$i doc; done
-+ set -e; for i in extra; do $(MAKE) -C $$i doc; done
-
- classdoc:
- set -e; for i in doc; do $(MAKE) -C $$i doc; done
-@@ -63,12 +63,6 @@
- $(BINDIR) \
- $(DATADIR) \
- $(DOCDIR) \
-- $(DATADIR)/$(CANONICAL_HOST) \
-- $(DATADIR)/$(CANONICAL_HOST)/bin \
-- $(DATADIR)/$(CANONICAL_HOST)/lib \
-- $(DATADIR)/bin \
-- $(DATADIR)/lib \
-- $(DATADIR)/doc \
- $(DOCDIR)/Tips \
- ;do $(INSTALL) -d -m 755 $$i; \
- done
---- makeopts.in.orig Thu Oct 5 09:48:37 2000
-+++ makeopts.in Sun Nov 12 17:22:51 2000
-@@ -95,11 +95,11 @@
- # Directory in which to install library files.
- DATADIR = $(DESTDIR)/share/Mahogany
- # where to install docs
--DOCDIR = $(DATADIR)/doc
-+DOCDIR = $(DESTDIR)/share/doc/Mahogany
-
- # for the dynamic linker, better than using -rpath
--LD_RUN_PATH=$(DATADIR)/$(CANONICAL_HOST)/lib
--MODULEDIR=$(DATADIR)/$(CANONICAL_HOST)/modules
-+LD_RUN_PATH=$(DESTDIR)/lib
-+MODULEDIR=$(DESTDIR)/libdata/Mahogany/modules
-
- ifdef USE_LIBTOOL
- LINK = $(LIBTOOL) --mode=link $(CXX) -Wl-r$(LD_RUN_PATH)
diff -ruN /usr/ports/mail/mahogany/files/patch-ab mahogany/files/patch-ab
--- /usr/ports/mail/mahogany/files/patch-ab Fri Nov 17 21:43:33 2000
+++ mahogany/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -1,196 +0,0 @@
---- extra/src/c-client/dummy.c.orig Sat Nov 11 02:55:17 2000
-+++ extra/src/c-client/dummy.c Sat Nov 11 02:55:27 2000
-@@ -252,7 +252,7 @@
- long level)
- {
- DIR *dp;
-- struct direct *d;
-+ struct dirent *d;
- struct stat sbuf;
- char tmp[MAILTMPLEN];
- /* punt if bogus name */
---- extra/src/c-client/mh.c.orig Sat Nov 11 02:57:05 2000
-+++ extra/src/c-client/mh.c Sat Nov 11 02:57:15 2000
-@@ -285,7 +285,7 @@
- void mh_list_work (MAILSTREAM *stream,char *dir,char *pat,long level)
- {
- DIR *dp;
-- struct direct *d;
-+ struct dirent *d;
- struct stat sbuf;
- char *cp,*np,curdir[MAILTMPLEN],name[MAILTMPLEN];
- /* build MH name to search */
-@@ -386,7 +386,7 @@
- long mh_delete (MAILSTREAM *stream,char *mailbox)
- {
- DIR *dirp;
-- struct direct *d;
-+ struct dirent *d;
- int i;
- char tmp[MAILTMPLEN];
- if (!(mailbox[0] == '#' && (mailbox[1] == 'm' || mailbox[1] == 'M') &&
-@@ -651,7 +651,7 @@
- }
- stream->silent = T; /* don't pass up mm_exists() events yet */
- if (sbuf.st_ctime != LOCAL->scantime) {
-- struct direct **names = NIL;
-+ struct dirent **names = NIL;
- long nfiles = scandir (LOCAL->dir,&names,mh_select,mh_numsort);
- if (nfiles < 0) nfiles = 0; /* in case error */
- old = stream->uid_last;
-@@ -871,7 +871,7 @@
- long mh_append (MAILSTREAM *stream,char *mailbox,char *flags,char *date,
- STRING *message)
- {
-- struct direct **names;
-+ struct dirent **names;
- int fd;
- char c,*s,tmp[MAILTMPLEN];
- MESSAGECACHE elt;
-@@ -961,7 +961,7 @@
- * Returns: T to use file name, NIL to skip it
- */
-
--int mh_select (struct direct *name)
-+int mh_select (struct dirent *name)
- {
- char c;
- char *s = name->d_name;
-@@ -978,8 +978,8 @@
-
- int mh_numsort (const void *d1,const void *d2)
- {
-- return atoi ((*(struct direct **) d1)->d_name) -
-- atoi ((*(struct direct **) d2)->d_name);
-+ return atoi ((*(struct dirent **) d1)->d_name) -
-+ atoi ((*(struct dirent **) d2)->d_name);
- }
-
-
---- extra/src/c-client/mh.h.orig Sat Nov 11 02:56:50 2000
-+++ extra/src/c-client/mh.h Sat Nov 11 02:57:01 2000
-@@ -83,7 +83,7 @@
- long mh_append (MAILSTREAM *stream,char *mailbox,char *flags,char *date,
- STRING *message);
-
--int mh_select (struct direct *name);
-+int mh_select (struct dirent *name);
- int mh_numsort (const void *d1,const void *d2);
- char *mh_file (char *dst,char *name);
- long mh_canonicalize (char *pattern,char *ref,char *pat);
---- extra/src/c-client/mx.c.orig Sat Nov 11 02:54:19 2000
-+++ extra/src/c-client/mx.c Sat Nov 11 02:54:43 2000
-@@ -197,7 +197,7 @@
- void mx_list_work (MAILSTREAM *stream,char *dir,char *pat,long level)
- {
- DIR *dp;
-- struct direct *d;
-+ struct dirent *d;
- struct stat sbuf;
- char *cp,*np,curdir[MAILTMPLEN],name[MAILTMPLEN];
- /* make mailbox and directory names */
-@@ -294,7 +294,7 @@
- long mx_delete (MAILSTREAM *stream,char *mailbox)
- {
- DIR *dirp;
-- struct direct *d;
-+ struct dirent *d;
- char *s;
- char tmp[MAILTMPLEN];
- if (!mx_isvalid (mailbox,tmp))
-@@ -585,7 +585,7 @@
- if (stat (LOCAL->dir,&sbuf)) return NIL;
- stream->silent = T; /* don't pass up mm_exists() events yet */
- if (sbuf.st_ctime != LOCAL->scantime) {
-- struct direct **names = NIL;
-+ struct dirent **names = NIL;
- long nfiles = scandir (LOCAL->dir,&names,mx_select,mx_numsort);
- if (nfiles < 0) nfiles = 0; /* in case error */
- old = stream->uid_last;
-@@ -902,7 +902,7 @@
- * Returns: T to use file name, NIL to skip it
- */
-
--int mx_select (struct direct *name)
-+int mx_select (struct dirent *name)
- {
- char c;
- char *s = name->d_name;
-@@ -919,8 +919,8 @@
-
- int mx_numsort (const void *d1,const void *d2)
- {
-- return atoi ((*(struct direct **) d1)->d_name) -
-- atoi ((*(struct direct **) d2)->d_name);
-+ return atoi ((*(struct dirent **) d1)->d_name) -
-+ atoi ((*(struct dirent **) d2)->d_name);
- }
-
-
---- extra/src/c-client/mx.h.orig Sat Nov 11 02:53:27 2000
-+++ extra/src/c-client/mx.h Sat Nov 11 02:53:34 2000
-@@ -86,7 +86,7 @@
- long mx_append (MAILSTREAM *stream,char *mailbox,char *flags,char *date,
- STRING *message);
-
--int mx_select (struct direct *name);
-+int mx_select (struct dirent *name);
- int mx_numsort (const void *d1,const void *d2);
- char *mx_file (char *dst,char *name);
- long mx_lockindex (MAILSTREAM *stream);
---- extra/src/c-client/news.c.orig Sat Nov 11 02:56:14 2000
-+++ extra/src/c-client/news.c Sat Nov 11 02:56:32 2000
-@@ -352,7 +352,7 @@
- {
- long i,nmsgs;
- char *s,tmp[MAILTMPLEN];
-- struct direct **names;
-+ struct dirent **names;
- /* return prototype for OP_PROTOTYPE call */
- if (!stream) return &newsproto;
- if (stream->local) fatal ("news recycle stream");
-@@ -401,7 +401,7 @@
- * Returns: T to use file name, NIL to skip it
- */
-
--int news_select (struct direct *name)
-+int news_select (struct dirent *name)
- {
- char c;
- char *s = name->d_name;
-@@ -418,8 +418,8 @@
-
- int news_numsort (const void *d1,const void *d2)
- {
-- return atoi ((*(struct direct **) d1)->d_name) -
-- atoi ((*(struct direct **) d2)->d_name);
-+ return atoi ((*(struct dirent **) d1)->d_name) -
-+ atoi ((*(struct dirent **) d2)->d_name);
- }
-
-
---- extra/src/c-client/news.h.orig Sat Nov 11 02:55:57 2000
-+++ extra/src/c-client/news.h Sat Nov 11 02:56:10 2000
-@@ -65,7 +65,7 @@
- long news_rename (MAILSTREAM *stream,char *old,char *newname);
- long news_status (MAILSTREAM *stream,char *mbx,long flags);
- MAILSTREAM *news_open (MAILSTREAM *stream);
--int news_select (struct direct *name);
-+int news_select (struct dirent *name);
- int news_numsort (const void *d1,const void *d2);
- void news_close (MAILSTREAM *stream,long options);
- void news_fast (MAILSTREAM *stream,char *sequence,long flags);
---- extra/src/c-client/os_bsi.h.orig Sat Nov 11 02:51:06 2000
-+++ extra/src/c-client/os_bsi.h Sat Nov 11 03:00:17 2000
-@@ -37,10 +37,9 @@
- #include <unistd.h>
- #include <string.h>
- #include <sys/types.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- #include <fcntl.h>
- #include <syslog.h>
--#include <sys/file.h>
-
-
- #include "env_unix.h"
diff -ruN /usr/ports/mail/mahogany/files/patch-ac mahogany/files/patch-ac
--- /usr/ports/mail/mahogany/files/patch-ac Fri Nov 17 21:43:33 2000
+++ mahogany/files/patch-ac Thu Jan 1 01:00:00 1970
@@ -1,118 +0,0 @@
---- src/wx/vcard/vcc.y.orig Thu Aug 24 16:27:50 2000
-+++ src/wx/vcard/vcc.y Sat Nov 11 03:23:44 2000
-@@ -107,7 +107,7 @@
- #endif
-
- #include <string.h>
--#ifndef __MWERKS__
-+#if !defined(__MWERKS__) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- #include <stdio.h>
-@@ -161,7 +161,6 @@
- /**** Private Forward Declarations ****/
- static int pushVObject(const char *prop);
- static VObject* popVObject();
--static char* lexDataFromBase64();
- static void lexPopMode(int top);
- static int lexWithinMode(enum LexMode mode);
- static void lexPushMode(enum LexMode mode);
-@@ -371,7 +370,7 @@
- ;
-
- %%
--/*/////////////////////////////////////////////////////////////////////////*/
-+/*-------------------------------------------------------------------------*/
- static int pushVObject(const char *prop)
- {
- VObject *newObj;
-@@ -391,7 +390,7 @@
- }
-
-
--/*/////////////////////////////////////////////////////////////////////////*/
-+/*-------------------------------------------------------------------------*/
- /* This pops the recently built vCard off the stack and returns it. */
- static VObject* popVObject()
- {
-@@ -432,7 +431,8 @@
-
- static void enterAttr(const char *s1, const char *s2)
- {
-- const char *p1, *p2;
-+ const char *p1;
-+ const char *p2 = NULL;
- p1 = lookupProp_(s1);
- if (s2) {
- VObject *a;
-@@ -726,7 +726,6 @@
- }
-
- static char* lexGet1Value() {
-- int size = 0;
- int c;
- lexSkipWhite();
- c = lexLookahead();
-@@ -758,7 +757,6 @@
- #endif
-
- static char* lexGetStrUntil(char *termset) {
-- int size = 0;
- int c = lexLookahead();
- lexClearToken();
- while (c != EOF && !strchr(termset,c)) {
-@@ -814,7 +812,7 @@
- }
-
-
--/*/////////////////////////////////////////////////////////////////////////*/
-+/*-------------------------------------------------------------------------*/
- /* This parses and converts the base64 format for binary encoding into
- * a decoded buffer (allocated with new). See RFC 1521.
- */
-@@ -943,7 +941,6 @@
- static char* lexGetQuotedPrintable()
- {
- char cur;
-- unsigned long len = 0;
-
- lexClearToken();
- do {
-@@ -999,8 +996,6 @@
- } /* LexQuotedPrintable */
-
- int yylex() {
-- int token = 0;
--
- int lexmode = LEXMODE();
- if (lexmode == L_VALUES) {
- int c = lexGetc();
-@@ -1130,7 +1125,7 @@
- return vObjList;
- }
-
--/*/////////////////////////////////////////////////////////////////////////*/
-+/*-------------------------------------------------------------------------*/
- DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
- {
- initLex(input, len, 0);
-@@ -1185,7 +1180,7 @@
-
- #endif
-
--/*/////////////////////////////////////////////////////////////////////////*/
-+/*-------------------------------------------------------------------------*/
- static void YYDebug(const char *s)
- {
- /* Parse_Debug(s); */
---- src/wx/vcard/vobject.c.orig Sat Nov 11 03:25:07 2000
-+++ src/wx/vcard/vobject.c Sat Nov 11 03:25:31 2000
-@@ -42,7 +42,7 @@
- * vobject, and convert a vobject into its textual representation.
- */
-
--#ifndef MWERKS
-+#if !defined(MWERKS) && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
-
diff -ruN /usr/ports/mail/mahogany/files/patch-ad mahogany/files/patch-ad
--- /usr/ports/mail/mahogany/files/patch-ad Fri Nov 17 21:43:33 2000
+++ mahogany/files/patch-ad Thu Jan 1 01:00:00 1970
@@ -1,48 +0,0 @@
---- src/gui/wxMApp.cpp.orig Sat Sep 30 12:10:50 2000
-+++ src/gui/wxMApp.cpp Sun Nov 12 05:30:09 2000
-@@ -561,7 +561,11 @@
- {
- #ifdef OS_UNIX
- String localePath;
-+#ifdef __FreeBSD__
-+ localePath << M_PREFIX << "/share/locale";
-+#else
- localePath << M_BASEDIR << "/locale";
-+#endif
- #elif defined(OS_WIN)
- InitGlobalDir();
- String localePath;
-@@ -835,7 +839,12 @@
- READ_APPCONFIG(MP_HELPBROWSER),
- READ_APPCONFIG(MP_HELPBROWSER_ISNS));
- #endif
-+#ifdef __FreeBSD__
-+ helpfile = M_PREFIX;
-+ helpfile += "/share/doc/Mahogany";
-+#else
- helpfile = GetGlobalDir()+"/doc";
-+#endif // __FreeBSD__
- #else // Windows
- helpfile = GetGlobalDir()+"\\doc\\Mahogany.hlp";
- #endif // Unix/Windows
---- src/gui/wxMDialogs.cpp.orig Sun Nov 12 04:24:18 2000
-+++ src/gui/wxMDialogs.cpp Sun Nov 12 05:19:40 2000
-@@ -1006,15 +1006,9 @@
- {
- String dir, filename;
-
-- // Tips files are in @prefix@/share/Mahogany/doc/Tips/
-- dir = mApplication->GetGlobalDir();
-- if ( !dir )
-- {
-- // like this, it will work in an uninstalled copy of M too
-- dir = "..";
-- }
--
-- dir << DIR_SEPARATOR << "doc" << DIR_SEPARATOR << "Tips" << DIR_SEPARATOR;
-+ // Tips files are in @prefix@/share/doc/Mahogany/Tips/
-+ dir << M_PREFIX << DIR_SEPARATOR << "share" << DIR_SEPARATOR << "doc";
-+ dir << DIR_SEPARATOR << "Mahogany" << DIR_SEPARATOR << "Tips" << DIR_SEPARATOR;
-
- // Tips files are either Tips_LOCALENAME.txt, e.g. Tips_de.txt or
- // simply Tips.txt
diff -ruN /usr/ports/mail/mahogany/files/patch-ae mahogany/files/patch-ae
--- /usr/ports/mail/mahogany/files/patch-ae Fri Nov 17 21:43:33 2000
+++ mahogany/files/patch-ae Thu Jan 1 01:00:00 1970
@@ -1,44 +0,0 @@
---- src/classes/MModule.cpp.orig Mon Nov 6 14:58:02 2000
-+++ src/classes/MModule.cpp Thu Nov 16 00:07:29 2000
-@@ -683,22 +683,24 @@
-
- static wxArrayString BuildListOfModulesDirs()
- {
-- // look under extra M_CANONICAL_HOST directory under Unix, but not for other
-- // platforms (doesn't make much sense under Windows)
--
- wxString path1, path2;
- wxArrayString dirs;
-
-- path1 << mApplication->GetGlobalDir()
-+#if defined(OS_UNIX) && defined( __FreeBSD__)
-+ path1 << M_PREFIX << DIR_SEPARATOR << "libdata"
-+ << DIR_SEPARATOR << "Mahogany"
-+#else
-+ path1 << mApplication->GetLocalDir()
- #ifdef OS_UNIX
- << DIR_SEPARATOR << M_CANONICAL_HOST
--#endif // Unix
-+#endif
-+#endif
- << DIR_SEPARATOR << "modules" << DIR_SEPARATOR;
-
- path2 << mApplication->GetLocalDir()
- #ifdef OS_UNIX
- << DIR_SEPARATOR << M_CANONICAL_HOST
--#endif // Unix
-+#endif
- << DIR_SEPARATOR << "modules" << DIR_SEPARATOR;
-
- dirs.Add(path1);
---- src/classes/Profile.cpp.orig Sun Nov 12 09:12:38 2000
-+++ src/classes/Profile.cpp Sun Nov 12 09:12:12 2000
-@@ -765,7 +765,7 @@
- // 3. default installation dir
- String globalFileName, globalFile;
- globalFileName << '/' << M_APPLICATIONNAME << ".conf";
-- globalFile = String(M_PREFIX) + globalFileName;
-+ globalFile = String(M_PREFIX) + "/etc" + globalFileName;
- if ( !wxFileExists(globalFile) )
- {
- const char *dir = getenv("MAHOGANY_DIR");
diff -ruN /usr/ports/mail/mahogany/files/patch-af mahogany/files/patch-af
--- /usr/ports/mail/mahogany/files/patch-af Mon Feb 26 05:37:01 2001
+++ mahogany/files/patch-af Thu Jan 1 01:00:00 1970
@@ -1,62 +0,0 @@
---- doc/HackersGuide.htex.orig Sun Nov 12 06:24:51 2000
-+++ doc/HackersGuide.htex Sun Nov 12 06:24:47 2000
-@@ -1,8 +1,8 @@
- %% LyX 1.1 created this file. For more info, see http://www.lyx.org/.
- %% Do not edit unless you really know what you are doing.
- \documentclass[12pt,letterpaper,oneside]{book}
--\usepackage{palatino}
--\usepackage[T1]{fontenc}
-+%% \usepackage{palatino}
-+%% \usepackage[T1]{fontenc}
-
- \makeatletter
-
---- doc/Manual.htex.orig Sun Nov 12 06:24:00 2000
-+++ doc/Manual.htex Sun Nov 12 06:25:02 2000
-@@ -3,8 +3,8 @@
-
- %% Do not edit this file unless you know what you are doing.
- \documentclass[12pt,letterpaper,oneside]{book}
--\usepackage[T1]{fontenc}
--\usepackage{palatino}
-+%% \usepackage[T1]{fontenc}
-+%% \usepackage{palatino}
-
- \makeatletter
-
---- doc/Makefile.sub.orig Sat Sep 30 12:10:13 2000
-+++ doc/Makefile.sub Thu Feb 1 12:44:15 2001
-@@ -3,12 +3,14 @@
-
- include ../../makeopts
-
--all: wxhelp.map
-+all: $(DIR)/wxhelp.map
- @true
-
- #include ../../makerules
-
--wxhelp.map: ../.src/$(DIR).htex ../.src/html.sty
-+HTML2WXHELP= $(shell pwd)/../../.src/extra/scripts/html2wxhelp
-+
-+$(DIR)/wxhelp.map: ../.src/$(DIR).htex ../.src/html.sty
- @ln -sf ../.src/$(DIR).htex ../.src/html.sty ../.src/pics .
- ../../.src/extra/scripts/striphelpids $(DIR).htex >tmp.tex
- $(LATEX) tmp.tex </dev/null
-@@ -21,11 +23,12 @@
- mv tmp.dvi $(DIR).dvi
- mv tmp.aux $(DIR).aux
- rm -f tmp.*
-- @$(RM) -r $(DIR)
-- $(LATEX2HTML) -local_icons -debug $(DIR).htex
-- cd $(DIR) && ../../../.src/extra/scripts/html2wxhelp > ../wxhelp.map
-+ $(LATEX2HTML) -mkdir -dir /tmp/$(DIR) -local_icons -debug $(DIR).htex
-+ cd /tmp/$(DIR) && $(HTML2WXHELP) > wxhelp.map
-+ @(cd /tmp; tar -cpf - ${DIR}) | tar -xf -
-+ @${RM} -r /tmp/$(DIR)
-
--install: wxhelp.map
-+install: $(DIR)/wxhelp.map
- $(INSTALL_DATA) $(DIR).pdf $(DOCDIR)/Pdf
- @$(RM) -r $(DOCDIR)/$(DIR)
- $(INSTALL) -d $(DOCDIR)/$(DIR)
diff -ruN /usr/ports/mail/mahogany/files/patch-ag mahogany/files/patch-ag
--- /usr/ports/mail/mahogany/files/patch-ag Fri Nov 17 21:43:33 2000
+++ mahogany/files/patch-ag Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
---- extra/install/Makefile.orig Sun Nov 12 06:55:27 2000
-+++ extra/install/Makefile Sun Nov 12 06:56:48 2000
-@@ -16,10 +16,8 @@
- done
- $(INSTALL_DATA) .src/newmail.wav $(DATADIR)
- $(INSTALL_DATA) .src/kylemail.wav $(DATADIR)
--# $(INSTALL_DATA) .src/mailcap $(DATADIR)
-- $(INSTALL_DATA) .src/M.conf $(DATADIR)
-- $(INSTALL) -d $(DESTDIR)/man/man1
-- $(INSTALL_DATA) .src/mahogany.1 $(DESTDIR)/man/man1
-- $(INSTALL_DATA) .src/mahogany.1 $(DESTDIR)/man/man1/M.1
-+ $(INSTALL_DATA) .src/M.conf $(PREFIX)/etc/mahogany.conf.sample
-+ $(INSTALL) -d $(PREFIX)/man/man1
-+ $(INSTALL_DATA) .src/mahogany.1 $(PREFIX)/man/man1
-
- .PHONY: install
diff -ruN /usr/ports/mail/mahogany/files/patch-ah mahogany/files/patch-ah
--- /usr/ports/mail/mahogany/files/patch-ah Fri Nov 17 21:43:34 2000
+++ mahogany/files/patch-ah Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- src/Makefile.orig Sat Sep 30 12:10:50 2000
-+++ src/Makefile Sun Nov 12 09:09:41 2000
-@@ -65,14 +65,8 @@
- $(RM) core libM.so M M.static
-
- install:
-- $(INSTALL_PROGRAM) -s -m 755 M $(DATADIR)/$(CANONICAL_HOST)/bin
-- if test -f libM.so; \
-- then $(INSTALL_PROGRAM) libM.so $(DATADIR)/$(CANONICAL_HOST)/lib; \
-- fi
-- $(RM) -f $(BINDIR)/M $(DATADIR)/bin/M
-- ln -f -s ../share/Mahogany/$(CANONICAL_HOST)/bin/M $(BINDIR)/M
-- $(RM) $(BINDIR)/mahogany
-- ln -f -s ../share/Mahogany/$(CANONICAL_HOST)/bin/M $(BINDIR)/mahogany
-+ $(INSTALL_PROGRAM) -s -m 755 M $(BINDIR)/M
-+ ln -f -s M $(BINDIR)/mahogany
- ifeq ($(USE_MODULES),dynamic)
- set -e; for i in $(MOD_DIRS); do $(MAKE) -C $$i install-modules; done
- endif
diff -ruN /usr/ports/mail/mahogany/files/patch-ai mahogany/files/patch-ai
--- /usr/ports/mail/mahogany/files/patch-ai Fri Nov 17 21:43:34 2000
+++ mahogany/files/patch-ai Thu Jan 1 01:00:00 1970
@@ -1,31 +0,0 @@
---- locale/Makefile.orig Sat Sep 30 12:10:48 2000
-+++ locale/Makefile Sun Nov 12 07:47:53 2000
-@@ -9,6 +9,8 @@
-
- include ../makeopts
-
-+LOCALE_DIR=$(DESTDIR)/share/locale
-+
- vpath %.po .src
-
- %.mo: %.po
-@@ -30,14 +32,14 @@
- @for i in $(FILES_PO); do echo $$i:; msgfmt -v $$i ; done
-
- install: all
-- $(INSTALL) -d $(DATADIR)/locale
-+ $(INSTALL) -d $(LOCALE_DIR)
- set -e; for i in $(FILES_MO); \
-- do $(INSTALL) -d $(DATADIR)/locale/`basename $$i .mo`/LC_MESSAGES; \
-- $(INSTALL_DATA) $$i $(DATADIR)/locale/`basename $$i .mo`/LC_MESSAGES/M.mo; \
-+ do $(INSTALL) -d $(LOCALE_DIR)/`basename $$i .mo`/LC_MESSAGES; \
-+ $(INSTALL_DATA) $$i $(LOCALE_DIR)/`basename $$i .mo`/LC_MESSAGES/M.mo; \
- done
- set -e; for i in wxstd/*.mo; \
-- do $(INSTALL) -d $(DATADIR)/locale/`basename $$i .mo`/LC_MESSAGES; \
-- $(INSTALL_DATA) $$i $(DATADIR)/locale/`basename $$i .mo`/LC_MESSAGES/wxstd.mo; \
-+ do $(INSTALL) -d $(LOCALE_DIR)/`basename $$i .mo`/LC_MESSAGES; \
-+ $(INSTALL_DATA) $$i $(LOCALE_DIR)/`basename $$i .mo`/LC_MESSAGES/wxstd.mo; \
- done
-
- msgcat:
diff -ruN /usr/ports/mail/mahogany/files/patch-include-MThread.h mahogany/files/patch-include-MThread.h
--- /usr/ports/mail/mahogany/files/patch-include-MThread.h Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-include-MThread.h Sun Oct 5 01:18:56 2003
@@ -0,0 +1,27 @@
+--- include/MThread.h.orig Wed Jul 23 00:01:38 2003
++++ include/MThread.h Sun Oct 5 00:39:39 2003
+@@ -19,8 +19,23 @@
+
+ #if USE_THREADS
+
++#include "wx/thread.h"
++
+ // use inheritance and not typedef to allow forward declaring it
+-class MMutex : public wxMutex { };
++class MMutex : public wxMutex {
++public:
++ bool IsLocked() const {
++ if ( TryLock() == wxMUTEX_NO_ERROR )
++ {
++ Unlock();
++ return false;
++ }
++ else
++ {
++ return true;
++ }
++ }
++};
+
+ #else // !USE_THREADS
+
diff -ruN /usr/ports/mail/mahogany/files/patch-makeopts.in mahogany/files/patch-makeopts.in
--- /usr/ports/mail/mahogany/files/patch-makeopts.in Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-makeopts.in Sat Oct 4 23:38:20 2003
@@ -0,0 +1,17 @@
+--- makeopts.in.orig Sat Oct 4 23:36:51 2003
++++ makeopts.in Sat Oct 4 23:38:06 2003
+@@ -108,11 +108,11 @@
+ # Directory in which to install library files.
+ DATADIR = $(DESTDIR)/share/Mahogany
+ # where to install docs
+-DOCDIR = $(DATADIR)/doc
++DOCDIR = $(DESTDIR)/share/doc/Mahogany
+
+ # for the dynamic linker, better than using -rpath
+-LD_RUN_PATH=$(DATADIR)/$(CANONICAL_HOST)/lib
+-MODULEDIR=$(DATADIR)/$(CANONICAL_HOST)/modules
++LD_RUN_PATH=$(DESTDIR)/lib
++MODULEDIR=$(DESTDIR)/libexec/Mahogany/modules
+
+ LINK = $(CXX)
+
diff -ruN /usr/ports/mail/mahogany/files/patch-src-Makefile mahogany/files/patch-src-Makefile
--- /usr/ports/mail/mahogany/files/patch-src-Makefile Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-src-Makefile Sat Oct 4 23:54:18 2003
@@ -0,0 +1,19 @@
+--- src/Makefile.orig Sat Oct 4 23:45:28 2003
++++ src/Makefile Sat Oct 4 23:47:49 2003
+@@ -139,14 +139,8 @@
+ $(RM) $(MOBJS:.o=.d) $(MSOS:.so=.d)
+
+ install:
+- $(INSTALL_PROGRAM) $(INSTALL_OPTIONS) M $(DATADIR)/$(CANONICAL_HOST)/bin
+- if test -f libM.so; \
+- then $(INSTALL_PROGRAM) libM.so $(DATADIR)/$(CANONICAL_HOST)/lib; \
+- fi
+- $(RM) -f $(BINDIR)/M $(DATADIR)/bin/M
+- ln -f -s ../share/Mahogany/$(CANONICAL_HOST)/bin/M $(BINDIR)/M
+- $(RM) $(BINDIR)/mahogany
+- ln -f -s ../share/Mahogany/$(CANONICAL_HOST)/bin/M $(BINDIR)/mahogany
++ ${INSTALL_PROGRAM} ${INSTALL_OPTIONS} M ${BINDIR}
++ ln -f -s ${BINDIR}/M ${BINDIR}/mahogany
+ ifeq ($(USE_MODULES),dynamic)
+ $(INSTALL) -d $(MODULEDIR)
+ set -e $(MSOS); while test $$# -ge 1; \
diff -ruN /usr/ports/mail/mahogany/files/patch-src-classes-MModule.cpp mahogany/files/patch-src-classes-MModule.cpp
--- /usr/ports/mail/mahogany/files/patch-src-classes-MModule.cpp Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-src-classes-MModule.cpp Sun Oct 5 03:04:26 2003
@@ -0,0 +1,14 @@
+--- src/classes/MModule.cpp.orig Tue Jul 22 14:07:38 2003
++++ src/classes/MModule.cpp Sun Oct 5 03:02:24 2003
+@@ -870,10 +870,7 @@
+ // platforms (doesn't make much sense under Windows)
+
+ wxString path1;
+- path1 << mApplication->GetGlobalDir()
+-#ifdef OS_UNIX
+- << DIR_SEPARATOR << M_CANONICAL_HOST
+-#endif // Unix
++ path1 << M_PREFIX << DIR_SEPARATOR << "libexec" << DIR_SEPARATOR << "Mahogany"
+ << DIR_SEPARATOR << _T("modules") << DIR_SEPARATOR;
+
+ dirs.Add(path1);
diff -ruN /usr/ports/mail/mahogany/files/patch-src-gui-wxMApp.cpp mahogany/files/patch-src-gui-wxMApp.cpp
--- /usr/ports/mail/mahogany/files/patch-src-gui-wxMApp.cpp Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-src-gui-wxMApp.cpp Sun Oct 5 03:07:21 2003
@@ -0,0 +1,11 @@
+--- src/gui/wxMApp.cpp.orig Tue Aug 5 01:04:21 2003
++++ src/gui/wxMApp.cpp Sun Oct 5 03:06:51 2003
+@@ -911,7 +911,7 @@
+ // now load the message catalogs
+ #ifdef OS_UNIX
+ String localePath;
+- localePath << M_BASEDIR << "/locale";
++ localePath << M_PREFIX << "/share/locale";
+ #elif defined(OS_WIN)
+ // the program directory is not initialized yet so we can't do much
+ // more than looking in the current directory...
diff -ruN /usr/ports/mail/mahogany/files/patch-src-gui-wxMDialogs.cpp mahogany/files/patch-src-gui-wxMDialogs.cpp
--- /usr/ports/mail/mahogany/files/patch-src-gui-wxMDialogs.cpp Thu Jan 1 01:00:00 1970
+++ mahogany/files/patch-src-gui-wxMDialogs.cpp Sun Oct 5 03:10:55 2003
@@ -0,0 +1,25 @@
+--- src/gui/wxMDialogs.cpp.orig Wed Jul 23 00:01:41 2003
++++ src/gui/wxMDialogs.cpp Sun Oct 5 03:10:29 2003
+@@ -1286,19 +1286,9 @@
+ {
+ String dir, filename;
+
+- // Tips files are in @prefix@/share/Mahogany/doc/Tips/
+- dir = mApplication->GetGlobalDir();
+- if ( !dir )
+- {
+- // like this, it will work in an uninstalled copy of M too
+- dir = _T("..");
+- }
+-
+- dir << DIR_SEPARATOR << _T("doc") << DIR_SEPARATOR
+-#ifndef OS_WIN
+- << _T("Tips") << DIR_SEPARATOR
+-#endif // !Windows
+- ;
++ // Tips files are in @prefix@/share/doc/Mahogany/Tips/
++ dir << M_PREFIX << DIR_SEPARATOR << "share" << DIR_SEPARATOR << "doc";
++ dir << DIR_SEPARATOR << "Mahogany" << DIR_SEPARATOR << "Tips" << DIR_SEPARATOR;
+
+ // Tips files are either Tips_LOCALENAME.txt, e.g. Tips_de.txt or
+ // simply Tips.txt
diff -ruN /usr/ports/mail/mahogany/pkg-descr mahogany/pkg-descr
--- /usr/ports/mail/mahogany/pkg-descr Fri Nov 17 21:43:33 2000
+++ mahogany/pkg-descr Sun Oct 5 05:12:08 2003
@@ -11,8 +11,4 @@
Mahogany is being developed using the free wxWindows application framework,
building on the gtk toolkit on Unix.
-For further information, point your web browser at
-http://mahogany.sourceforge.net/
-
-- Stephen
-sk-ports@vegamuse.org
+WWW: http://mahogany.sourceforge.net/
diff -ruN /usr/ports/mail/mahogany/pkg-message mahogany/pkg-message
--- /usr/ports/mail/mahogany/pkg-message Fri Nov 17 21:43:33 2000
+++ mahogany/pkg-message Thu Jan 1 01:00:00 1970
@@ -1,6 +0,0 @@
-
-********************************************************************
-A sample configuration file (mahogany.conf.sample) has been placed in
-$(PREFIX)/etc.
-********************************************************************
-
diff -ruN /usr/ports/mail/mahogany/pkg-plist mahogany/pkg-plist
--- /usr/ports/mail/mahogany/pkg-plist Mon Feb 26 05:36:57 2001
+++ mahogany/pkg-plist Sun Oct 5 03:14:31 2003
@@ -1,19 +1,30 @@
bin/M
bin/mahogany
-etc/mahogany.conf.sample
-libdata/Mahogany/modules/Calendar.so
-libdata/Mahogany/modules/ExportPalm.so
-libdata/Mahogany/modules/ExportText.so
-libdata/Mahogany/modules/ExportVCard.so
-libdata/Mahogany/modules/Filters.so
-libdata/Mahogany/modules/ImportMailrc.so
-libdata/Mahogany/modules/ImportPine.so
-libdata/Mahogany/modules/ImportText.so
-libdata/Mahogany/modules/ImportVCard.so
-libdata/Mahogany/modules/ImportXFMail.so
-libdata/Mahogany/modules/Mdummy.so
-libdata/Mahogany/modules/PineImport.so
-libdata/Mahogany/modules/XFMailImport.so
+libexec/Mahogany/modules/ExportPalm.so
+libexec/Mahogany/modules/ExportText.so
+libexec/Mahogany/modules/ExportVCard.so
+libexec/Mahogany/modules/Filters.so
+libexec/Mahogany/modules/HtmlViewer.so
+libexec/Mahogany/modules/ImportMailrc.so
+libexec/Mahogany/modules/ImportPine.so
+libexec/Mahogany/modules/ImportText.so
+libexec/Mahogany/modules/ImportVCard.so
+libexec/Mahogany/modules/ImportXFMail.so
+libexec/Mahogany/modules/LayoutEditor.so
+libexec/Mahogany/modules/LayoutViewer.so
+libexec/Mahogany/modules/Mdummy.so
+libexec/Mahogany/modules/Migrate.so
+libexec/Mahogany/modules/NetscapeImporter.so
+libexec/Mahogany/modules/PGP.so
+libexec/Mahogany/modules/PGPEngine.so
+libexec/Mahogany/modules/PineImport.so
+libexec/Mahogany/modules/QuoteURL.so
+libexec/Mahogany/modules/Rot13.so
+libexec/Mahogany/modules/Signature.so
+libexec/Mahogany/modules/TextMarkup.so
+libexec/Mahogany/modules/TextViewer.so
+libexec/Mahogany/modules/Trailer.so
+libexec/Mahogany/modules/XFMailImport.so
share/Mahogany/afm/Cour.afm
share/Mahogany/afm/CourBo.afm
share/Mahogany/afm/CourBoO.afm
@@ -74,6 +85,7 @@
share/Mahogany/icons/folder_trash.xpm
share/Mahogany/icons/folders.xpm
share/Mahogany/icons/folderview.xpm
+share/Mahogany/icons/foldertree.xpm
share/Mahogany/icons/ftplink.xpm
share/Mahogany/icons/general.xpm
share/Mahogany/icons/help.xpm
@@ -82,19 +94,29 @@
share/Mahogany/icons/home.xpm
share/Mahogany/icons/ident.xpm
share/Mahogany/icons/image.xpm
+share/Mahogany/icons/image_both.xpm
+share/Mahogany/icons/image_mail.xpm
+share/Mahogany/icons/image_news.xpm
share/Mahogany/icons/import.xpm
share/Mahogany/icons/install_welcome.xpm
share/Mahogany/icons/mahogany.xpm
share/Mahogany/icons/message.xpm
share/Mahogany/icons/miscopt.xpm
+share/Mahogany/icons/msg_del.xpm
share/Mahogany/icons/msg_error.xpm
share/Mahogany/icons/msg_info.xpm
+share/Mahogany/icons/msg_new.xpm
+share/Mahogany/icons/msg_normal.xpm
share/Mahogany/icons/msg_question.xpm
+share/Mahogany/icons/msg_recent.xpm
share/Mahogany/icons/msg_warning.xpm
+share/Mahogany/icons/msg_unread.xpm
+share/Mahogany/icons/msg_unread_bw.xpm
share/Mahogany/icons/msgview.xpm
+share/Mahogany/icons/multipart.xpm
share/Mahogany/icons/network.xpm
share/Mahogany/icons/new.xpm
-share/Mahogany/icons/newmail_s.xpm
+share/Mahogany/icons/newmail.xpm
share/Mahogany/icons/nomail_s.xpm
share/Mahogany/icons/noxface.xpm
share/Mahogany/icons/offline.xpm
@@ -103,9 +125,15 @@
share/Mahogany/icons/postscript.xpm
share/Mahogany/icons/python.xpm
share/Mahogany/icons/pythonpower.xpm
+share/Mahogany/icons/sortdown.xpm
+share/Mahogany/icons/sortup.xpm
+share/Mahogany/icons/spam.xpm
+share/Mahogany/icons/ssllogo.xpm
+share/Mahogany/icons/sync.xpm
share/Mahogany/icons/tb_adrbook.xpm
share/Mahogany/icons/tb_attach.xpm
share/Mahogany/icons/tb_book_open.xpm
+share/Mahogany/icons/tb_check_mail.xpm
share/Mahogany/icons/tb_close.xpm
share/Mahogany/icons/tb_delete.xpm
share/Mahogany/icons/tb_document.xpm
@@ -132,314 +160,27 @@
share/Mahogany/icons/tb_undo.xpm
share/Mahogany/icons/text.xpm
share/Mahogany/icons/tgz.xpm
-share/Mahogany/icons/txt.xpm
share/Mahogany/icons/undo.xpm
share/Mahogany/icons/unknown.xpm
share/Mahogany/icons/vcard.xpm
share/Mahogany/icons/video.xpm
share/Mahogany/icons/work.xpm
+share/Mahogany/icons/wxlogo.xpm
share/Mahogany/icons/xface.xpm
share/Mahogany/kylemail.wav
+share/Mahogany/M.conf
share/Mahogany/newmail.wav
-share/Mahogany/scripts/MAppBase.py
-share/Mahogany/scripts/MObject.py
-share/Mahogany/scripts/MProfile.py
-share/Mahogany/scripts/MString.py
-share/Mahogany/scripts/MailFolder.py
-share/Mahogany/scripts/Message.py
-share/Mahogany/scripts/Minit.py
-share/Mahogany/scripts/Setup.py
-share/Mahogany/scripts/TestDialogs.py
-share/Mahogany/scripts/swiglib.py
-share/doc/Mahogany/HackersGuide/HackersGuide
-share/doc/Mahogany/HackersGuide/HackersGuide.css
-share/doc/Mahogany/HackersGuide/HackersGuide.html
-share/doc/Mahogany/HackersGuide/ID_MAP.db
-share/doc/Mahogany/HackersGuide/IMG_PARAMS.db
-share/doc/Mahogany/HackersGuide/ORIG_MAP.db
-share/doc/Mahogany/HackersGuide/aux_preamble
-share/doc/Mahogany/HackersGuide/contents.pl
-share/doc/Mahogany/HackersGuide/contents.png
-share/doc/Mahogany/HackersGuide/dependent
-share/doc/Mahogany/HackersGuide/depends_on
-share/doc/Mahogany/HackersGuide/env_style
-share/doc/Mahogany/HackersGuide/envstyles.db
-share/doc/Mahogany/HackersGuide/expanded.db
-share/doc/Mahogany/HackersGuide/global.db
-share/doc/Mahogany/HackersGuide/img_style
-share/doc/Mahogany/HackersGuide/index.html
-share/doc/Mahogany/HackersGuide/internals.pl
-share/doc/Mahogany/HackersGuide/labels.pl
-share/doc/Mahogany/HackersGuide/new_command
-share/doc/Mahogany/HackersGuide/new_theorem
-share/doc/Mahogany/HackersGuide/next.png
-share/doc/Mahogany/HackersGuide/next_g.png
-share/doc/Mahogany/HackersGuide/node1.html
-share/doc/Mahogany/HackersGuide/node10.html
-share/doc/Mahogany/HackersGuide/node11.html
-share/doc/Mahogany/HackersGuide/node12.html
-share/doc/Mahogany/HackersGuide/node13.html
-share/doc/Mahogany/HackersGuide/node14.html
-share/doc/Mahogany/HackersGuide/node15.html
-share/doc/Mahogany/HackersGuide/node16.html
-share/doc/Mahogany/HackersGuide/node17.html
-share/doc/Mahogany/HackersGuide/node18.html
-share/doc/Mahogany/HackersGuide/node19.html
-share/doc/Mahogany/HackersGuide/node2.html
-share/doc/Mahogany/HackersGuide/node20.html
-share/doc/Mahogany/HackersGuide/node21.html
-share/doc/Mahogany/HackersGuide/node22.html
-share/doc/Mahogany/HackersGuide/node23.html
-share/doc/Mahogany/HackersGuide/node24.html
-share/doc/Mahogany/HackersGuide/node25.html
-share/doc/Mahogany/HackersGuide/node26.html
-share/doc/Mahogany/HackersGuide/node27.html
-share/doc/Mahogany/HackersGuide/node28.html
-share/doc/Mahogany/HackersGuide/node29.html
-share/doc/Mahogany/HackersGuide/node3.html
-share/doc/Mahogany/HackersGuide/node30.html
-share/doc/Mahogany/HackersGuide/node31.html
-share/doc/Mahogany/HackersGuide/node32.html
-share/doc/Mahogany/HackersGuide/node33.html
-share/doc/Mahogany/HackersGuide/node34.html
-share/doc/Mahogany/HackersGuide/node35.html
-share/doc/Mahogany/HackersGuide/node36.html
-share/doc/Mahogany/HackersGuide/node37.html
-share/doc/Mahogany/HackersGuide/node38.html
-share/doc/Mahogany/HackersGuide/node39.html
-share/doc/Mahogany/HackersGuide/node4.html
-share/doc/Mahogany/HackersGuide/node40.html
-share/doc/Mahogany/HackersGuide/node41.html
-share/doc/Mahogany/HackersGuide/node42.html
-share/doc/Mahogany/HackersGuide/node43.html
-share/doc/Mahogany/HackersGuide/node44.html
-share/doc/Mahogany/HackersGuide/node45.html
-share/doc/Mahogany/HackersGuide/node46.html
-share/doc/Mahogany/HackersGuide/node47.html
-share/doc/Mahogany/HackersGuide/node48.html
-share/doc/Mahogany/HackersGuide/node49.html
-share/doc/Mahogany/HackersGuide/node5.html
-share/doc/Mahogany/HackersGuide/node50.html
-share/doc/Mahogany/HackersGuide/node51.html
-share/doc/Mahogany/HackersGuide/node52.html
-share/doc/Mahogany/HackersGuide/node53.html
-share/doc/Mahogany/HackersGuide/node54.html
-share/doc/Mahogany/HackersGuide/node6.html
-share/doc/Mahogany/HackersGuide/node7.html
-share/doc/Mahogany/HackersGuide/node8.html
-share/doc/Mahogany/HackersGuide/node9.html
-share/doc/Mahogany/HackersGuide/part_001
-share/doc/Mahogany/HackersGuide/preamble
-share/doc/Mahogany/HackersGuide/prelatex
-share/doc/Mahogany/HackersGuide/prev.png
-share/doc/Mahogany/HackersGuide/prev_g.png
-share/doc/Mahogany/HackersGuide/provide_command
-share/doc/Mahogany/HackersGuide/sections.pl
-share/doc/Mahogany/HackersGuide/styleID
-share/doc/Mahogany/HackersGuide/styleIDs.db
-share/doc/Mahogany/HackersGuide/styles
-share/doc/Mahogany/HackersGuide/txt_style
-share/doc/Mahogany/HackersGuide/txtstyles.db
-share/doc/Mahogany/HackersGuide/up.png
-share/doc/Mahogany/HackersGuide/up_g.png
-share/doc/Mahogany/HackersGuide/verb.db
-share/doc/Mahogany/HackersGuide/verb_delim.db
-share/doc/Mahogany/HackersGuide/verbatim
-share/doc/Mahogany/HackersGuide/wxhelp.map
-share/doc/Mahogany/Manual/ID_MAP.db
-share/doc/Mahogany/Manual/IMG_PARAMS.db
-share/doc/Mahogany/Manual/Manual
-share/doc/Mahogany/Manual/Manual.css
-share/doc/Mahogany/Manual/Manual.html
-share/doc/Mahogany/Manual/ORIG_MAP.db
-share/doc/Mahogany/Manual/aux_preamble
-share/doc/Mahogany/Manual/contents.pl
-share/doc/Mahogany/Manual/contents.png
-share/doc/Mahogany/Manual/crossref.png
-share/doc/Mahogany/Manual/dependent
-share/doc/Mahogany/Manual/depends_on
-share/doc/Mahogany/Manual/env_style
-share/doc/Mahogany/Manual/envstyles.db
-share/doc/Mahogany/Manual/expanded.db
-share/doc/Mahogany/Manual/global.db
-share/doc/Mahogany/Manual/img_style
-share/doc/Mahogany/Manual/index.html
-share/doc/Mahogany/Manual/internals.pl
-share/doc/Mahogany/Manual/labels.pl
-share/doc/Mahogany/Manual/new_command
-share/doc/Mahogany/Manual/new_theorem
-share/doc/Mahogany/Manual/next.png
-share/doc/Mahogany/Manual/next_g.png
-share/doc/Mahogany/Manual/node1.html
-share/doc/Mahogany/Manual/node10.html
-share/doc/Mahogany/Manual/node100.html
-share/doc/Mahogany/Manual/node101.html
-share/doc/Mahogany/Manual/node102.html
-share/doc/Mahogany/Manual/node103.html
-share/doc/Mahogany/Manual/node104.html
-share/doc/Mahogany/Manual/node105.html
-share/doc/Mahogany/Manual/node106.html
-share/doc/Mahogany/Manual/node107.html
-share/doc/Mahogany/Manual/node108.html
-share/doc/Mahogany/Manual/node109.html
-share/doc/Mahogany/Manual/node11.html
-share/doc/Mahogany/Manual/node110.html
-share/doc/Mahogany/Manual/node111.html
-share/doc/Mahogany/Manual/node112.html
-share/doc/Mahogany/Manual/node113.html
-share/doc/Mahogany/Manual/node114.html
-share/doc/Mahogany/Manual/node115.html
-share/doc/Mahogany/Manual/node116.html
-share/doc/Mahogany/Manual/node117.html
-share/doc/Mahogany/Manual/node118.html
-share/doc/Mahogany/Manual/node119.html
-share/doc/Mahogany/Manual/node12.html
-share/doc/Mahogany/Manual/node120.html
-share/doc/Mahogany/Manual/node121.html
-share/doc/Mahogany/Manual/node122.html
-share/doc/Mahogany/Manual/node123.html
-share/doc/Mahogany/Manual/node13.html
-share/doc/Mahogany/Manual/node14.html
-share/doc/Mahogany/Manual/node15.html
-share/doc/Mahogany/Manual/node16.html
-share/doc/Mahogany/Manual/node17.html
-share/doc/Mahogany/Manual/node18.html
-share/doc/Mahogany/Manual/node19.html
-share/doc/Mahogany/Manual/node2.html
-share/doc/Mahogany/Manual/node20.html
-share/doc/Mahogany/Manual/node21.html
-share/doc/Mahogany/Manual/node22.html
-share/doc/Mahogany/Manual/node23.html
-share/doc/Mahogany/Manual/node24.html
-share/doc/Mahogany/Manual/node25.html
-share/doc/Mahogany/Manual/node26.html
-share/doc/Mahogany/Manual/node27.html
-share/doc/Mahogany/Manual/node28.html
-share/doc/Mahogany/Manual/node29.html
-share/doc/Mahogany/Manual/node3.html
-share/doc/Mahogany/Manual/node30.html
-share/doc/Mahogany/Manual/node31.html
-share/doc/Mahogany/Manual/node32.html
-share/doc/Mahogany/Manual/node33.html
-share/doc/Mahogany/Manual/node34.html
-share/doc/Mahogany/Manual/node35.html
-share/doc/Mahogany/Manual/node36.html
-share/doc/Mahogany/Manual/node37.html
-share/doc/Mahogany/Manual/node38.html
-share/doc/Mahogany/Manual/node39.html
-share/doc/Mahogany/Manual/node4.html
-share/doc/Mahogany/Manual/node40.html
-share/doc/Mahogany/Manual/node41.html
-share/doc/Mahogany/Manual/node42.html
-share/doc/Mahogany/Manual/node43.html
-share/doc/Mahogany/Manual/node44.html
-share/doc/Mahogany/Manual/node45.html
-share/doc/Mahogany/Manual/node46.html
-share/doc/Mahogany/Manual/node47.html
-share/doc/Mahogany/Manual/node48.html
-share/doc/Mahogany/Manual/node49.html
-share/doc/Mahogany/Manual/node5.html
-share/doc/Mahogany/Manual/node50.html
-share/doc/Mahogany/Manual/node51.html
-share/doc/Mahogany/Manual/node52.html
-share/doc/Mahogany/Manual/node53.html
-share/doc/Mahogany/Manual/node54.html
-share/doc/Mahogany/Manual/node55.html
-share/doc/Mahogany/Manual/node56.html
-share/doc/Mahogany/Manual/node57.html
-share/doc/Mahogany/Manual/node58.html
-share/doc/Mahogany/Manual/node59.html
-share/doc/Mahogany/Manual/node6.html
-share/doc/Mahogany/Manual/node60.html
-share/doc/Mahogany/Manual/node61.html
-share/doc/Mahogany/Manual/node62.html
-share/doc/Mahogany/Manual/node63.html
-share/doc/Mahogany/Manual/node64.html
-share/doc/Mahogany/Manual/node65.html
-share/doc/Mahogany/Manual/node66.html
-share/doc/Mahogany/Manual/node67.html
-share/doc/Mahogany/Manual/node68.html
-share/doc/Mahogany/Manual/node69.html
-share/doc/Mahogany/Manual/node7.html
-share/doc/Mahogany/Manual/node70.html
-share/doc/Mahogany/Manual/node71.html
-share/doc/Mahogany/Manual/node72.html
-share/doc/Mahogany/Manual/node73.html
-share/doc/Mahogany/Manual/node74.html
-share/doc/Mahogany/Manual/node75.html
-share/doc/Mahogany/Manual/node76.html
-share/doc/Mahogany/Manual/node77.html
-share/doc/Mahogany/Manual/node78.html
-share/doc/Mahogany/Manual/node79.html
-share/doc/Mahogany/Manual/node8.html
-share/doc/Mahogany/Manual/node80.html
-share/doc/Mahogany/Manual/node81.html
-share/doc/Mahogany/Manual/node82.html
-share/doc/Mahogany/Manual/node83.html
-share/doc/Mahogany/Manual/node84.html
-share/doc/Mahogany/Manual/node85.html
-share/doc/Mahogany/Manual/node86.html
-share/doc/Mahogany/Manual/node87.html
-share/doc/Mahogany/Manual/node88.html
-share/doc/Mahogany/Manual/node89.html
-share/doc/Mahogany/Manual/node9.html
-share/doc/Mahogany/Manual/node90.html
-share/doc/Mahogany/Manual/node91.html
-share/doc/Mahogany/Manual/node92.html
-share/doc/Mahogany/Manual/node93.html
-share/doc/Mahogany/Manual/node94.html
-share/doc/Mahogany/Manual/node95.html
-share/doc/Mahogany/Manual/node96.html
-share/doc/Mahogany/Manual/node97.html
-share/doc/Mahogany/Manual/node98.html
-share/doc/Mahogany/Manual/node99.html
-share/doc/Mahogany/Manual/part_001
-share/doc/Mahogany/Manual/preamble
-share/doc/Mahogany/Manual/prelatex
-share/doc/Mahogany/Manual/prev.png
-share/doc/Mahogany/Manual/prev_g.png
-share/doc/Mahogany/Manual/sections.pl
-share/doc/Mahogany/Manual/styleID
-share/doc/Mahogany/Manual/styleIDs.db
-share/doc/Mahogany/Manual/styles
-share/doc/Mahogany/Manual/txt_style
-share/doc/Mahogany/Manual/txtstyles.db
-share/doc/Mahogany/Manual/up.png
-share/doc/Mahogany/Manual/up_g.png
-share/doc/Mahogany/Manual/verb.db
-share/doc/Mahogany/Manual/verb_delim.db
-share/doc/Mahogany/Manual/verbatim
-share/doc/Mahogany/Manual/wxhelp.map
-share/doc/Mahogany/Pdf/HackersGuide.pdf
-share/doc/Mahogany/Pdf/Manual.pdf
-share/doc/Mahogany/Python/MAppBase_wrap.html
-share/doc/Mahogany/Python/MObject_wrap.html
-share/doc/Mahogany/Python/MProfile_wrap.html
-share/doc/Mahogany/Python/MString_wrap.html
-share/doc/Mahogany/Python/MailFolder_wrap.html
-share/doc/Mahogany/Python/Message_wrap.html
-share/doc/Mahogany/README
-share/doc/Mahogany/TODO
share/doc/Mahogany/Tips/Tips.txt
-share/doc/Mahogany/wxhelp.map
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/cz/LC_MESSAGES/wxstd.mo
share/locale/de/LC_MESSAGES/M.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
share/locale/es/LC_MESSAGES/M.mo
share/locale/fi/LC_MESSAGES/M.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
share/locale/fr/LC_MESSAGES/M.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
share/locale/it/LC_MESSAGES/M.mo
share/locale/nl/LC_MESSAGES/M.mo
+share/locale/pt/LC_MESSAGES/M.mo
share/locale/pt_BR/LC_MESSAGES/M.mo
-@dirrm libdata/Mahogany/modules
-@dirrm libdata/Mahogany
-@dirrm share/doc/Mahogany/HackersGuide
-@dirrm share/doc/Mahogany/Manual
-@dirrm share/doc/Mahogany/Pdf
-@dirrm share/doc/Mahogany/Python
+@dirrm libexec/Mahogany/modules
+@dirrm libexec/Mahogany
@dirrm share/doc/Mahogany/Tips
@dirrm share/doc/Mahogany
@dirrm share/Mahogany/afm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310050441.h954fCq3053094>