20 files changed, 0 insertions, 847 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 8a6bd94c7991..a6597f730b1e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -220,7 +220,6 @@
     SUBDIR += kavmilter
     SUBDIR += kbiff
     SUBDIR += kcheckgmail
-    SUBDIR += kiltdown
     SUBDIR += kshowmail
     SUBDIR += lbdb
     SUBDIR += lens
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
deleted file mode 100644
index 64471dbb06ed..000000000000
--- a/mail/kiltdown/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# New ports collection makefile for:	kiltdown
-# Date Created:				16 Jun 2001
-# Whom:					dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kiltdown
-PORTVERSION=	0.8.045
-PORTREVISION=	14
-CATEGORIES=	mail
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Kiltdown is an UI independant Email Client for UNIX
-
-LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
-
-PLIST_FILES=	bin/kiltdown
-
-USE_QT_VER=	3
-USE_GMAKE=	yes
-MY_CONFIGURE_ARGS=	-release
-MY_CONFIGURE_ARGS+=	-qtinc ${LOCALBASE}/include -qtlib ${LOCALBASE}/lib
-MY_CONFIGURE_ARGS+=	-dbinc ${LOCALBASE}/include/db3 -dblib ${LOCALBASE}/lib
-BUILD_ENV+=		PATH=${PATH}:${LOCALBASE}/bin
-MAKE_JOBS_UNSAFE=	yes
-
-post-patch:
-	@${MV} ${WRKSRC}/configs/bsd-generic ${WRKSRC}/configs/bsd-generic.sed
-	${SED} \
-	 -e "s|SYS_CFLAGS=-pthread|SYS_CFLAGS=${PTHREAD_CFLAGS} ${CFLAGS}|" \
-	 -e "s|SYS_LDFLAGS=-pthread|SYS_LDFLAGS=${PTHREAD_LIBS} ${LDFLAGS}|" \
-		${WRKSRC}/configs/bsd-generic.sed \
-		> ${WRKSRC}/configs/bsd-generic
-
-do-configure:
-	(cd ${CONFIGURE_WRKSRC} && \
-		./${CONFIGURE_SCRIPT} ${MY_CONFIGURE_ARGS} )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kiltdown/kiltdown ${PREFIX}/bin/
-
-BROKEN=		does not build
-DEPRECATED=	upstream seems dead since 2001
-EXPIRATION_DATE=2011-04-30
-
-.include <bsd.port.mk>
diff --git a/mail/kiltdown/distinfo b/mail/kiltdown/distinfo
deleted file mode 100644
index a8103c5e7533..000000000000
--- a/mail/kiltdown/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kiltdown-0.8.045.tar.gz) = ae1f8bca6bb522a792a919292d8f084b378502fd46f1d51d234ce398f62bd00d
-SIZE (kiltdown-0.8.045.tar.gz) = 426199
diff --git a/mail/kiltdown/files/patch-Makefile.in b/mail/kiltdown/files/patch-Makefile.in
deleted file mode 100644
index c0ceaa6d5254..000000000000
--- a/mail/kiltdown/files/patch-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- kiltdown/Makefile.in	Mon May 14 05:25:23 2001
-+++ kiltdown/Makefile.in	Thu Dec 27 06:20:25 2001
-@@ -13,5 +61,5 @@
- ###################################################################
- #
--.SUFFIXES: .cc .c .o .ui .hmoc .ccmoc
-+.SUFFIXES: .cc .c .o .dlg.ui .hmoc .ccmoc .dlg.h dlg.cc
- 
- 
-@@ -21,7 +21,7 @@
- ###################################################################
- #
- 
--MOC=$(QTBIN)moc
-+MOC=$(QTBIN)moc
- UIC=$(QTBIN)uic
- RESCOMP=../tools/rescomp
- DLGSTRIP=../tools/dlgstrip
-@@ -27,8 +75,8 @@
- DLGSTRIP=../tools/dlgstrip
- ALLINCLUDES=$(SYS_INCLUDE) $(USER_INC) -I$(DBINC) -I$(QTINC) -I$(X11INCLUDE) -I../include
--CFLAGSBASE=-DQT_THREAD_SUPPORT $(OPT_DEFINES) $(SYS_CFLAGS) $(ALLINCLUDES) -Wall
-+CFLAGSBASE=-DQT_THREAD_SUPPORT $(OPT_DEFINES) $(SYS_CFLAGS) $(ALLINCLUDES) -Wall -Wno-uninitialized -Werror
- CFLAGS=$(CFLAGSBASE) -fno-implicit-templates
- LDFLAGS= $(SYS_LDFLAGS) -L$(QTLIB) -L$(DBLIB) -L$(X11LIB) $(USER_LPATH)
--LIBS=-lSM -lX11 -lXext -lICE -lqt-mt -ldb $(JPEGLIB) $(SYS_LIBS) $(USER_LIBS)
-+LIBS=-lSM -lX11 -lXext -lICE -lqt-mt -ldb3 $(JPEGLIB) $(SYS_LIBS) $(USER_LIBS)
- 
- #
-@@ -188,7 +236,9 @@
- 	$(CXX) -c $(CFLAGS) $<
- 
--.ui.cc:
--	$(UIC) -o $*.h $<
--	$(UIC) -tr "" -i $*.h -o $*.cc $<
-+%.dlg.h: %.dlg.ui
-+	$(UIC) -o $*.dlg.h $<
-+
-+%.dlg.cc: %.dlg.h %.dlg.ui
-+	$(UIC) -tr "" -i $*.dlg.h -o $*.dlg.cc $*.dlg.ui
- 
- .hmoc.h:
diff --git a/mail/kiltdown/files/patch-configure b/mail/kiltdown/files/patch-configure
deleted file mode 100644
index 714d78cf6a24..000000000000
--- a/mail/kiltdown/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon May 14 05:25:23 2001
-+++ configure	Sat Jul 14 07:43:13 2001
-@@ -337,7 +337,6 @@
-     echo
-     echo
-     
--    exit 1;
- fi
- echo ok.
- 
diff --git a/mail/kiltdown/files/patch-fixes b/mail/kiltdown/files/patch-fixes
deleted file mode 100644
index 6156eda48ff7..000000000000
--- a/mail/kiltdown/files/patch-fixes
+++ /dev/null
@@ -1,257 +0,0 @@
---- kiltdown/accountdlg.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/accountdlg.cc	2008-05-21 23:02:15.000000000 -0400
-@@ -141,9 +141,9 @@
- void AccountsDialog::addNewAccount()
- {
--    LinkList<unsigned int> list;
-+    LinkList<void *> list;
-     const char *pstr, *pstr2;
-     ISubsystem *s = NULL;
-     SelectMeDialog smd;
--    unsigned int ui;
-+    ISubsystem *ui;
-     ERRCODE er;
-     int ret;
-@@ -172,5 +172,5 @@
-         s->getDisplayName(&pstr);
-         if (pstr) {
--            smd.addItem(pstr, (unsigned int)s);
-+            smd.addItem(pstr, (void *)s);
-             localFree(pstr);
-         }
-@@ -188,8 +188,8 @@
-     if (ret == QDialog::Accepted) {
-         
--        ui = 0;
-+        ui = NULL;
-         smd.getSelectedItems(list);
--        list.firstElement(&ui);
--        if ((ISubsystem *)ui) ((ISubsystem *)ui)->createNewAccount();
-+        list.firstElement((void **)&ui);
-+        if (ui) ui->createNewAccount();
- 
-         LinkList<IAccount *> accts;
---- kiltdown/attachment.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/attachment.cc	2008-05-21 23:45:53.000000000 -0400
-@@ -363,5 +363,6 @@
-  *                              sequent calls to this will clobber old vals.
-  */
--char * Attachment::getPrintableSize()
-+const char *
-+Attachment::getPrintableSize()
- {
-     struct stat info;
---- kiltdown/attachment.h	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/attachment.h	2008-05-21 23:46:11.000000000 -0400
-@@ -47,5 +47,5 @@
-     ERRCODE getFullPath(const char **);
- 
--    char *getPrintableSize();
-+    const char *getPrintableSize();
- 
-     QPixmap *chooseIcon();
---- kiltdown/base64.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/base64.cc	2008-05-21 23:48:03.000000000 -0400
-@@ -146,5 +146,5 @@
-                  */
-                 if (inputBuf[cloop] != '=') {
--                    holdVals[cheld] = byteFromChar[inputBuf[cloop]];
-+                    holdVals[cheld] = byteFromChar[(unsigned int)inputBuf[cloop]];
-                     cheld++;
-                 } else {
-@@ -445,5 +445,5 @@
-              */
-             if (decodeMe[cloop] != '=') {
--                holdVals[cheld] = byteFromChar[decodeMe[cloop]];
-+                holdVals[cheld] = byteFromChar[(unsigned int)decodeMe[cloop]];
-                 cheld++;
-             } else {
---- kiltdown/foldersort.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/foldersort.cc	2008-05-21 23:41:49.000000000 -0400
-@@ -12,5 +12,5 @@
- 
- #include <ctype.h>
--
-+#include <stdint.h>
- 
- #include "address.h"
-@@ -69,5 +69,5 @@
- (
-     int col,
--    unsigned int itemData,
-+    void * itemData,
-     KMailListItem *item1,
-     KMailListItem *item2
-@@ -76,5 +76,5 @@
-     time_t t1, t2;
- 
--    switch ((MailColumn)itemData) {
-+    switch ((MailColumn)(uintptr_t)itemData) {
-         case MC_SENT:
-             ((MailMessage *)item1->itemData)->getSent(&t1);
-@@ -116,5 +116,5 @@
- (
-     int col,
--    unsigned int itemData,
-+    void * itemData,
-     KMailListItem *item1,
-     KMailListItem *item2
-@@ -146,5 +146,5 @@
- (
-     int col,
--    unsigned int itemData,
-+    void * itemData,
-     KMailListItem *item1,
-     KMailListItem *item2
-@@ -167,5 +167,5 @@
-             return 1;
-         case 3: 
--            switch ((MailColumn)itemData) {
-+            switch ((MailColumn)(uintptr_t)itemData) {
- 
-                 case MC_SUBJECT:
---- kiltdown/foldersort.h	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/foldersort.h	2008-05-21 23:08:01.000000000 -0400
-@@ -23,7 +23,7 @@
-  * Defines routines used for sorting items in folders.
-  */
--int messageSortString(int, unsigned int, KMailListItem *, KMailListItem *);
--int messageSortPixmap(int, unsigned int, KMailListItem *, KMailListItem *);
--int messageSortDate(int, unsigned int, KMailListItem *, KMailListItem *);
-+int messageSortString(int, void *, KMailListItem *, KMailListItem *);
-+int messageSortPixmap(int, void *, KMailListItem *, KMailListItem *);
-+int messageSortDate(int, void *, KMailListItem *, KMailListItem *);
-  
- 
---- kiltdown/maildownload.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/maildownload.cc	2008-05-21 23:48:46.000000000 -0400
-@@ -173,5 +173,5 @@
- /**
-  * This is used globally.
-- * UNDONE: marcw, 2001.2.2 -- should this be TLS ??/
-+ * UNDONE: marcw, 2001.2.2 -- should this be TLS ??
-  */
- CrossThreadManager *far = NULL;
---- kiltdown/mimeheader.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/mimeheader.cc	2008-05-21 23:53:29.000000000 -0400
-@@ -1002,5 +1002,6 @@
-     while (sep[index] != '\n' && sep[index] != '\r'
-            && sep[index] != '\0' && (index + 2 < (int)sizeof(buf))) {
--        buf[index + 2] = sep[index++];
-+        buf[index + 2] = sep[index];
-+        index++;
-     }
- 
---- kiltdown/selectme.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/selectme.cc	2008-05-21 22:55:50.000000000 -0400
-@@ -29,11 +29,11 @@
- 
-   public:
--    ListBoxTextEx(QListBox *a, const QString &b, unsigned int c)
-+    ListBoxTextEx(QListBox *a, const QString &b, void *c)
-         : QListBoxText(a, b, 0), itemData(c) { }
-     
--    unsigned int getItemData() { return this->itemData; }
-+    void * getItemData() { return this->itemData; }
- 
-   private:
--    const unsigned int itemData;
-+    void *itemData;
- };
- 
-@@ -79,5 +79,5 @@
-  * Parameters:
-  *      const char *            - [in]  item.
-- *      unsigned int            - [in]  item data.
-+ *      void *            - [in]  item data.
-  *
-  * Output:
-@@ -87,5 +87,5 @@
- (
-     const char *item,
--    unsigned int itemData
-+    void *itemData
- )
- {
-@@ -169,5 +169,5 @@
- ERRCODE SelectMeDialog::getSelectedItems
- (
--    LinkList<unsigned int> & results
-+    LinkList<void *> & results
- )
- {
---- kiltdown/selectme.h	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/selectme.h	2008-05-21 22:56:51.000000000 -0400
-@@ -41,6 +41,6 @@
-      */
-     ERRCODE initializeUI(const char *title, const char *caption, bool multi = true);
--    ERRCODE addItem(const char *item, unsigned int itemData);
--    ERRCODE getSelectedItems(LinkList<unsigned int> &);
-+    ERRCODE addItem(const char *item, void * itemData);
-+    ERRCODE getSelectedItems(LinkList<void *> &);
-     void    selectAll();
- 
---- kiltdown/template.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/template.cc	2008-05-21 23:41:20.000000000 -0400
-@@ -30,5 +30,5 @@
- template class LinkList<QPopupMenu *>;
- template class LinkList<MailFolder *>;
--template class LinkList<unsigned int>;
-+template class LinkList<void *>;
- template class LinkList<const char **>;
- template class LinkList<ISubsystem *>;
---- include/kmaillist.h	2001-05-13 23:25:23.000000000 -0400
-+++ include/kmaillist.h	2008-05-22 00:10:06.000000000 -0400
-@@ -75,6 +75,6 @@
-     ColumnWidth type;
-     ColumnSorting sort;
--    unsigned int itemData;
--    int (*sortfn)(int, unsigned int, KMailListItem *, KMailListItem *);
-+    void * itemData;
-+    int (*sortfn)(int, void *, KMailListItem *, KMailListItem *);
- };
- 
-@@ -99,5 +99,5 @@
-     int ccolumns;
-     bool boldEntry;                         // should all the text be bolded?
--    unsigned int itemData;                  // whatever you want.
-+    void * itemData;                  // whatever you want.
- };
- 
-@@ -178,5 +178,5 @@
-      * just yet.
-      */
--    ERRCODE getSelectedRows(LinkList<unsigned int> &);
-+    ERRCODE getSelectedRows(LinkList<void *> &);
- 
-     /**
-@@ -191,5 +191,5 @@
-      * other identifiers.
-      */
--    ERRCODE removeRows(int count, unsigned int *itemDataArray);
-+    ERRCODE removeRows(int count, void * *itemDataArray);
- 
-     /**
-@@ -203,5 +203,5 @@
-      * Given an identifier for a row, select it.
-      */
--    ERRCODE selectRowFromItemData(unsigned int);
-+    ERRCODE selectRowFromItemData(void *);
- 
-     /**
-@@ -216,5 +216,5 @@
-      * the columns.
-      */
--    ERRCODE updateRowFromItemData(unsigned int, KMailListItem *rowData);
-+    ERRCODE updateRowFromItemData(void *, KMailListItem *rowData);
- 
-     /**
-@@ -223,6 +223,6 @@
-      * NULL if the item is no longer in the list, or at the end/beginning.
-      */
--    KMailListItem *nextItem(unsigned int);
--    KMailListItem *previousItem(unsigned int);
-+    KMailListItem *nextItem(void *);
-+    KMailListItem *previousItem(void *);
- 
-     /**
diff --git a/mail/kiltdown/files/patch-folderdb.cc b/mail/kiltdown/files/patch-folderdb.cc
deleted file mode 100644
index 01373a00dbdc..000000000000
--- a/mail/kiltdown/files/patch-folderdb.cc
+++ /dev/null
@@ -1,53 +0,0 @@
---- kiltdown/folderdb.cc.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/folderdb.cc	Sun Aug 10 14:40:43 2003
-@@ -152,35 +152,35 @@
- } persistenceTable [] = {
- 
-     // sender
--    { PT_STRINGLIST, 1, {(void (MailMessage::*)())&MailMessage::getSenders}, {(void (MailMessage::*)())&MailMessage::setSenders} },
-+    { PT_STRINGLIST, 1, (void (MailMessage::*)())&MailMessage::getSenders, (void (MailMessage::*)())&MailMessage::setSenders },
-     // realsender
--    { PT_STRING, 1, {(void (MailMessage::*)())&MailMessage::getRealSender}, {(void (MailMessage::*)())&MailMessage::setRealSender} },
-+    { PT_STRING, 1, (void (MailMessage::*)())&MailMessage::getRealSender, (void (MailMessage::*)())&MailMessage::setRealSender },
-     // recipient(s)
--    { PT_STRINGLIST, 1, {(void (MailMessage::*)())&MailMessage::getRecipients}, {(void (MailMessage::*)())&MailMessage::setRecipients} },
-+    { PT_STRINGLIST, 1, (void (MailMessage::*)())&MailMessage::getRecipients, (void (MailMessage::*)())&MailMessage::setRecipients },
-     // replyto
--    { PT_STRING, 2, {(void (MailMessage::*)())&MailMessage::getReplyTo}, {(void (MailMessage::*)())&MailMessage::setReplyTo} },
-+    { PT_STRING, 2, (void (MailMessage::*)())&MailMessage::getReplyTo, (void (MailMessage::*)())&MailMessage::setReplyTo },
-     // returnpath
--    { PT_STRING, 2, {(void (MailMessage::*)())&MailMessage::getReturnPath}, {(void (MailMessage::*)())&MailMessage::setReturnPath} },
-+    { PT_STRING, 2, (void (MailMessage::*)())&MailMessage::getReturnPath, (void (MailMessage::*)())&MailMessage::setReturnPath },
-     // cc(s)
--    { PT_STRINGLIST, 1, {(void (MailMessage::*)())&MailMessage::getCCs}, {(void (MailMessage::*)())&MailMessage::setCCs} },
-+    { PT_STRINGLIST, 1, (void (MailMessage::*)())&MailMessage::getCCs, (void (MailMessage::*)())&MailMessage::setCCs },
-     // bcc(s)
--    { PT_STRINGLIST, 1, {(void (MailMessage::*)())&MailMessage::getBCCs}, {(void (MailMessage::*)())&MailMessage::setBCCs} },
-+    { PT_STRINGLIST, 1, (void (MailMessage::*)())&MailMessage::getBCCs, (void (MailMessage::*)())&MailMessage::setBCCs },
-     // subject
--    { PT_STRING, 1, {(void (MailMessage::*)())&MailMessage::getSubject}, {(void (MailMessage::*)())&MailMessage::setSubject} },
-+    { PT_STRING, 1, (void (MailMessage::*)())&MailMessage::getSubject, (void (MailMessage::*)())&MailMessage::setSubject },
-     // sent
--    { PT_DATE, 1, {(void (MailMessage::*)())(ERRCODE (MailMessage::*)(time_t *))&MailMessage::getSent}, {(void (MailMessage::*)())&MailMessage::setSent}  },
-+    { PT_DATE, 1, (void (MailMessage::*)())(ERRCODE (MailMessage::*)(time_t *))&MailMessage::getSent, (void (MailMessage::*)())&MailMessage::setSent },
-     // received
--    { PT_DATE, 1, {(void (MailMessage::*)())(ERRCODE (MailMessage::*)(time_t *))&MailMessage::getReceived}, {(void (MailMessage::*)())&MailMessage::setReceived} },
-+    { PT_DATE, 1, (void (MailMessage::*)())(ERRCODE (MailMessage::*)(time_t *))&MailMessage::getReceived, (void (MailMessage::*)())&MailMessage::setReceived },
-     // has attachment(s)
--    { PT_BOOLEAN, 1, {(void (MailMessage::*)())&MailMessage::getHasAttachments}, {(void (MailMessage::*)())&MailMessage::setHasAttachments} },
-+    { PT_BOOLEAN, 1, (void (MailMessage::*)())&MailMessage::getHasAttachments, (void (MailMessage::*)())&MailMessage::setHasAttachments },
-     // priority
--    { PT_INTEGER, 1, {(void (MailMessage::*)())&MailMessage::getPriority}, {(void (MailMessage::*)())&MailMessage::setPriority} },
-+    { PT_INTEGER, 1, (void (MailMessage::*)())&MailMessage::getPriority, (void (MailMessage::*)())&MailMessage::setPriority },
-     // size
--    { PT_INTEGER, 1, {(void (MailMessage::*)())&MailMessage::getSize}, {(void (MailMessage::*)())&MailMessage::setSize} },
-+    { PT_INTEGER, 1, (void (MailMessage::*)())&MailMessage::getSize, (void (MailMessage::*)())&MailMessage::setSize },
-     // status
--    { PT_INTEGER, 1, {(void (MailMessage::*)())&MailMessage::getStatus}, {(void (MailMessage::*)())&MailMessage::setStatus} },
-+    { PT_INTEGER, 1, (void (MailMessage::*)())&MailMessage::getStatus, (void (MailMessage::*)())&MailMessage::setStatus },
-     // extra headers
--    { PT_STRINGLIST, 1, {(void (MailMessage::*)())&MailMessage::getExtraHeaders}, {(void (MailMessage::*)())&MailMessage::setExtraHeaders} },
-+    { PT_STRINGLIST, 1, (void (MailMessage::*)())&MailMessage::getExtraHeaders, (void (MailMessage::*)())&MailMessage::setExtraHeaders },
- 
-     // that's it!
-     { PT_FINITO, -1, NULL, NULL }
diff --git a/mail/kiltdown/files/patch-folderview.cc b/mail/kiltdown/files/patch-folderview.cc
deleted file mode 100644
index 2ba7caa2b307..000000000000
--- a/mail/kiltdown/files/patch-folderview.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- kiltdown/folderview.cc.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/folderview.cc	Mon Sep  9 06:47:52 2002
-@@ -15,6 +15,7 @@
- #include <qlineedit.h>
- #include <qmessagebox.h>
- #include <qpopupmenu.h>
-+#include <qpainter.h>
- #include <string.h>
- 
- #include "folderview.h"
diff --git a/mail/kiltdown/files/patch-folderview.h b/mail/kiltdown/files/patch-folderview.h
deleted file mode 100644
index d9532354094e..000000000000
--- a/mail/kiltdown/files/patch-folderview.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kiltdown/folderview.h.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/folderview.h	Wed Dec 25 11:40:29 2002
-@@ -118,7 +118,7 @@
-      * All objects using Qt extensions such as slots and signals need this.
-      */
-     Q_OBJECT
--    friend AccountManager;
-+    friend class AccountManager;
- 
-   public:
-     FolderView(QWidget *);
diff --git a/mail/kiltdown/files/patch-hoverbutton.cc b/mail/kiltdown/files/patch-hoverbutton.cc
deleted file mode 100644
index 90c04958d870..000000000000
--- a/mail/kiltdown/files/patch-hoverbutton.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- kiltdown/hoverbutton.cc.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/hoverbutton.cc	Wed Dec 25 12:29:01 2002
-@@ -28,7 +28,7 @@
- (
-     const QString & text,
-     QWidget * parent,
--    const char * name=0
-+    const char * name
- ) : QPushButton(text, parent, name)
- {
-     this->setFlat(true);
-@@ -47,7 +47,7 @@
-     const QIconSet & icon,
-     const QString & text,
-     QWidget * parent,
--    const char * name=0
-+    const char * name
- ) : QPushButton(icon, text, parent, name)
- {
-     this->setFlat(true);
diff --git a/mail/kiltdown/files/patch-kiltdown.ccmoc b/mail/kiltdown/files/patch-kiltdown.ccmoc
deleted file mode 100644
index 35bfba993093..000000000000
--- a/mail/kiltdown/files/patch-kiltdown.ccmoc
+++ /dev/null
@@ -1,11 +0,0 @@
---- kiltdown/kiltdown.ccmoc.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/kiltdown.ccmoc	Mon Sep  9 12:11:24 2002
-@@ -1115,7 +1115,7 @@
-                                              this, mainToolBarData[i].member,
-                                              mainToolBar, NULL);
-                 } else {
--                    button = new QToolButton(NULL,
-+                    button = new QToolButton(QPixmap(),
-                                              label ? QString(label) : QString::null,
-                                              QString::null,
-                                              this, mainToolBarData[i].member,
diff --git a/mail/kiltdown/files/patch-kmaillist.cc b/mail/kiltdown/files/patch-kmaillist.cc
deleted file mode 100644
index 4dc7530b97f1..000000000000
--- a/mail/kiltdown/files/patch-kmaillist.cc
+++ /dev/null
@@ -1,93 +0,0 @@
---- kiltdown/kmaillist.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/kmaillist.cc	2008-05-21 23:23:49.000000000 -0400
-@@ -13,4 +13,5 @@
- #include <qdrawutil.h>
- #include <qpainter.h>
-+#include <qstyle.h>
- #include <stdio.h>
- #include <string.h>
-@@ -617,4 +618,5 @@
-     int colwidth, colleft = PAD;
-     int x;
-+    QRect *rect;
- 
-     /**
-@@ -647,6 +649,10 @@
-         if (!_backgroundBrush) return;
- 
--        style().drawBevelButton(&painter, colleft, 0, colwidth, getRowHeight(), 
--                                cg, headers[x].pressed, _backgroundBrush);
-+	rect = new QRect( colleft, 0, colwidth, getRowHeight() );
-+        style().drawPrimitive( QStyle::PE_ButtonBevel, &painter, *rect, cg,
-+				headers[x].pressed ?
-+					QStyle::Style_Default :
-+					QStyle::Style_Sunken );
-+	delete rect;
- 
-         /**
-@@ -1252,5 +1258,5 @@
- ERRCODE KMailList::getSelectedRows
- (
--    LinkList<unsigned int> &list
-+    LinkList<void *> &list
- )
- {
-@@ -1718,13 +1724,13 @@
-                         && (headers[z - 1].type != CW_FIXED)) {
- 
--                        this->setCursor(SplitVCursor);
-+                        this->setCursor(splitVCursor);
-                         break;
-                     } else {
--                        this->setCursor(ArrowCursor);
-+                        this->setCursor(arrowCursor);
-                         w += headers[z].widthCache;
-                     }
-                 }
-             } else {
--                this->setCursor(ArrowCursor);
-+                this->setCursor(arrowCursor);
-             }
-             }
-@@ -1984,5 +1990,5 @@
- KMailListItem *KMailList::nextItem
- (
--    unsigned int itemData
-+    void * itemData
- )
- {
-@@ -2301,5 +2307,5 @@
- KMailListItem *KMailList::previousItem
- (
--    unsigned int itemData
-+    void * itemData
- )
- {
-@@ -2335,5 +2341,5 @@
- (
-     int count,
--    unsigned int *itemDataArray
-+    void **itemDataArray
- )
- {
-@@ -2472,5 +2478,5 @@
-      * Finally, reset the cursor, mode, and repaint ourself.
-      */
--    this->setCursor(ArrowCursor);
-+    this->setCursor(arrowCursor);
-     this->mouseMode = MMNormal;
-     emitColumnsChanged();
-@@ -2571,5 +2577,5 @@
- ERRCODE KMailList::selectRowFromItemData
- (
--    unsigned int itemData
-+    void * itemData
- )
- {
-@@ -2779,5 +2785,5 @@
- ERRCODE KMailList::updateRowFromItemData
- (
--    unsigned int itemData,
-+    void * itemData,
-     KMailListItem *newRow
- )
diff --git a/mail/kiltdown/files/patch-kwindowbase.ccmoc b/mail/kiltdown/files/patch-kwindowbase.ccmoc
deleted file mode 100644
index 0bfce88aa79f..000000000000
--- a/mail/kiltdown/files/patch-kwindowbase.ccmoc
+++ /dev/null
@@ -1,11 +0,0 @@
---- kiltdown/kwindowbase.ccmoc.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/kwindowbase.ccmoc	Mon Sep  9 12:11:24 2002
-@@ -373,7 +373,7 @@
-                                              receiver, toolBarData[i].member,
-                                              localToolBar, NULL);
-                 } else {
--                    button = new QToolButton(NULL,
-+                    button = new QToolButton(QPixmap(),
-                                              label ? QString(label) : QString::null,
-                                              QString::null,
-                                              receiver, toolBarData[i].member,
diff --git a/mail/kiltdown/files/patch-maileditwindow.cc b/mail/kiltdown/files/patch-maileditwindow.cc
deleted file mode 100644
index c6bd8f883d38..000000000000
--- a/mail/kiltdown/files/patch-maileditwindow.cc
+++ /dev/null
@@ -1,79 +0,0 @@
---- kiltdown/maileditwindow.cc.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/maileditwindow.cc	Mon Sep  9 12:02:02 2002
-@@ -451,7 +451,7 @@
-     er = (*pwindow)->initialize();
-     RETURN_ON_FAILURE(er);
- 
--    (*pwindow)->editBox->setUndoEnabled(false);
-+    //(*pwindow)->editBox->setUndoEnabled(false);
- 
-     /**
-      * Lastly, insert the user's signature.
-@@ -461,7 +461,7 @@
- 
-     (*pwindow)->editBox->insert("\n");
-     (*pwindow)->editBox->setCursorPosition(0, 0);
--    (*pwindow)->editBox->setUndoEnabled(true);
-+    //(*pwindow)->editBox->setUndoEnabled(true);
- 
-     return S_OK;
- }
-@@ -1008,7 +1008,7 @@
-     localFree(subject);
- 
-     (*pwindow)->subjectEdit->setText(buf);
--    (*pwindow)->editBox->setUndoEnabled(false);
-+    //(*pwindow)->editBox->setUndoEnabled(false);
- 
-     /**
-      * now go and extract the to/from information and write out the header.
-@@ -1041,7 +1041,7 @@
-     (*pwindow)->editBox->insert("\n\n\n");
-     (*pwindow)->editBox->setCursorPosition(0, 0);
-     (*pwindow)->toEdit->setFocus();
--    (*pwindow)->editBox->setUndoEnabled(true);
-+    //(*pwindow)->editBox->setUndoEnabled(true);
- 
- 
-     return S_OK;
-@@ -2121,7 +2121,7 @@
-     er = (*pwindow)->initialize();
-     GOTO_ON_FAILURE(er, Error);
- 
--    (*pwindow)->editBox->setUndoEnabled(false);
-+    //(*pwindow)->editBox->setUndoEnabled(false);
-     (*pwindow)->toEdit->clear();
-     (*pwindow)->ccEdit->clear();
- 
-@@ -2211,11 +2211,11 @@
-     (*pwindow)->editBox->setCursorPosition(0, 0);
-     (*pwindow)->toEdit->setFocus();
- 
--    (*pwindow)->editBox->setUndoEnabled(true);
-+    //(*pwindow)->editBox->setUndoEnabled(true);
-     return S_OK;
- 
-   Error:
--      (*pwindow)->editBox->setUndoEnabled(true);
-+      //(*pwindow)->editBox->setUndoEnabled(true);
-     delete *pwindow;
-     return er;
- 
-@@ -2593,7 +2593,7 @@
-     const char *pstr;
-     ERRCODE er;
- 
--    editbox->setUndoEnabled(false);
-+    //editbox->setUndoEnabled(false);
-     editbox->end();
- 
-     if (addsep && list.countElements() && !editbox->text().isEmpty())
-@@ -2611,7 +2611,7 @@
-         er = list.nextElement(&pstr);
-     }
- 
--    editbox->setUndoEnabled(true);
-+    //editbox->setUndoEnabled(true);
- }
- 
- 
diff --git a/mail/kiltdown/files/patch-mailfolder.cc b/mail/kiltdown/files/patch-mailfolder.cc
deleted file mode 100644
index 369d619f583e..000000000000
--- a/mail/kiltdown/files/patch-mailfolder.cc
+++ /dev/null
@@ -1,125 +0,0 @@
---- kiltdown/mailfolder.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/mailfolder.cc	2008-05-21 23:27:13.000000000 -0400
-@@ -263,5 +263,5 @@
- 
-         item.boldEntry = unread;
--        item.itemData = (unsigned int)(message);
-+        item.itemData = (void *)(message);
-         er = populateColumnsFromInfo(&item.columns, ccolumns, columns, message);
-         RETURN_ON_FAILURE(er);
-@@ -354,5 +354,5 @@
-         K_ASSERT((int)hdr[x].itemData >= 0 && (int)hdr[x].itemData <= MC_LAST, "Bogus MC_ Code!!!");
- 
--        info[x].which = (enum MailColumn)hdr[x].itemData;
-+        info[x].which = (enum MailColumn)(uintptr_t)hdr[x].itemData;
-         info[x].fixed = hdr[x].type == CW_FIXED;
-         info[x].width = hdr[x].width;
-@@ -497,5 +497,5 @@
- {
-     int fewerUnread = 0;
--    unsigned int *rg;
-+    void **rg;
-     ReadStatus rs;
-     bool ignoreAsk = false;
-@@ -530,8 +530,8 @@
-      * First, try and remove them from the UI
-      */
--    rg = (unsigned int *)localAlloc(count * sizeof(unsigned int));
-+    rg = (void **)localAlloc(count * sizeof(void *));
-     if (!rg) return E_OUTOFMEMORY;
-     for (int x = 0; x < count; x++)
--        rg[x] = (unsigned int)deleteme[x];
-+        rg[x] = (void *)deleteme[x];
-     messageView->removeRows(count, rg);
-     localFree(rg);
-@@ -655,8 +655,8 @@
- ERRCODE MailFolder::enableMailListPopupItems()
- {
--    LinkList<unsigned int> selectedItemDataList;
-+    LinkList<void *> selectedItemDataList;
-     bool enableUnread = false;
-     bool enableRead = false;
--    unsigned int ui;
-+    void *ui;
-     ReadStatus rs;
-     ERRCODE er;
-@@ -1127,6 +1127,6 @@
- )
- {
--    LinkList<unsigned int> list;
--    unsigned int a;
-+    LinkList<void *> list;
-+    void *a;
-     ERRCODE er;
-     int x;
-@@ -1221,6 +1221,6 @@
- )
- {
--    LinkList<unsigned int> selectedItemDataList;
--    unsigned int itemData;
-+    LinkList<void *> selectedItemDataList;
-+    void * itemData;
-     MailMessage *message;
-     ReadStatus rs;
-@@ -1354,8 +1354,8 @@
-         localFree(pstr);
-     }
--    messagePreview->setUndoEnabled(false);
-+    //messagePreview->setUndoEnabled(false);
-     messagePreview->setText(body);
-     messagePreview->setCursorPosition(0, 0);
--    messagePreview->setUndoEnabled(true);
-+    //messagePreview->setUndoEnabled(true);
- 
-     er = S_OK;
-@@ -1709,6 +1709,6 @@
- )
- {
--    LinkList<unsigned int> selectedItemDataList;
--    unsigned int itemData;
-+    LinkList<void *> selectedItemDataList;
-+    void * itemData;
-     ERRCODE er;
- 
-@@ -1777,5 +1777,5 @@
-     KMailListItem *item;
- 
--    item = messageView->nextItem((unsigned int)index);
-+    item = messageView->nextItem((void *)index);
-     
-     return item ? (MailMessage *)item->itemData : NULL;
-@@ -1802,5 +1802,5 @@
-     KMailListItem *item;
- 
--    item = messageView->previousItem((unsigned int)index);
-+    item = messageView->previousItem((void *)index);
- 
-     return item ? (MailMessage *)item->itemData : NULL;
-@@ -2414,5 +2414,5 @@
- {
- //    updateMessageStatus(m);
--    messageView->selectRowFromItemData((unsigned int)m);
-+    messageView->selectRowFromItemData((void *)m);
- }
-  
-@@ -2470,5 +2470,5 @@
-     for (int x = 0; x < ccolumns; x++) {
-         
--        headers[x].itemData = columns[x].which;
-+        headers[x].itemData = (void *)(uintptr_t)columns[x].which;
-         headers[x].width = columns[x].width;
-         headers[x].type = columns[x].fixed ? CW_FIXED : CW_PERCENTAGE;
-@@ -2610,5 +2610,5 @@
-                 break;
-         }
--        item.itemData = (unsigned int)(messages[x]);
-+        item.itemData = (void *)(messages[x]);
- 
-         er = populateColumnsFromInfo(&item.columns, ccolumns, columns, messages[x]);
-@@ -2750,5 +2750,5 @@
-             memset(&item, 0, sizeof(KMailListItem));
-             item.boldEntry = (rsNew == MSG_UNOPENED);
--            item.itemData = (unsigned int)(message);
-+            item.itemData = (void *)(message);
-             er = populateColumnsFromInfo(&item.columns, ccolumns, columns, message);
-             GOTO_ON_FAILURE(er, Error);
diff --git a/mail/kiltdown/files/patch-mailviewer.cc b/mail/kiltdown/files/patch-mailviewer.cc
deleted file mode 100644
index f918ab7fff7c..000000000000
--- a/mail/kiltdown/files/patch-mailviewer.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- kiltdown/mailviewer.cc	2001-05-13 23:25:23.000000000 -0400
-+++ kiltdown/mailviewer.cc	2008-05-21 23:27:52.000000000 -0400
-@@ -951,11 +951,11 @@
-                                   : ID_HIGH_PRIORITY_TEXT);
-             if (pstr) {
--                QPixmap p(p == LowPriority ? lowpriIcon : priorityhdrIcon);
--                priorityPixLabel->setPixmap(p);
--                priorityPixLabel->setGeometry(4, top, p.width() + 1, ctlHeight);
-+                QPixmap qp(p == LowPriority ? lowpriIcon : priorityhdrIcon);
-+                priorityPixLabel->setPixmap(qp);
-+                priorityPixLabel->setGeometry(4, top, qp.width() + 1, ctlHeight);
-                 priorityLabel->setText(pstr);
-                 localFree(pstr);
--                priorityLabel->setGeometry(p.width() + 5, top,
--                                           this->width() - p.width() - 13,
-+                priorityLabel->setGeometry(qp.width() + 5, top,
-+                                           this->width() - qp.width() - 13,
-                                            ctlHeight);
-                 top += ctlHeight + 5;
-@@ -1563,8 +1563,8 @@
- )
- {
--    LinkList<unsigned int> list;
-+    LinkList<void *> list;
-     const char *pstr, *pstr2;
-     SelectMeDialog *smd;
--    unsigned int ui;
-+    void *ui;
-     Attachment *a;
-     ERRCODE er;
-@@ -1592,5 +1592,5 @@
-         a->getFileName(&pstr);
-         if (pstr) {
--            smd->addItem(pstr, (unsigned int)a);
-+            smd->addItem(pstr, (void *)a);
-             localFree(pstr);
-         }
diff --git a/mail/kiltdown/files/patch-mailviewer.h b/mail/kiltdown/files/patch-mailviewer.h
deleted file mode 100644
index 032d37da12d3..000000000000
--- a/mail/kiltdown/files/patch-mailviewer.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kiltdown/mailviewer.h.orig	Mon May 14 05:25:23 2001
-+++ kiltdown/mailviewer.h	Mon Sep  9 06:35:23 2002
-@@ -21,6 +21,8 @@
- #include <qlineedit.h>
- #include <qmainwindow.h>
- #include <qmenubar.h>
-+#include <qtoolbutton.h>
-+#include <qpopupmenu.h>
- 
- 
- #include "kwindowbase.h"
diff --git a/mail/kiltdown/files/patch-tools-Makefile.in b/mail/kiltdown/files/patch-tools-Makefile.in
deleted file mode 100644
index d2fb64965487..000000000000
--- a/mail/kiltdown/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Mon May 14 05:25:23 2001
-+++ tools/Makefile.in	Wed Dec 25 11:31:57 2002
-@@ -10,7 +10,7 @@
- 	$(CC) -o rescomp rescomp.c
- 
- dlgstrip: dlgstrip.cc
--	$(CC) -o dlgstrip dlgstrip.cc
-+	$(CXX) -o dlgstrip dlgstrip.cc
- 
- clean:
- 	$(RM) -f rescomp core dlgstrip
diff --git a/mail/kiltdown/files/patch-tools-dlgstrip.cc b/mail/kiltdown/files/patch-tools-dlgstrip.cc
deleted file mode 100644
index 11444a4f7762..000000000000
--- a/mail/kiltdown/files/patch-tools-dlgstrip.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/dlgstrip.cc.orig	Mon May 14 05:25:23 2001
-+++ tools/dlgstrip.cc	Wed Dec 25 11:21:16 2002
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-+#include <stdlib.h>
- 
- /**
-  * DANGER!!! DANGER!!! DANGER!!! DANGER!!! DANGER!!! DANGER!!! DANGER!!! 
diff --git a/mail/kiltdown/pkg-descr b/mail/kiltdown/pkg-descr
deleted file mode 100644
index 1b763c43923d..000000000000
--- a/mail/kiltdown/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Kiltdown is an Email Client for UNIX. It is UI independant (I use both Gnome
-and KDE), and is fully featured, including MIME support, multiple accounts,
-filtering, etc. It currently runs under Linux, FreeBSD, and Solaris.
-
-WWW: http://kiltdown.sourceforge.net/