author: Baptiste Daroussin <bapt@FreeBSD.org> 2011-05-02 07:37:31 +0000
committer: Baptiste Daroussin <bapt@FreeBSD.org> 2011-05-02 07:37:31 +0000
commit: b792cc5809657214baafaf9e6c91c0f2c60ae2d3 (patch)
tree: 2819644bae64c8f4c44733d6d7dcbf578855d2d2 /mail
parent: 362cb389be3b570d1c92fc52e966116cfbbfe25c (diff)
download: ports-b792cc5809657214baafaf9e6c91c0f2c60ae2d3.tar.gz
ports-b792cc5809657214baafaf9e6c91c0f2c60ae2d3.zip
118 files changed, 0 insertions, 4102 deletions
diff --git a/mail/Makefile b/mail/Makefile
index a6597f730b1e..9204c22bb259 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -30,7 +30,6 @@
     SUBDIR += batv-milter
     SUBDIR += bayespam
     SUBDIR += bbmail
-    SUBDIR += biabam
     SUBDIR += biffer
     SUBDIR += bincimap
     SUBDIR += bmf
@@ -76,7 +75,6 @@
     SUBDIR += courier-imap
     SUBDIR += courier-pythonfilter
     SUBDIR += couriergraph
-    SUBDIR += crashecho
     SUBDIR += crm114
     SUBDIR += cucipop
     SUBDIR += cvsmail
@@ -107,7 +105,6 @@
     SUBDIR += dovecot2-pigeonhole
     SUBDIR += drac
     SUBDIR += dracmail
-    SUBDIR += drbl
     SUBDIR += dsbl-testers
     SUBDIR += dspam
     SUBDIR += dspam-devel
@@ -170,7 +167,6 @@
     SUBDIR += getmail
     SUBDIR += gkrellmmailwatch
     SUBDIR += gkrellmmailwatch2
-    SUBDIR += glbiff
     SUBDIR += gld
     SUBDIR += gmail-notify
     SUBDIR += gmime
@@ -235,7 +231,6 @@
     SUBDIR += libspf
     SUBDIR += libspf2
     SUBDIR += libspf2-10
-    SUBDIR += libsrs
     SUBDIR += libsrs2
     SUBDIR += libsrs_alt
     SUBDIR += libvmime
@@ -264,7 +259,6 @@
     SUBDIR += mailsync
     SUBDIR += mailx
     SUBDIR += mairix
-    SUBDIR += majorcool
     SUBDIR += majordomo
     SUBDIR += masqmail
     SUBDIR += mavbiff
@@ -277,7 +271,6 @@
     SUBDIR += mbx2mbox
     SUBDIR += mdpop3d
     SUBDIR += mess822
-    SUBDIR += messagewall
     SUBDIR += meta1
     SUBDIR += metamail
     SUBDIR += mew
@@ -481,7 +474,6 @@
     SUBDIR += pflogstats
     SUBDIR += pflogsumm
     SUBDIR += pfqueue
-    SUBDIR += pgen
     SUBDIR += pgpsendmail
     SUBDIR += php4-imap
     SUBDIR += php5-imap
@@ -586,13 +578,11 @@
     SUBDIR += razor-agents
     SUBDIR += rbl-milter
     SUBDIR += rblcheck
-    SUBDIR += regm
     SUBDIR += relay-ctrl
     SUBDIR += relaydb
     SUBDIR += renattach
     SUBDIR += reply-o-matic
     SUBDIR += rftp
-    SUBDIR += ricochet
     SUBDIR += ripmime
     SUBDIR += rlytest
     SUBDIR += rmilter
@@ -640,15 +630,12 @@
     SUBDIR += smfsav
     SUBDIR += smtp-cli
     SUBDIR += smtp-gated
-    SUBDIR += smtpclient
     SUBDIR += smtpd
     SUBDIR += smtpfeed
     SUBDIR += smtpmail
-    SUBDIR += smtpproxy
     SUBDIR += smtprc
     SUBDIR += smtptrapd
     SUBDIR += softfail
-    SUBDIR += solidpop3d
     SUBDIR += sortmail
     SUBDIR += spamass-ixhash
     SUBDIR += spamass-milter
@@ -667,7 +654,6 @@
     SUBDIR += spmfilter
     SUBDIR += spmfilter-clamav
     SUBDIR += spmfilter-spamassassin
-    SUBDIR += spruce
     SUBDIR += sqlgrey
     SUBDIR += squirrelmail
     SUBDIR += squirrelmail-abook_import_export-plugin
@@ -717,7 +703,6 @@
     SUBDIR += synonym
     SUBDIR += t-prot
     SUBDIR += teapop
-    SUBDIR += teapop-devel
     SUBDIR += textmail
     SUBDIR += thunderbird
     SUBDIR += thunderbird-dictionaries
@@ -754,12 +739,9 @@
     SUBDIR += websieve
     SUBDIR += whoson
     SUBDIR += wmbiff
-    SUBDIR += wmmail
     SUBDIR += wmmaiload
-    SUBDIR += wmmultipop3
     SUBDIR += wmpop3
     SUBDIR += wmpop3lb
-    SUBDIR += wmymail
     SUBDIR += x-face-e21
     SUBDIR += xbuffy
     SUBDIR += xcite
@@ -771,7 +753,6 @@
     SUBDIR += xmail
     SUBDIR += xmailbox
     SUBDIR += xmailwatcher
-    SUBDIR += xpbiff
     SUBDIR += xpi-displayquota
     SUBDIR += zabit
     SUBDIR += zmailer
diff --git a/mail/biabam/Makefile b/mail/biabam/Makefile
deleted file mode 100644
index ddea43b705bc..000000000000
--- a/mail/biabam/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	biabam
-# Date created:		03 January 2001
-# Whom:			George Reid <greid@ukug.uk.freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	biabam
-PORTVERSION=	0.9.7
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	http://mmj.dk/biabam/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A command-line attachment mailer
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
-NO_BUILD=	yes
-PLIST_FILES=	bin/biabam
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(#!\)\(/bin/bash\)|\1${LOCALBASE}\2|' \
-		${WRKSRC}/${PORTNAME}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/biabam ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/mail/biabam/distinfo b/mail/biabam/distinfo
deleted file mode 100644
index 36f5550b0914..000000000000
--- a/mail/biabam/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (biabam-0.9.7.tar.gz) = 1e72070576b6040522050e70f1f75ee9
-SHA256 (biabam-0.9.7.tar.gz) = d4165f432b371628d6a39e0b99a1f245182cc547f984309e2f5f6837acd3f707
-SIZE (biabam-0.9.7.tar.gz) = 8873
diff --git a/mail/biabam/files/patch-biabam b/mail/biabam/files/patch-biabam
deleted file mode 100644
index aa6a16ac80a6..000000000000
--- a/mail/biabam/files/patch-biabam
+++ /dev/null
@@ -1,83 +0,0 @@
---- biabam.orig	Tue Dec 21 00:08:38 2004
-+++ biabam	Tue Dec 21 00:10:02 2004
-@@ -33,15 +33,15 @@
-   exit 1
- fi
- 
--if ! which uuencode > /dev/null; then
--  echo "This program needs the uuencode utility to perform base64 encoding."
-+if ! which b64encode > /dev/null; then
-+  echo "This program needs the b64encode utility to perform base64 encoding."
-   exit 1
- fi
- 
- # Find out the number of files to attach
- TOTAL_ATTACHMENTS=`echo "$1" | awk -F$SP '{print NF}'`
- 
--for i in `seq 1 $TOTAL_ATTACHMENTS`;
-+for i in `jot $TOTAL_ATTACHMENTS 1`;
- do
-   STR="'{print \$$i}'"
-   # store filenames in an array
-@@ -55,7 +55,7 @@
- 
- BASETEMP="`basename $TEMPFILE`"
- 
--for i in `seq 1 $TOTAL_ATTACHMENTS`; do
-+for i in `jot $TOTAL_ATTACHMENTS 1`; do
-   # array for attachments basename
-   BASEATTACHMENT[$i]="`basename \"${ARR_ATTACHMENTS[$i]}\"`"
-   # test if file exists
-@@ -78,7 +78,7 @@
-     TYPE[$i]=${MIME:-application/unknown}
-   fi
- 
--  uuencode --base64 -- "${ARR_ATTACHMENTS[$i]}" "${BASEATTACHMENT[$i]}" | \
-+  b64encode -- "${ARR_ATTACHMENTS[$i]}" "${BASEATTACHMENT[$i]}" | \
-   sed '1d;$d' > ${TEMPUUENCODED[$i]}
- done
- 
-@@ -97,7 +97,7 @@
- # Find out the number of recipients to send the email
- TOTAL_EMAILS=`echo "$1" | awk -F$SP '{print NF}'`
- 
--for i in `seq 1 $TOTAL_EMAILS`; do
-+for i in `jot $TOTAL_EMAILS 1`; do
-   STR="'{print \$$i}'"
-   # store recipients in an array
-   ARR_EMAILS[$i]=`sh -c "echo "$1" | awk -F$SP $STR" `
-@@ -105,7 +105,7 @@
- 
- TO="To:"
- 
--for i in `seq 1 $TOTAL_EMAILS`; do
-+for i in `jot $TOTAL_EMAILS 1`; do
-   # write the 'To:' field with all recipients previously stored in the array
-   TO="$TO <${ARR_EMAILS[$i]}>,"
- done
-@@ -129,7 +129,7 @@
- cat >> $TEMPFILE
- echo >> $TEMPFILE
- 
--for i in `seq 1 $TOTAL_ATTACHMENTS`; do
-+for i in `jot $TOTAL_ATTACHMENTS 1`; do
-   echo "--$BOUNDARY" >> $TEMPFILE
-   echo "Content-Type: ${TYPE[$i]}" >> $TEMPFILE
-   echo "Content-Disposition: attachment; filename=\"${BASEATTACHMENT[$i]}\"" >> $TEMPFILE
-@@ -143,14 +143,14 @@
- echo "--$BOUNDARY--" >> $TEMPFILE
- echo >> $TEMPFILE
- 
--for i in `seq 1 $TOTAL_EMAILS`; do
-+for i in `jot $TOTAL_EMAILS 1`; do
-   # put all recipients together to call sendmail below
-   RECIPIENTS="$RECIPIENTS ${ARR_EMAILS[$i]}"
- done
- 
- cat $TEMPFILE | $SENDMAIL $SENDMAIL_OPTS $RECIPIENTS # here we call sendmail
- 
--for i in `seq 1 $TOTAL_ATTACHMENTS`; do
-+for i in `jot $TOTAL_ATTACHMENTS 1`; do
-   /bin/rm -f ${TEMPUUENCODED[$i]} # remove all temp files created
- done
- 
diff --git a/mail/biabam/pkg-descr b/mail/biabam/pkg-descr
deleted file mode 100644
index 978976439e9f..000000000000
--- a/mail/biabam/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Biabam Is A Bash Attachment Mailer
-
-To use BIABAM use the following syntax:
-
-echo [body] | biabam attachment1,[attachment2,attachmentN] [-s subject] \
-	      recipient1[,recipient2,recipientN]
-
-Example:
-echo "Here are the tarballs you requested" | biabam \
-     foobar-0.7.8.tar.gz,coolapp-0.4.3.tar.gz,otherapp-4.3.0.tar.gz \
-     -s "Answer to your request" john@doe.org,irene@prima.org,cira@alpispa.es
-
-If no text is piped into biabam, it will wait for text on standard input
-(finish with CTRL-D)
diff --git a/mail/crashecho/Makefile b/mail/crashecho/Makefile
deleted file mode 100644
index e77642996250..000000000000
--- a/mail/crashecho/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Ports collection makefile for:	crashecho
-# Date created:		15 November 2002
-# Whom:			CyrilM <cyrilm@tower.pp.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	crashecho
-PORTVERSION=	0.2.14
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.nluug.nl/pub/ibiblio/distributions/altlinux/${MASTER_SITE_SUBDIR} \
-		ftp://distro.ibiblio.org/pub/linux/distributions/altlinux/${MASTER_SITE_SUBDIR} \
-		ftp://ftp.chg.ru/.1/Linux/ALTLinux/${MASTER_SITE_SUBDIR}
-MASTER_SITE_SUBDIR=	Sisyphus/files/SRPMS/
-EXTRACT_SUFX=	.rpm
-DISTFILES=	${PORTNAME}-${PORTVERSION}-alt1.src${EXTRACT_SUFX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An FTN JAM and *.MSG tosser
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
-LIB_DEPENDS=	jam.2:${PORTSDIR}/mail/jamlib
-
-EXTRACT_CMD=	rpm2cpio
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	| ${CPIO} -i
-
-GNU_CONFIGURE=	yes
-
-MAN1=	crashecho.1 \
-	crashexport.1 \
-	crashmaint.1 \
-	crashstats.1 \
-	crashwrite.1
-MAN5=	crashecho.conf.5
-
-post-extract:
-	cd ${WRKDIR} && tar zxf ${PORTNAME}-${PORTVERSION}.tar.gz
-
-post-install:
-	${MKDIR} ${PREFIX}/etc/ftn
-	${INSTALL_DATA} ${WRKSRC}/doc/crashecho.conf ${PREFIX}/etc/ftn/crashecho.conf.sample
-
-.include <bsd.port.mk>
diff --git a/mail/crashecho/distinfo b/mail/crashecho/distinfo
deleted file mode 100644
index c5a9552afe7a..000000000000
--- a/mail/crashecho/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (crashecho-0.2.14-alt1.src.rpm) = 1dd3336fa600a025941188279b3e02c7
-SHA256 (crashecho-0.2.14-alt1.src.rpm) = e7383b89231f82fa79fe508a971dd32e2aad1cb2219f74ee7866f276fda6a87c
-SIZE (crashecho-0.2.14-alt1.src.rpm) = 327270
diff --git a/mail/crashecho/files/patch-src-crashecho.h b/mail/crashecho/files/patch-src-crashecho.h
deleted file mode 100644
index dbdbb3feff2d..000000000000
--- a/mail/crashecho/files/patch-src-crashecho.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/crashecho.h.orig	2007-11-08 09:24:38.000000000 +0000
-+++ src/crashecho.h	2007-11-08 09:24:46.000000000 +0000
-@@ -82,7 +82,6 @@
- 
- extern ulong DayStatsWritten;
- 
--extern struct Nodelist AvailNodelists[];
- extern struct Messagebase AvailMessagebases[];
- 
- extern struct Config config;
diff --git a/mail/crashecho/pkg-descr b/mail/crashecho/pkg-descr
deleted file mode 100644
index f26518661810..000000000000
--- a/mail/crashecho/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-CrashEcho is a successor of a CrashMail II tosser originally written
-by Johan Billing.
diff --git a/mail/crashecho/pkg-plist b/mail/crashecho/pkg-plist
deleted file mode 100644
index 01ea3c7ca8ec..000000000000
--- a/mail/crashecho/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/crashecho
-bin/crashexport
-bin/crashstats
-bin/crashwrite
-bin/crashmaint
-bin/crashconvdupebase
-etc/ftn/crashecho.conf.sample
-share/crashecho/AreafixHelp.txt
-@dirrm etc/ftn
-@dirrm share/crashecho
diff --git a/mail/drbl/Makefile b/mail/drbl/Makefile
deleted file mode 100644
index 76cf7769ef5e..000000000000
--- a/mail/drbl/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	drbl
-# Date created:				21 March 2002
-# Whom:	      				Yen-Ming Lee <leeym@leeym.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	drbl
-PORTVERSION=	2.2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.agk.nnov.ru/drbl/prog/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Distributed Realtime Black List
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_PERL5=	yes
-
-post-patch:
-	@${PERL} -pi.bak -e 's,./drblnode.conf,${PREFIX}/etc/drblnode.conf,g' ${WRKSRC}/*pl
-	@${PERL} -pi.bak -e 's,(config.pl|drbllib.pl),${DATADIR}/\1,g' ${WRKSRC}/*pl
-	@${PERL} -pi.bak -e 's,./header,${DATADIR}/header,g' ${WRKSRC}/drblnode.conf.sample
-	@${PERL} -pi.bak -e 's, do_, ${PREFIX}/bin/do_,g' ${WRKSRC}/create_drbl.sh
-
-do-install:
-	@${MKDIR} ${DATADIR}
-.for f in config.pl drbllib.pl header
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DATADIR}
-.endfor
-	@${MKDIR} ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/drblnode.conf.sample ${PREFIX}/etc
-.if !exists(${PREFIX}/etc/drblnode.conf)
-	${CP} ${PREFIX}/etc/drblnode.conf.sample ${PREFIX}/etc/drblnode.conf
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.for f in create_drbl.sh do_drbl.pl do_info.pl do_vote.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
-.endfor
-
-.include <bsd.port.mk>
diff --git a/mail/drbl/distinfo b/mail/drbl/distinfo
deleted file mode 100644
index 36c42f2e9ba6..000000000000
--- a/mail/drbl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (drbl-2.2.tar.gz) = 57f79fd9c846c3ba58d697327f04ac5f
-SHA256 (drbl-2.2.tar.gz) = 798347b3d9d17f9c01ad68628f620e4007c66055f52f0e2eb6a4ab45056f92c6
-SIZE (drbl-2.2.tar.gz) = 16167
diff --git a/mail/drbl/pkg-descr b/mail/drbl/pkg-descr
deleted file mode 100644
index 8d1f3d3287a5..000000000000
--- a/mail/drbl/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-DRBL stands for Distributed Realtime Black List. There was a MAPS RBL service
-in the Net, that perfectly worked for a long time. Unfortunately, MAPS LLC
-stops their public services by July 31, 2001, which in fact means the most
-effective anti-spam engine in the Net is dead. 
-
-DRBL differs from MAPS RBL in it's distributed nature. Instead of a
-proprietary database controlled by certain people, DRBL offers every
-network to establish its own database and share it with colleagues.
-DRBL method of operation is similar to "old" RBL, but the main difference is
-(1) using many "local" databases instead of one centralized and
-(2) sharing information among them, so many other networks can make decisions
-whether some server is a junk generator and has to be banned, and ever do that
-automatically by getting and analyzing such information from different sources.
-
-WWW: http://www.drbl.ofisp.org/eng/
diff --git a/mail/drbl/pkg-plist b/mail/drbl/pkg-plist
deleted file mode 100644
index e11763da4a13..000000000000
--- a/mail/drbl/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/create_drbl.sh
-bin/do_drbl.pl
-bin/do_info.pl
-bin/do_vote.pl
-@unexec if cmp -s %D/etc/drblnode.conf %D/etc/drblnode.conf.sample; then rm -f %D/etc/drblnode.conf; fi
-etc/drblnode.conf.sample
-%%DATADIR%%/config.pl
-%%DATADIR%%/drbllib.pl
-%%DATADIR%%/header
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
deleted file mode 100644
index c359e87b96e7..000000000000
--- a/mail/glbiff/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	glbiff
-# Date created:				18 May 1998
-# Whom:					Andrey Zakhvatov
-#
-# $FreeBSD$
-#
-
-PORTNAME=	glbiff
-PORTVERSION=	0.3.5
-PORTREVISION=	4
-CATEGORIES=	mail
-MASTER_SITES=	http://www.dgp.utoronto.ca/~mac/code/projects/ \
-		http://freebsd.unixfreunde.de/sources/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Xbiff-like program for X Window System with nice 3D output
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-USE_GL=		glut
-GNU_CONFIGURE=	yes
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-
-MAN1=		glbiff.1
-MAN5=		glbiffrc.5
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/glbiff ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/glbiff.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/glbiffrc.5 ${PREFIX}/man/man5
-	@${MKDIR} ${PREFIX}/share/examples/glbiff
-	${INSTALL_DATA} ${WRKSRC}/glbiffrc.sample ${PREFIX}/share/examples/glbiff/dot.glbiffrc.sample
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/glbiff
-.for file in ChangeLog README README.last-minute TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/glbiff
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/glbiff/distinfo b/mail/glbiff/distinfo
deleted file mode 100644
index f693cf1c8dc8..000000000000
--- a/mail/glbiff/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (glbiff-0.3.5.tgz) = 74d71f067ed6d7da60025e17c76f3bc8
-SHA256 (glbiff-0.3.5.tgz) = 5330e85985cf80f114ac08c7355dc97a46c3a0a9116d9a4afb2216c9ea8ed79d
-SIZE (glbiff-0.3.5.tgz) = 323652
diff --git a/mail/glbiff/files/patch-aa b/mail/glbiff/files/patch-aa
deleted file mode 100644
index 2de52adbad10..000000000000
--- a/mail/glbiff/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Wed Apr 19 14:09:58 2000
-+++ Makefile.in	Fri Apr 21 19:20:46 2000
-@@ -3,16 +3,16 @@
- SRCDIR		=$(PROGRAM)-$(VERSION)
- OBJS		= glbiff.o mail.o draw.o astro.o cfg.o
- 
--INST_DIR	= /usr/local
-+INST_DIR	= @exec_prefix@
- BIN_DIR		= $(INST_DIR)/bin
- MAN_DIR		= $(INST_DIR)/man
- 
- TAGS		= ctags-exuberant
- 
- #DEBUG		= -g3 -DDEBUG
- 
--LIBS		= @LIBS@
--CXXFLAGS	= $(DEBUG) @CXXFLAGS@ -DVERSION=\"$(VERSION)\"
-+LIBS		= @LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ ${PTHREAD_LIBS}
-+CXXFLAGS	+= $(DEBUG) @CXXFLAGS@ @X_CFLAGS@ @CPPFLAGS@ -DVERSION=\"$(VERSION)\" ${PTHREAD_CFLAGS}
- 
- all:		$(PROGRAM)
- 
diff --git a/mail/glbiff/files/patch-cfg.cc b/mail/glbiff/files/patch-cfg.cc
deleted file mode 100644
index 6e717f20e659..000000000000
--- a/mail/glbiff/files/patch-cfg.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- cfg.cc.orig	Mon Dec 23 03:45:30 2002
-+++ cfg.cc	Mon Dec 23 03:45:48 2002
-@@ -23,7 +23,6 @@
- // This file defines subroutines to handle the
- // configuration file
- 
--#include <stl.h>
- #include <stdio.h>
- #include <iostream.h>
- #include <ctype.h>
diff --git a/mail/glbiff/files/patch-cfg.h b/mail/glbiff/files/patch-cfg.h
deleted file mode 100644
index 16bd193336df..000000000000
--- a/mail/glbiff/files/patch-cfg.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- cfg.h.orig	Mon Dec 23 03:45:36 2002
-+++ cfg.h	Mon Dec 23 03:47:15 2002
-@@ -20,7 +20,8 @@
-  * 
-  */
- 
--#include <stl.h>
-+#include <list>
-+using namespace std;
- #include <string.h>
- #include "rgb.h"
- #include "astro.h"
diff --git a/mail/glbiff/files/patch-glbiff.cc b/mail/glbiff/files/patch-glbiff.cc
deleted file mode 100644
index 70c2fcaa04b5..000000000000
--- a/mail/glbiff/files/patch-glbiff.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- glbiff.cc.orig	Mon Dec 23 03:47:27 2002
-+++ glbiff.cc	Mon Dec 23 03:47:48 2002
-@@ -37,6 +37,8 @@
- 
- #include <X11/Xlib.h>
- 
-+#include <iostream>
-+
- #include "draw.h"
- #include "glbiff.h"
- #include "mail.h"
diff --git a/mail/glbiff/pkg-descr b/mail/glbiff/pkg-descr
deleted file mode 100644
index 89b8d71056ff..000000000000
--- a/mail/glbiff/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a program to visually notify you of new mail is similar to
-xbiff, except that it provides somewhat nicer output.  The idea
-comes from the "mailbox" program available on SGI machines, and
-hence tries to mimic some of the features present in it.
-
-WWW: http://www.dgp.toronto.edu/~mac/code/projects/glbiff.html
diff --git a/mail/glbiff/pkg-message b/mail/glbiff/pkg-message
deleted file mode 100644
index 8c1ab315f326..000000000000
--- a/mail/glbiff/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
------------------------------------------------------------------
-You have installed glbiff, a program to visually represent you of
-new mail.  A sample ~/.glbiffrc file is located at:
-  ${PREFIX}/share/examples/glbiff/dot.glbiffrc.sample
-... and more information is available in the glbiffrc(5) manpage.
------------------------------------------------------------------
diff --git a/mail/glbiff/pkg-plist b/mail/glbiff/pkg-plist
deleted file mode 100644
index 0849bbcccae7..000000000000
--- a/mail/glbiff/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/glbiff
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.last-minute
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%EXAMPLESDIR%%/dot.glbiffrc.sample
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/libsrs/Makefile b/mail/libsrs/Makefile
deleted file mode 100644
index 5ecd36656429..000000000000
--- a/mail/libsrs/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:	libsrs
-# Date created:		28 February 2004
-# Whom:			Daniel Roethlisberger <daniel@roe.ch>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libsrs
-PORTVERSION=	0.3.b
-CATEGORIES=	mail
-MASTER_SITES=	http://www.libsrs.org/files/ \
-		http://freebsd.unixfreunde.de/sources/
-DISTNAME=	${PORTNAME}.${PORTVERSION}eta
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Sender Rewriting Scheme (SRS) library and client
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}.3
-USE_GMAKE=	yes
-USE_OPENSSL=	yes
-USE_LDCONFIG=	yes
-LIBSRS_REV=	1
-PLIST_SUB=	PORTNAME=${PORTNAME} LIBSRS_REV=${LIBSRS_REV}
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${OPENSSLINC}" \
-		LDFLAGS="${LDFLAGS} -L${OPENSSLLIB} -L${WRKSRC}"
-
-# WITH_SRS_DEBUG=yes	enable debugging
-.if defined(WITH_SRS_DEBUG)
-SRS_CFLAGS=	-ggdb3 -DDEBUG
-.endif
-
-# This is all a bit messy, but given the inconvenient original Makefile,
-# this seems to be the best way to make this port work in this version.
-# The author of libsrs is working on autotools support, so this ugliness
-# should have an end soon.
-post-patch:
-	@${REINPLACE_CMD} \
-	  -e 's/^CFLAGS:=.*/CFLAGS+=-Wall -D_USE_BSD_SOURCE ${SRS_CFLAGS}/' \
-	  -e 's/^CPPFLAGS:=/#CPPFLAGS:=/' \
-	  -e 's/^LDFLAGS:=/#LDFLAGS:=/' \
-	  -e 's/cd tools; make static; make ins.all/cd tools; make shared/g' \
-	  -e 's/make/gmake/g' \
-	  -e 's/libsrs.a : -lcrypto /libsrs.a : /g' \
-	  -e 's/libsrs\.so\.1\.0\.1/libsrs.so.${LIBSRS_REV}/g' \
-	  -e 's/-soname,libsrs\.so\.1/-soname,libsrs.so.${LIBSRS_REV}/g' \
-	  ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} \
-	  -e 's/^CFLAGS:=/#CFLAGS:=/' \
-	  -e 's/^CPPFLAGS:=/#CPPFLAGS:=/' \
-	  -e 's/^LDFLAGS:=/#LDFLAGS:=/' \
-	  -e 's/make/gmake/g' \
-	  -e 's/mv static srs/mv static srs-${PORTNAME}/g' \
-	  -e 's/mv shared srs/mv shared srs-${PORTNAME}/g' \
-	  -e 's/libsrs\.so\.1\.0\.1/libsrs.so.${LIBSRS_REV} -lcrypto/g' \
-	  ${WRKSRC}/tools/Makefile
-	@${REINPLACE_CMD} \
-	  -e 's/compile with -DDEBUG/build with WITH_SRS_DEBUG=yes/g' \
-	  ${WRKSRC}/tools/srs.c
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/srs.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/libsrs.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libsrs.so.${LIBSRS_REV} ${PREFIX}/lib
-	(cd ${PREFIX}/lib ; ${LN} -sf libsrs.so.${LIBSRS_REV} libsrs.so)
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/srs-${PORTNAME} ${PREFIX}/bin
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/libsrs/distinfo b/mail/libsrs/distinfo
deleted file mode 100644
index e7590443b3ee..000000000000
--- a/mail/libsrs/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libsrs.0.3.beta.tar.bz2) = 5502b03452d387cb4ba9e8e9fb4facd4
-SHA256 (libsrs.0.3.beta.tar.bz2) = d020cd159f6f9afdba4076d48d90963bf94721ca29a5e9bbe2f3406a38fee4af
-SIZE (libsrs.0.3.beta.tar.bz2) = 19014
diff --git a/mail/libsrs/pkg-descr b/mail/libsrs/pkg-descr
deleted file mode 100644
index f4eb7c848fc4..000000000000
--- a/mail/libsrs/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Sender Rewriting Scheme (SRS) library and utility in C.
-SRS is a scheme under development for email envelope sender
-rewriting. In an SPF-compliant world, forwarded mail must be
-rewritten to carry a local return path.
-Read all about SRS at http://spf.pobox.com/srs.html
-
-WWW: http://www.libsrs.org/
diff --git a/mail/libsrs/pkg-message b/mail/libsrs/pkg-message
deleted file mode 100644
index b6e78331087e..000000000000
--- a/mail/libsrs/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
------------------------------------------------------------------------
-Note: This port installs the SRS userspace tools with a filename suffix
-      of -libsrs in order to avoid conflicts with other SRS ports
-      providing tools of the same name.
-      Please create convenience symlinks manually, if desired.
------------------------------------------------------------------------
diff --git a/mail/libsrs/pkg-plist b/mail/libsrs/pkg-plist
deleted file mode 100644
index cd1b697aee28..000000000000
--- a/mail/libsrs/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/srs.h
-lib/libsrs.a
-lib/libsrs.so
-lib/libsrs.so.%%LIBSRS_REV%%
-bin/srs-%%PORTNAME%%
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
deleted file mode 100644
index b50ecf8344f5..000000000000
--- a/mail/majorcool/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	majorcool
-# Date created:			Wed Aug 13 18:34:14 CEST 1997
-# Whom:				Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	majorcool
-PORTVERSION=	1.3.2
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Web Interface to Majordomo
-
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-BUILD_DEPENDS=	${LOCALBASE}/majordomo/majordomo.pl:${PORTSDIR}/mail/majordomo
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-IS_INTERACTIVE=	yes
-USE_PERL5=	yes
-
-do-install:
-		( cd ${WRKSRC}; ${SH} Configure )
-
-.include <bsd.port.mk>
diff --git a/mail/majorcool/distinfo b/mail/majorcool/distinfo
deleted file mode 100644
index f8be91943f45..000000000000
--- a/mail/majorcool/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (majorcool-1.3.2.tar.gz) = 46678d0db7779f8ce35e5f63944c3e8d
-SHA256 (majorcool-1.3.2.tar.gz) = ed6d4d6718c3e01566d219a31a97285342ea3a5e50b766daa25fc8fbaa83829c
-SIZE (majorcool-1.3.2.tar.gz) = 834362
diff --git a/mail/majorcool/files/patch-aa b/mail/majorcool/files/patch-aa
deleted file mode 100644
index d81d4e592809..000000000000
--- a/mail/majorcool/files/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
---- Configure.orig	Wed Jun 10 02:44:18 1998
-+++ Configure	Sun Sep 19 12:44:16 1999
-@@ -44,16 +44,16 @@
- #  be overwritten by any of the parameters saved in $config.
- #  For yes/no values, 0=no, 1=yes
- 
--DOMO_DIR=			# Majordomo home directory
-+DOMO_DIR=!!PREFIX!!/majordomo	# Majordomo home directory
- DOMO_CONF=			# Majordomo configuration file
- DOMO_VERSION=			# Majordomo version number
- WEB_SCHEME="http"		# Web server scheme/protocol
--WEB_ROOT=			# Web server root directory
-+WEB_ROOT=!!PREFIX!!/share/apache	# Web server root directory
- WEB_CGIDIR=			# Web server CGI directory
- WEB_CGIURL="/cgi-bin"		# Web server CGI URL
- WEB_IMGDIR=			# Web server images directory
--WEB_IMGURL="/images"		# Web server images URL
--WEB_DOCROOT=			# Root for served documents
-+WEB_IMGURL="/icons"		# Web server images URL
-+WEB_DOCROOT=!!PREFIX!!/share/apache/htdocs	# Root for served documents
- WEB_HEADER=			# Header for common site look
- WEB_FOOTER=			# Footer for common site look
- COOL_CF=			# Config file for this installation
-@@ -64,7 +64,7 @@
- COOL_NAME="majordomo"		# MajorCool CGI program name
- COOL_USERID="bin"		# User-id to install as
- COOL_GROUPID="bin"		# Group-id to install as
--COOL_HELPFILE=			# MajorCool HTML info file location
-+COOL_HELPFILE=/majorcool.html	# MajorCool HTML info file location
- COOL_SITEADDR="simple"		# The address lookup function to use
- COOL_CREATECMD=			# Program to call on CREATE request
- COOL_RENAMECMD=			# Program to call on RENAME request
-@@ -86,7 +86,7 @@
- OPT_PREFSRETURN=0		# Return to prior screen from Prefs session?
- OPT_ROBOTS=1			# Allow Internet spiders to index the CGI?
- OPT_SCANSTEPS=50		# Update interval suring list scan.
--PERLBIN="/usr/local/bin/perl"	# How to start a perl script
-+PERLBIN="/usr/bin/perl"		# How to start a perl script
- 
- #----------------------------------------------------------------------------
- 
diff --git a/mail/majorcool/pkg-descr b/mail/majorcool/pkg-descr
deleted file mode 100644
index 8e91a088fecf..000000000000
--- a/mail/majorcool/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-MajorCool is a CGI script written in Perl that provides a Web interface
-to Majordomo. It is intended to run co-located with the Majordomo
-program (ie, both mail and Web on the same host).
-
-MajorCool was originally designed as an administrative front-end to the
-popular mailing list manager, allowing novice list-owners to manage
-their list configuration and subscriber base.
-
-WWW: http://www.conveyanced.com/MajorCool/
diff --git a/mail/majorcool/pkg-plist b/mail/majorcool/pkg-plist
deleted file mode 100644
index cbef6180b033..000000000000
--- a/mail/majorcool/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-majordomo/majorcool.pl
-majordomo/majorcool_default.cf
-share/apache/cgi-bin/majordomo
-share/apache/htdocs/majorcool.html
-share/apache/icons/mc_action_button.gif
-share/apache/icons/mc_apply_button.gif
-share/apache/icons/mc_browse_active.gif
-share/apache/icons/mc_browse_banner.gif
-share/apache/icons/mc_browse_button.gif
-share/apache/icons/mc_browse_hot.gif
-share/apache/icons/mc_cool_banner.gif
-share/apache/icons/mc_cool_button.gif
-share/apache/icons/mc_cool_hot.gif
-share/apache/icons/mc_create_active.gif
-share/apache/icons/mc_create_banner.gif
-share/apache/icons/mc_create_button.gif
-share/apache/icons/mc_create_hot.gif
-share/apache/icons/mc_delete_active.gif
-share/apache/icons/mc_delete_banner.gif
-share/apache/icons/mc_delete_button.gif
-share/apache/icons/mc_delete_hot.gif
-share/apache/icons/mc_help_active.gif
-share/apache/icons/mc_help_banner.gif
-share/apache/icons/mc_help_button.gif
-share/apache/icons/mc_help_hot.gif
-share/apache/icons/mc_home_button.gif
-share/apache/icons/mc_home_hot.gif
-share/apache/icons/mc_lock.gif
-share/apache/icons/mc_mail_button.gif
-share/apache/icons/mc_mail_hot.gif
-share/apache/icons/mc_modify_active.gif
-share/apache/icons/mc_modify_banner.gif
-share/apache/icons/mc_modify_button.gif
-share/apache/icons/mc_modify_hot.gif
-share/apache/icons/mc_not.gif
-share/apache/icons/mc_prefs_active.gif
-share/apache/icons/mc_prefs_banner.gif
-share/apache/icons/mc_prefs_button.gif
-share/apache/icons/mc_prefs_hot.gif
-share/apache/icons/mc_rename_active.gif
-share/apache/icons/mc_rename_banner.gif
-share/apache/icons/mc_rename_button.gif
-share/apache/icons/mc_rename_hot.gif
-share/apache/icons/mc_scrncap_approval.gif
-share/apache/icons/mc_scrncap_backdoor.gif
-share/apache/icons/mc_scrncap_browse.gif
-share/apache/icons/mc_scrncap_confkey.gif
-share/apache/icons/mc_scrncap_full_browse1.gif
-share/apache/icons/mc_scrncap_full_browse2.gif
-share/apache/icons/mc_scrncap_full_browse3.gif
-share/apache/icons/mc_scrncap_full_create1.gif
-share/apache/icons/mc_scrncap_full_delete1.gif
-share/apache/icons/mc_scrncap_full_modify1.gif
-share/apache/icons/mc_scrncap_full_modify2.gif
-share/apache/icons/mc_scrncap_full_modify3.gif
-share/apache/icons/mc_scrncap_full_modify4.gif
-share/apache/icons/mc_scrncap_full_modify5.gif
-share/apache/icons/mc_scrncap_full_prefs1.gif
-share/apache/icons/mc_scrncap_full_rename1.gif
-share/apache/icons/mc_scrncap_keywords.gif
-share/apache/icons/mc_scrncap_menu.gif
-share/apache/icons/mc_scrncap_mini_browse1.gif
-share/apache/icons/mc_scrncap_mini_browse2.gif
-share/apache/icons/mc_scrncap_mini_browse3.gif
-share/apache/icons/mc_scrncap_mini_create1.gif
-share/apache/icons/mc_scrncap_mini_delete1.gif
-share/apache/icons/mc_scrncap_mini_modify1.gif
-share/apache/icons/mc_scrncap_mini_modify2.gif
-share/apache/icons/mc_scrncap_mini_modify3.gif
-share/apache/icons/mc_scrncap_mini_modify4.gif
-share/apache/icons/mc_scrncap_mini_modify5.gif
-share/apache/icons/mc_scrncap_mini_prefs1.gif
-share/apache/icons/mc_scrncap_mini_rename1.gif
-share/apache/icons/mc_scrncap_modify.gif
-share/apache/icons/mc_scrncap_prefs.gif
-share/apache/icons/mc_scrncap_sub.gif
-share/apache/icons/mc_scrncap_toggle.gif
-share/apache/icons/mc_send_button.gif
-share/apache/icons/mc_wait.gif
diff --git a/mail/majorcool/scripts/pre-configure b/mail/majorcool/scripts/pre-configure
deleted file mode 100644
index 3f1fd7b9f9d5..000000000000
--- a/mail/majorcool/scripts/pre-configure
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD$
-
-#
-# make majorcool port "PREFIX clean"
-#
-
-perl -pi -e "s|!!PREFIX!!|$PREFIX|" ${WRKSRC}/Configure
diff --git a/mail/messagewall/Makefile b/mail/messagewall/Makefile
deleted file mode 100644
index 3d494824b96c..000000000000
--- a/mail/messagewall/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-# New ports collection makefile for:	messagewall-1.0.6
-# Date created: 	24 Sep 2002
-# Whom:			Pieter Danhieux <opr@bsdaemon.be>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	messagewall
-PORTVERSION=	1.0.8
-PORTREVISION=	3
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
-DISTNAME=	messagewall_${PORTVERSION}.orig
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Free SMTP PROXY with filtering
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \
-		${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns
-
-MAN1=		messagewall.1 messagewallctl.1 messagewallstats.1
-MAN5=		messagewall.conf.5 messagewall_profiles.5
-CONF1=		messagewall.conf
-
-OPTIONS=	BROKEN_PARAMETER "Detect unwanted extensions properly" off \
-			ESMTP_SIZE_OPTION  "Handle the size option in MAIL FROM" off \
-			MULTI_RCPT "Allow multiple recipients" off \
-			PARANOIA "Detect faked mails from AOL, Hotmail" off \
-			SPAM_STATS "Add spam statistics to messagewallstats" off
-WRKSRC=		${WRKDIR}/messagewall-${PORTVERSION}
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
-
-# Patch from "Quentin Guernsey" <quentin@wingateweb.com>
-# Allow multiple recipients, The profile for the first recipient will be
-# applied to all recipients of the message.
-# For details see http://www.messagewall.org/cgi-bin/ezmlm-browse.cgi?command=showmsg&list=messagewall-discuss&month=200303&msgnum=921&threadid=lcjcimckfmdphlhpjjhn
-.if defined(WITH_MULTI_RCPT) || defined(MESSAGEWALL_ALLOW_MULT_RCPT)
-EXTRA_PATCHES+=	${PATCHDIR}/allow-multiple-recipients.patch
-.endif
-
-# Patch from "Michael Ranner" <mranner@inode.at>
-# Allow messagewall to handle the size option in MAIL FROM: <foo@bar.com>
-# SIZE=12345678 (RFC1870). This can safe a lot of bandwith, because it rejects
-# any email, if message size is greater than max message size.
-# For details see http://www.ranner.jawa.at/messagewall.php
-.if defined(WITH_ESMTP_SIZE_OPTION)
-EXTRA_PATCHES+=	${PATCHDIR}/esmtpsize.patch
-.endif
-
-# Patch from "Collin Mulliner" <collin@mulliner.org>
-# Some email viruses use badly composed mime attachments. MessageWall can't
-# handle these by default. This breaks the detection of files with unwanted
-# extensions. This patch removes this disadvantage.
-# For details see http://www.mulliner.org/collin/patches.php
-.if defined(WITH_BROKEN_PARAMETER)
-EXTRA_PATCHES+=	${PATCHDIR}/broken_parameter_value.patch
-.else
-EXTRA_PATCHES+=	${PATCHDIR}/applemail.patch
-.endif
-
-# Patch from "Collin Mulliner" <collin@mulliner.org>
-# This adds a check method to detect faked mails from big sites like Hotmail
-# or AOL. It checks the by/from fields in the mail trace header "Received:"
-# for a host name that matches the domain of the senders address.
-# A new profile option is available to configure which domains to check.
-# For details see http://www.mulliner.org/collin/patches.php
-.if defined(WITH_PARANOIA)
-EXTRA_PATCHES+=	${PATCHDIR}/paranoia.patch
-.endif
-
-# Patch from "Collin Mulliner" <collin@mulliner.org>
-# Adds some nice spam statistics to the end of the output from
-# messagewallstats
-# For details see http://www.mulliner.org/collin/patches.php
-.if defined(WITH_SPAM_STATS)
-EXTRA_PATCHES+=	${PATCHDIR}/spam_stats.patch
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/firemake.cflags \
-		${WRKSRC}/firemake.ldflags
-	${REINPLACE_CMD} -e 's|-lcrypto|-lcrypto ${PTHREAD_LIBS}|' \
-		${WRKSRC}/firemake.libs
-.if defined(WITH_PARANOIA)
-	@${RM} ${WRKSRC}/profiles/Warning.orig
-.endif
-
-do-install:
-	@${CP} ${WRKSRC}/messagewall ${PREFIX}/bin
-	@${CP} ${WRKSRC}/messagewallctl ${PREFIX}/bin
-	@${CP} ${WRKSRC}/messagewallstats ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/etc/messagewall
-	@${CP} ${WRKSRC}/virus.patterns ${PREFIX}/etc/messagewall/
-	@${CP} -r ${WRKSRC}/profiles ${PREFIX}/etc/messagewall/
-.for file in ${CONF1}
-	@${CP} ${WRKSRC}/conf/${file} ${PREFIX}/etc/${file}.sample
-.endfor
-.for file in ${MAN1}
-	@${CP} ${WRKSRC}/man/${file} ${PREFIX}/man/man1/
-.endfor
-.for file in ${MAN5}
-	@${CP} ${WRKSRC}/man/${file} ${PREFIX}/man/man5/
-.endfor
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/messagewall/distinfo b/mail/messagewall/distinfo
deleted file mode 100644
index 858c4333626c..000000000000
--- a/mail/messagewall/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (messagewall_1.0.8.orig.tar.gz) = 5d92a239d9b7639bed8322831056ed8f
-SHA256 (messagewall_1.0.8.orig.tar.gz) = ecd971d8445297e9b7e02f5749e73688fb8625b1c90242e4a4d6f02198189470
-SIZE (messagewall_1.0.8.orig.tar.gz) = 409173
diff --git a/mail/messagewall/files/allow-multiple-recipients.patch b/mail/messagewall/files/allow-multiple-recipients.patch
deleted file mode 100644
index 4166015e3a9f..000000000000
--- a/mail/messagewall/files/allow-multiple-recipients.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- smtp.c-orig	Fri Oct 18 10:24:16 2002
-+++ smtp.c	Tue Mar 25 13:57:37 2003
-@@ -629,20 +629,17 @@
- 
- 		/* 
- 		 * check that we have recipient space
-+		 * Patch from  Quentin Guernsey <quentin@wingateweb.com>
-+		 * Applied by Douglas K. Rand <rand@meridian-enviro.com>
-+		 * Which allows multiple recipients, but applies the profile of
-+		 * the first recipient to all recipients.
-+		 * See http://www.messagewall.org/cgi-bin/ezmlm-browse.cgi?command=showthread&list=messagewall-discuss&month=200303&threadid=lcjcimckfmdphlhpjjhn
- 		 */
--		if (clients[client].can_relay == 1) {
--			if (clients[client].num_to == max_rcpt) {
--				fprintf(stderr,"{%d} (%d) SMTP/REJECT: too many RCPT\n",process,client);
--				SMTP_RESET
--				tls_client_write(client,SMTP_MAXRCPT,sizeof(SMTP_MAXRCPT) - 1);
--				return 0;
--			}
--		} else {
--			if (clients[client].num_to == 1) {
--				fprintf(stderr,"{%d} (%d) SMTP/TEMPORARY: external host attempted multiple recipient delivery, asked for one at a time\n",process,client);
--				tls_client_write(client,SMTP_ONLYONE,sizeof(SMTP_ONLYONE) - 1);
--				return 0;
--			}
-+		if (clients[client].num_to == max_rcpt) {
-+			fprintf(stderr,"{%d} (%d) SMTP/REJECT: too many RCPT\n",process,client);
-+			SMTP_RESET
-+			tls_client_write(client,SMTP_MAXRCPT,sizeof(SMTP_MAXRCPT) - 1);
-+			return 0;
- 		}
- 
- 		/*
diff --git a/mail/messagewall/files/applemail.patch b/mail/messagewall/files/applemail.patch
deleted file mode 100644
index cdc7b211d776..000000000000
--- a/mail/messagewall/files/applemail.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rfc822.c.orig	Fri Jul 12 19:45:03 2002
-+++ rfc822.c	Sat Apr 17 21:05:01 2004
-@@ -156,7 +156,7 @@
- 	} else {
- 		j = i;
- 		while (j < headervalue->l &&
--			strchr(RFC822_WHITESPACE,headervalue->s[j]) == NULL)
-+			strchr(RFC822_WHITESPACE,headervalue->s[j]) == NULL && headervalue->s[j] != ';')
- 			j++;
- 	}
- 
diff --git a/mail/messagewall/files/broken_parameter_value.patch b/mail/messagewall/files/broken_parameter_value.patch
deleted file mode 100644
index 556edadecd9b..000000000000
--- a/mail/messagewall/files/broken_parameter_value.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- rfc822.c.orig	Fri Jul 12 19:45:03 2002
-+++ rfc822.c	Sun May  2 18:04:34 2004
-@@ -156,7 +156,7 @@
- 	} else {
- 		j = i;
- 		while (j < headervalue->l &&
--			strchr(RFC822_WHITESPACE,headervalue->s[j]) == NULL)
-+			strchr(RFC822_WHITESPACE_LOOSE,headervalue->s[j]) == NULL && headervalue->s[j] != ';')
- 			j++;
- 	}
- 
---- rfc822.h.orig	Mon Jun 24 20:45:00 2002
-+++ rfc822.h	Sun May  2 18:04:34 2004
-@@ -21,6 +21,7 @@
- #include <firestring.h>
- 
- #define RFC822_WHITESPACE " \t"
-+#define RFC822_WHITESPACE_LOOSE "\t\n\r"
- #define RFC822_VALUE_MAXLEN 256
- 
- struct rfc822_message_t {
diff --git a/mail/messagewall/files/esmtpsize.patch b/mail/messagewall/files/esmtpsize.patch
deleted file mode 100644
index 724bcc291312..000000000000
--- a/mail/messagewall/files/esmtpsize.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- smtp.c.orig	Fri Jan 16 00:00:00 2004
-+++ smtp.c	Fri Jan 16 00:04:04 2004
-@@ -394,6 +394,8 @@
- 	int atsign;
- 	int l;
- 	int j;
-+	int k;
-+	long message_size;
- 
- 	if (outline.a == 0)
- 		firestring_estr_alloc(&outline,SMTP_LINE_MAXLEN);
-@@ -582,6 +584,27 @@
- 			fprintf(stderr,"{%d} (%d) SMTP/REJECT: MAIL path too long\n",process,client);
- 			tls_client_write(client,SMTP_BADCHAR,sizeof(SMTP_BADCHAR) - 1);
- 			return 0;
-+		}
-+
-+		/*
-+         * ESMPT SIZE patch (2004-01-16) from Michael Ranner <mranner@inode.at>
-+		 * With this patch, messagewall handles the ESMTP SIZE option (RFC1870)
-+		 * "MAIL FROM: <mranner@inode.at> SIZE=12345" like sendmail does.
-+		 * This patch can help you to safe a lot of bandwith.
-+		 */
-+		k = firestring_estr_stristr(line,"size",l);
-+
-+		if (k > -1) {
-+			k = firestring_estr_strchr(line,'=',k);
-+			if ((k > -1) && (line->l > ++k)) {
-+				message_size = strtol(&line->s[k],(char **)NULL,10);
-+				if (message_size > max_message_size) {
-+					fprintf(stderr,"{%d} (%d) SMTP/REJECT: esmtp size %d bytes, message too long\n",process,client,message_size);
-+					tls_client_write(client,SMTP_MESSAGE_TOOLONG,sizeof(SMTP_MESSAGE_TOOLONG) + 1);
-+				} else {
-+					fprintf(stderr,"{%d} (%d) SMTP/STATUS: esmtp size %d bytes\n",process,client,message_size);
-+				}
-+			}
- 		}
- 
- 		/*
diff --git a/mail/messagewall/files/paranoia.patch b/mail/messagewall/files/paranoia.patch
deleted file mode 100644
index 85b8aa003fb8..000000000000
--- a/mail/messagewall/files/paranoia.patch
+++ /dev/null
@@ -1,433 +0,0 @@
---- dbase.c.orig	2002-10-18 17:24:16.000000000 +0200
-+++ dbase.c	2003-01-26 13:33:27.000000000 +0100
-@@ -653,6 +653,8 @@
- 		dbase_load_estr_score_ll(config,&profile->filename_reject,"filename_reject");
- 		dbase_load_estr_score_ll(config,&profile->mime_reject,"mime_reject");
- 
-+		dbase_load_estr_score_ll(config,&profile->fakedbighost_reject,"fakedbighost_reject");
-+		
- 		dbase_load_estr_ll(config,&profile->mime_strip,"mime_strip");
- 		dbase_load_estr_ll(config,&profile->mime_allow,"mime_allow");
- 		dbase_load_int(config,&profile->reject,"reject");
---- firemake.binaries.orig	2002-06-28 22:29:44.000000000 +0200
-+++ firemake.binaries	2003-01-26 13:33:27.000000000 +0100
-@@ -1,3 +1,3 @@
--messagewall: auth.o client.o dbase.o dnsbl.o dnsdcc.o md5.o messagewall.o mime.o rdns.o rfc822.o rmx.o security.o smtp.o tls.o virus.o
-+messagewall: auth.o client.o dbase.o dnsbl.o dnsdcc.o md5.o messagewall.o mime.o rdns.o rfc822.o rmx.o security.o smtp.o tls.o virus.o paranoia.o
- messagewallctl: messagewallctl.o
- messagewallstats: messagewallstats.o
---- man/messagewall_profiles.5.orig	2002-07-22 17:17:33.000000000 +0200
-+++ man/messagewall_profiles.5	2003-01-26 13:33:27.000000000 +0100
-@@ -1,5 +1,5 @@
- .\" (C) 2002 Ian Gulliver
--.TH messagewall_profiles 5 2002-06-08
-+.TH messagewall_profiles 5 2002-12-06
- .SH DESCRIPTION
- Any regular files in the directory defined as
- .B profile_dir
-@@ -42,7 +42,7 @@
- .I Default: 1
- .br
- This is the score at which MessageWall will reject the message.
--Any message acheiving a score below this will simply have warnings
-+Any message achieving a score below this will simply have warnings
- added to its headers indicating which tests it failed.
- 
- .B mime_strip
-@@ -138,6 +138,29 @@
- return mail cause the message to be rejected.  This should be safe
- to use in almost all cases.
- 
-+.B fakedbighost_reject
-+.br
-+.I Example:
-+.br
-+.I fakedbighost_reject=1,hotmail.com
-+.br
-+The value of a
-+.B fakedbighost_reject
-+line should contain a domain/host name. Incoming mail from this
-+domain (the domainname is taken from the sending address) is checked against 
-+the "Received:" header fields. If NO match is found the assigned score is added. 
-+Use this with extreme care! And only use this for big sites that have their 
-+mail servers host name in the Received header line. If only the ip address 
-+is shown in the Received header (which is ok with rfc821) this feature is
-+worthless. Many small sites are
-+virtual which means the host name of the actual domain the mail belongs 
-+to isn't shown in any of the Received lines. Instead the name or ip 
-+address of the ISP hosting the virtual domain is in the Received line.
-+And don't forget nearly all header lines can be forged.
-+There can be multiple
-+.B fakedbighost_reject
-+lines.
-+
- .B header_reject
- .br
- .I Example:
-@@ -146,7 +169,7 @@
- .br
- The value of a
- .B header_reject
--line should contain a colon seperated
-+line should contain a colon separated
- string of Header:Key.  The "Key" will be case-sensitively searched
- for in the value of the header.  If a match is found, the message
- is refused.  There can be multiple
-@@ -161,7 +184,7 @@
- .br
- The value of a
- .B header_rejecti
--line should contain a colon seperated
-+line should contain a colon separated
- string of Header:Key.  The "Key" will be case-insensitively searched
- for in the value of the header.  If a match is found, the message
- is refused.  There can be multiple
---- messagewall.h.orig	2002-10-18 17:24:16.000000000 +0200
-+++ messagewall.h	2003-01-26 13:33:39.000000000 +0100
-@@ -167,6 +167,7 @@
- 	int reject;
- 	struct messagewall_header_reject_t *header_rejecti;
- 	struct messagewall_header_reject_t *header_reject;
-+	struct messagewall_estr_score_ll_t *fakedbighost_reject;
- 	struct messagewall_estr_score_ll_t *body_reject;
- 	struct messagewall_estr_score_ll_t *body_rejecti;
- 	struct messagewall_estr_score_ll_t *filename_reject;
---- messagewallstats.c.orig	2002-10-18 17:24:16.000000000 +0200
-+++ messagewallstats.c	2003-01-26 13:33:27.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <string.h>
- #include <firestring.h>
- 
-+
- static const char tagstring[] = "$Id: messagewallstats.c,v 1.17.2.3 2002/10/01 19:05:22 ian Exp $";
- 
- struct counter {
-@@ -37,6 +38,7 @@
- struct counter *rmx = NULL;
- struct counter *rmx_temp = NULL;
- struct counter *to_cc = NULL;
-+struct counter *fakedbighost = NULL;
- struct counter *from = NULL;
- struct counter *dnsbl_domain = NULL;
- struct counter *dnsdcc = NULL;
-@@ -118,6 +120,7 @@
- 	int filter_dnsbl_domain = 0;
- 	int filter_dnsbl = 0;
- 	int filter_to_cc = 0;
-+	int filter_fakedbighost = 0;
- 	int filter_from = 0;
- 	int filter_rmx = 0;
- 	int filter_rdns = 0;
-@@ -302,6 +305,20 @@
- 			}
- 			continue;
- 		}
-+
-+		if (strstr(line, "no matching host of domain from sending address found in mail trace header") != NULL) {
-+			filter_fakedbighost++;
-+			start = strstr(line,"PARANOIA/WARNING: ");
-+			if (start == NULL)
-+				continue;
-+			start += 18;
-+			end = strchr(start,':');
-+			if (end != NULL) {
-+				*end = '\0';
-+				increment(&fakedbighost,start);
-+			}
-+			continue;
-+		}
- 		
- 		if (strstr(line,"envelope reverse path not in From\n") != NULL) {
- 			filter_from++;
-@@ -574,6 +591,8 @@
- 	fprintf(stdout,"Messages Rejected by Filter: %d\n",filter_reject);
- 	fprintf(stdout,"\tFailed To/CC: %d\n",filter_to_cc);
- 	print(to_cc,"\t\t");
-+	fprintf(stdout,"\tFailed From/faked big host: %d\n",filter_fakedbighost);
-+	print(fakedbighost,"\t\t");
- 	fprintf(stdout,"\tFailed From: %d\n",filter_from);
- 	print(from,"\t\t");
- 	fprintf(stdout,"\tMatched DNSBL: %d\n",filter_dnsbl);
---- paranoia.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ paranoia.c	2003-01-26 13:33:27.000000000 +0100
-@@ -0,0 +1,145 @@
-+/*
-+paranoia.c - paranoia host checking for MessageWall
-+Copyright (C) 2002 Collin R. Mulliner
-+
-+MessageWall Copyright (C) 2002 Ian Gulliver
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of version 2 of the GNU General Public License as
-+published by the Free Software Foundation.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+*/
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <firestring.h>
-+#include "messagewall.h"
-+#include "mime.h"
-+#include "smtp.h"
-+#include "rfc822.h"
-+#include "paranoia.h"
-+
-+/*
-+ *  look for domain in "by" and "from" part of mail path (in "Received" line)
-+ */
-+int check_by_from(struct firestring_estr_t *hline, struct firestring_estr_t *domain)
-+{
-+	struct firestring_estr_t host;
-+	int i;
-+	
-+	
-+	i = firestring_estr_stristr(hline, "from", 0);
-+	if (i != -1) {
-+		i += 4;
-+		while (hline->l > i && strchr(RFC822_WHITESPACE, hline->s[i])) { i++; }
-+		host.s = &hline->s[i];
-+		host.l = i;
-+		while (hline->l > i && !strchr(RFC822_WHITESPACE, hline->s[i])) { i++; }
-+		host.l = i - host.l; 
-+		host.a = host.l;
-+		
-+		if (firestring_estr_estristr(&host, domain, 0) != -1) return(0);
-+	}
-+	
-+	i = firestring_estr_stristr(hline, "by", 0);
-+	if (i != -1) {
-+		i += 2;
-+		while (hline->l > i && strchr(RFC822_WHITESPACE, hline->s[i])) { i++; }
-+		host.s = &hline->s[i];
-+		host.l = i;
-+		while (hline->l > i && !strchr(RFC822_WHITESPACE, hline->s[i])) { i++; }
-+		host.l = i - host.l; 
-+		host.a = host.l;
-+		
-+		if (firestring_estr_estristr(&host, domain, 0) != -1) return(0);
-+	}
-+	
-+	return(1);
-+}
-+
-+/*
-+ * mail path checking
-+ */
-+int paranoia_fakedbighost_check(struct rfc822_message_t *message, struct messagewall_estr_score_ll_t *head, struct firestring_estr_t *address)
-+{
-+	struct firestring_estr_t *value;
-+	int i, n;
-+	struct firestring_estr_t domain_part, *recv;
-+	int atpos, dotpos, lastdotpos, llastdotpos;
-+	int docheck = 0;
-+
-+/*	fprintf(stderr, "Paranoia DEBUG: address=");
-+	for (i = 0; i < address->l; i++) {
-+		fprintf(stderr, "%c", address->s[i]);
-+	}
-+	fprintf(stderr, "\n");
-+*/
-+	/* we only want the second level domain, no subdomain or host */
-+	atpos = firestring_estr_strchr(address, '@', 0);
-+	if (atpos != -1) {
-+		dotpos = atpos;
-+		lastdotpos = atpos;
-+		do {
-+			llastdotpos = lastdotpos;
-+			lastdotpos = dotpos;
-+			dotpos = firestring_estr_strchr(address, '.', lastdotpos+1);
-+		} while (dotpos != -1);
-+	
-+		firestring_estr_alloc(&domain_part, address->l);
-+		firestring_estr_estrcpy(&domain_part, address, llastdotpos+1);
-+	}
-+	else return(0);
-+
-+/*	fprintf(stderr, "Paranoia DEBUG: domain=");
-+	for (i = 0; i < domain_part.l; i++) {
-+		fprintf(stderr, "%c", domain_part.s[i]);
-+	}
-+	fprintf(stderr, "\n");
-+*/	
-+	/* do we have to check this message? */
-+	while (head != NULL) {
-+		if (firestring_estr_estristr(&head->string, &domain_part, 0) == 0) {
-+			docheck = 1;
-+			break;
-+		}
-+		head = head->next;
-+	}
-+	
-+	/* don't do check! - return ok */
-+	if (docheck == 0) {
-+		firestring_estr_free(&domain_part);
-+		return(0);
-+	}
-+	
-+	/* some debbuging stuff */
-+/*	fprintf(stderr,"Paranoia DEBUG: [from: %s] [domain: %s]\n", address->s, domain_part.s);
-+*/	
-+	/* step thru all received lines and check the by/from hosts */
-+	n = 0;
-+	do {
-+		recv = rfc822_header_value_n(message, "Received:", n);
-+	
-+		if (recv != NULL) {
-+			/* if check is successful return */
-+			if (check_by_from(recv, &domain_part) == 0) {
-+				firestring_estr_free(&domain_part);
-+				return(0);
-+			}
-+		}
-+		n++;
-+	} while (recv != NULL);
-+	
-+	/* free memory */
-+	firestring_estr_free(&domain_part);
-+	
-+	/* return score when not found */
-+	return(head->score);
-+}
---- paranoia.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ paranoia.h	2003-01-26 13:33:27.000000000 +0100
-@@ -0,0 +1,31 @@
-+/*
-+paranoia.c - paranoia host checking declarations for MessageWall
-+Copyright (C) 2002 Collin R. Mulliner
-+
-+MessageWall Copyright (C) 2002 Ian Gulliver
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of version 2 of the GNU General Public License as
-+published by the Free Software Foundation.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+*/
-+
-+#ifndef _PARANOIA_H
-+#define _PARANOIA_H
-+
-+#define PARANOIA_MSG "no matching host of domain from sending address found in mail trace header"
-+
-+#include <firestring.h>
-+
-+int check_by_from(struct firestring_estr_t *hline, struct firestring_estr_t *domain);
-+int paranoia_fakedbighost_check(struct rfc822_message_t *message, struct messagewall_estr_score_ll_t *head, struct firestring_estr_t *address);
-+
-+#endif
---- profiles/Warning.orig	2002-06-21 19:02:51.000000000 +0200
-+++ profiles/Warning	2003-01-26 13:33:27.000000000 +0100
-@@ -31,3 +31,6 @@
- header_rejecti=1,X-Mailer:bulk
- virus_scan=1,virus.patterns
- mime_allow=text/plain
-+fakedbighost_reject=1,hotmail.com
-+fakedbighost_reject=1,aol.com
-+
---- rfc822.c.orig	2002-07-12 19:45:03.000000000 +0200
-+++ rfc822.c	2003-01-26 13:33:27.000000000 +0100
-@@ -51,6 +51,44 @@
- 	}
- }
- 
-+/*
-+ * get header value of header line with more then one accurence
-+ * get Nth line (starts at 0 (zero)), count beginns top of mail
-+ */
-+struct firestring_estr_t *rfc822_header_value_n(struct rfc822_message_t *message, char *header, int n) {
-+	static struct firestring_estr_t ret;
-+	int i,j,l,c = 0;
-+	int newline = 1;
-+
-+	l = strlen(header);
-+	for (i = 0; i < message->header.l - l; i++) {
-+		if (newline == 1 && firestring_strncasecmp(&message->header.s[i],header,l) == 0) {
-+		   if (c < n) { c++; continue; }
-+			/*
-+			 * got it
-+			 */
-+			i += l;
-+			while (i < message->header.l && strchr(RFC822_WHITESPACE,message->header.s[i++]) != NULL);
-+			i--;
-+			for (j = i; j <= message->header.l - 2; j++)
-+				if (memcmp(&message->header.s[j],"\r\n",2) == 0)
-+					if (j >= message->header.l - 3 || strchr(RFC822_WHITESPACE,message->header.s[j+2]) == NULL)
-+						break;
-+			ret.s = &message->header.s[i];
-+			ret.a = ret.l = j - i;
-+			return &ret;
-+		} else if (memcmp(&message->header.s[i],"\r\n",2) == 0) {
-+			/*
-+			 * new line
-+			 */
-+			newline = 1;
-+			i++;
-+		} else
-+			newline = 0;
-+	}
-+	return NULL;
-+}
-+
- struct firestring_estr_t *rfc822_header_value(struct rfc822_message_t *message, char *header) {
- 	static struct firestring_estr_t ret;
- 	int i,j,l;
---- rfc822.h.orig	2002-06-24 20:45:00.000000000 +0200
-+++ rfc822.h	2003-01-26 13:33:27.000000000 +0100
-@@ -30,6 +30,7 @@
- 
- int rfc822_split_message(struct firestring_estr_t *data, struct rfc822_message_t *message);
- 
-+struct firestring_estr_t *rfc822_header_value_n(struct rfc822_message_t *message, char *header, int n);
- struct firestring_estr_t *rfc822_header_value(struct rfc822_message_t *message, char *header);
- struct firestring_estr_t *rfc822_eheader_value(struct rfc822_message_t *message, struct firestring_estr_t *header);
- struct firestring_estr_t *rfc822_parameter_value(struct firestring_estr_t *headervalue, char *parameter);
---- smtp.c.orig	2002-10-18 17:24:16.000000000 +0200
-+++ smtp.c	2003-01-26 13:33:27.000000000 +0100
-@@ -206,6 +206,7 @@
- 
- int smtp_checks_gotmessage(int client) {
- 	int numparts;
-+	int score = 0;
- 
- 	/*
- 	 * clear dnsdcc queries for client
-@@ -263,6 +264,14 @@
- 	}
- 
- 	/*
-+	 * check for "faked big host"
-+	 */
-+	if ((score = paranoia_fakedbighost_check(&clients[client].parts[0].message, clients[client].profile->fakedbighost_reject, &clients[client].from)) != 0) {
-+		if (smtp_reject(client,"PARANOIA","%e: no matching host of domain from sending address found in mail trace header",SMTP_FROM_RECEIVED,score,0,&clients[client].from,NULL) != 0)
-+			return(0);
-+	}
-+	
-+	/*
- 	 * header rejection checks
- 	 */
- 	if (rfc822_header_reject_check(client) == 1 || rfc822_header_rejecti_check(client) == 1)
---- smtp.h.orig	2002-09-28 19:21:02.000000000 +0200
-+++ smtp.h	2003-01-26 13:33:27.000000000 +0100
-@@ -63,6 +63,7 @@
- #define SMTP_7BIT "501 MessageWall: SMTP/FATAL: Server sent an 8bit character to a 7bit server\r\n"
- #define SMTP_TO_CC "552 MessageWall: RFC822/REJECT: %e: Target address must be in To or CC headers\r\n"
- #define SMTP_FROM "552 MessageWall: RFC822/REJECT: %e: Source address must be in From header\r\n"
-+#define SMTP_FROM_RECEIVED "552 MessageWall: PARANOIA/REJECT: %e: no matching host of domain from sending address found in mail trace header\r\n"
- #define SMTP_REALNAME "552 MessageWall: RFC822/REJECT: From address must contain a real name\r\n"
- #define SMTP_HEADER "552 MessageWall: RFC822/REJECT: Message contained banned header fields: %e%e\r\n"
- #define SMTP_ERRORS "554 MessageWall: SMTP/REJECT: Too many errors, goodbye\r\n"
diff --git a/mail/messagewall/files/patch-exchange-server b/mail/messagewall/files/patch-exchange-server
deleted file mode 100644
index f497cc898ba4..000000000000
--- a/mail/messagewall/files/patch-exchange-server
+++ /dev/null
@@ -1,20 +0,0 @@
---- client.c-orig	Sat Sep 28 12:21:02 2002
-+++ client.c	Tue Mar 25 13:57:37 2003
-@@ -384,8 +384,15 @@
- 				line = client_get_line(n);
- 				if (line == NULL)
- 					return 0;
--				tls_client_write(backends[n].client,line->s,line->l);
--				tls_client_write(backends[n].client,"\r\n",2);
-+				/*
-+				 * Patch from Russell Vincent <rv2@sanger.ac.uk>
-+				 * Applied by Douglas K. Rand <rand@meridian-enviro.com>
-+				 * Works around problem with MS Exchange servers not liking
-+				 * the \r\n showing up in a seperate packet.
-+				 * See http://messagewall.org/cgi-bin/ezmlm-browse.cgi?command=showthread&list=messagewall-discuss&month=200302&threadid=nnoiaogojliciagmgpbk
-+				 */
-+				firestring_estr_sprintf(&outline,"%e\r\n", line);
-+				tls_client_write(backends[n].client,outline.s,outline.l);
- 				firestring_estr_0(line);
- 				fprintf(stderr,"{%d} [%d] BACKEND/ACCEPT: accepted message responsibility: '%s'\n",process,n,line->s);
- 				if (line->l >= 4 && line->s[3] != '-') {
diff --git a/mail/messagewall/files/spam_stats.patch b/mail/messagewall/files/spam_stats.patch
deleted file mode 100644
index ecc0f98c4896..000000000000
--- a/mail/messagewall/files/spam_stats.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- messagewallstats.c.orig	Fri Oct 18 17:24:16 2002
-+++ messagewallstats.c	Sun May  2 18:30:47 2004
-@@ -48,6 +48,8 @@
- struct counter *virus = NULL;
- struct counter *encoding = NULL;
- struct counter *illegal_multipart = NULL;
-+struct counter *dnsbl_domain_spam_score = NULL;
-+struct counter *dnsbl_spam_score = NULL;
- 
- void increment(struct counter **head, char *name) {
- 	struct counter *temp;
-@@ -96,9 +98,9 @@
- 	int quit = 0;
- 	int disconnect = 0;
- 	int disconnect_data = 0;
--        long bytes_total = 0;
--        long bytes_delivered = 0;
--        long bytes_received =0;
-+	long bytes_total = 0;
-+	long bytes_delivered = 0;
-+	long bytes_received =0;
- 	int idle = 0;
- 	int errors = 0;
- 	int bare_lf = 0;
-@@ -275,6 +277,15 @@
- 				*end = '\0';
- 				increment(&dnsbl,start);
- 			}
-+			
-+			if (end != NULL) {
-+				start = end + 1;
-+				end = strchr(start, ':');
-+				*end = '\0';
-+				
-+				increment(&dnsbl_spam_score,start);
-+			}
-+			
- 			continue;
- 		}
- 
-@@ -286,6 +297,21 @@
- 				*end = '\0';
- 				increment(&dnsbl_domain,start);
- 			}
-+			
-+			if (end != NULL) {
-+				end++;
-+				start = strchr(end, ':');
-+				*start = '\0';
-+				start = strchr(end, '.');
-+				if (strchr(start+1, '.') != NULL) {
-+					start++;
-+				}
-+				else {
-+					start = end;
-+				}
-+				increment(&dnsbl_domain_spam_score,start);
-+			}
-+			
- 			continue;
- 		}
- 
-@@ -607,11 +633,18 @@
- 	print(encoding,"\t\t");
- 	fprintf(stdout,"\tInvalid QP encoding: %d\n",filter_qp);
- 	fprintf(stdout,"\tInvalid base64 encoding: %d\n",filter_base64);
--        fprintf(stdout,"\n");
-+	fprintf(stdout,"\n");
- 
--        fprintf(stdout,"Mail Traffic\n");
--        fprintf(stdout,"\tBytes received: %ld\n",bytes_total);
--        fprintf(stdout,"\tBytes rejected: %ld\n",bytes_total - bytes_delivered);
--        fprintf(stdout,"\tBytes accepted: %ld\n",bytes_delivered);
-+	fprintf(stdout,"Mail Traffic\n");
-+	fprintf(stdout,"\tBytes received: %ld\n",bytes_total);
-+	fprintf(stdout,"\tBytes rejected: %ld\n",bytes_total - bytes_delivered);
-+	fprintf(stdout,"\tBytes accepted: %ld\n",bytes_delivered);
-+	
-+	fprintf(stdout, "\nSpammers");
-+	fprintf(stdout, "\n\tDomain based:\n");
-+	print(dnsbl_domain_spam_score,"\t\t");
-+	fprintf(stdout, "\n\tIP based:\n");
-+	print(dnsbl_spam_score,"\t\t");
-+		
- 	exit(0);
- }
diff --git a/mail/messagewall/pkg-descr b/mail/messagewall/pkg-descr
deleted file mode 100644
index 3bab19ffaf59..000000000000
--- a/mail/messagewall/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-MessageWall is an SMTP proxy. It sits between the outside world and
-your mail server and keeps out viruses, spam, and mail relaying.
-It offers filtering via header and body checks, DNS-based blacklists
-for IP addresses (DNSBL) and domains (RHSBL), DNS-based distributed
-checksumming (DNS DCC) similar to Vipul's Razor, and Open AntiVirus
-pattern scanning.  ke many existing ISP-level filtering solutions,
-it offers customization of filtering features on a per-address
-basis. Unlike SpamAssassin, it communicates via SMTP, so it works
-with any MTA. It also supports scoring based on rules with a rejection
-threshold; this allows hybrid warning/rejection configurations based
-on how many and which rules a message matches.
diff --git a/mail/messagewall/pkg-message b/mail/messagewall/pkg-message
deleted file mode 100644
index 0567056f416c..000000000000
--- a/mail/messagewall/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-***************************************************************************
-Messagewall has been installed, now create the chroot environment:
-	mkdir /home/mwall
-	groupadd mwall
-	useradd -g mwall mwall
-	mkdir /home/mwall/pids
-	chown mwall:mwall /home/mwall/pids
-	mkdir /home/mwalla
-	groupadd mwalla
-	useradd -g mwalla mwalla
-	mkdir /home/mwalla/pids
-	chown mwalla:mwalla /home/mwalla/pids
-copy the virus patterns into your enviroment
-	cp /usr/local/etc/messagewall/virus.patterns /home/mwall
-and don't forget to edit your configfile!
-***************************************************************************
diff --git a/mail/messagewall/pkg-plist b/mail/messagewall/pkg-plist
deleted file mode 100644
index 92dd90485cdd..000000000000
--- a/mail/messagewall/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/messagewall
-bin/messagewallctl
-bin/messagewallstats
-etc/messagewall.conf.sample
-etc/messagewall/virus.patterns
-etc/messagewall/profiles/None
-etc/messagewall/profiles/Medium Plus
-etc/messagewall/profiles/Light
-etc/messagewall/profiles/Relay
-etc/messagewall/profiles/Warning
-etc/messagewall/profiles/Medium
-etc/messagewall/profiles/Reject
-etc/messagewall/profiles/Strong
-etc/messagewall/profiles/Light Plus
-etc/messagewall/profiles/Strong Plus
-etc/messagewall/profiles/Extreme
-@dirrm etc/messagewall/profiles
-@dirrm etc/messagewall
diff --git a/mail/pgen/Makefile b/mail/pgen/Makefile
deleted file mode 100644
index cc872cc4eac6..000000000000
--- a/mail/pgen/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	pgen
-# Date created:				30 June 2001
-# Whom:					petef@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pgen
-PORTVERSION=	0.2
-CATEGORIES=	mail
-MASTER_SITES=	http://www.happygiraffe.net/dist/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tool to generate a procmailrc file with m4 macros
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-GNU_CONFIGURE=	yes
-
-NO_BUILD=	yes
-
-MAN1=	pgen.1
-
-post-patch:
-	@${REINPLACE_CMD} -e 's!{INSTALL_PROGRAM}!{INSTALL_SCRIPT}!g' \
-		${WRKSRC}/configure ${WRKSRC}/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/mail/pgen/distinfo b/mail/pgen/distinfo
deleted file mode 100644
index f6f579ecef1e..000000000000
--- a/mail/pgen/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pgen-0.2.tar.gz) = bcca61da96c2bc3b10b7a3bcf89ea2da
-SHA256 (pgen-0.2.tar.gz) = 3b9ffc3517e0769da7dd1c34deca22c7f3fc79c90cf9af33c789054eb99be4d4
-SIZE (pgen-0.2.tar.gz) = 16974
diff --git a/mail/pgen/pkg-descr b/mail/pgen/pkg-descr
deleted file mode 100644
index d6433ea10802..000000000000
--- a/mail/pgen/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-pgen is a little tool that uses m4(1) and some macros to help build
-and maintain a procmailrc file. It can make life much simpler than
-having to remember how procmail recipes work each time you subscribe
-to a new mailing list.
-
-It won't help you maintain the worlds most complex procmailrc file,
-but for simple cases, it can make life a lot more convenient (and
-amenable to further postprocessing).
-
-WWW: http://www.happygiraffe.net/pgen.html
diff --git a/mail/pgen/pkg-plist b/mail/pgen/pkg-plist
deleted file mode 100644
index 107dd340e6f2..000000000000
--- a/mail/pgen/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/pgen
-share/pgen/procmail-defn.m4
-share/pgen/procmail.m4
-@dirrm share/pgen
diff --git a/mail/regm/Makefile b/mail/regm/Makefile
deleted file mode 100644
index ba9164e18f13..000000000000
--- a/mail/regm/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	regm
-# Date created:				21 July 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	regm
-PORTVERSION=	1.0
-CATEGORIES=	mail python
-MASTER_SITES=	http://hamete.org/regm/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Extract messages from a mailbox using regular expressions
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-PLIST_FILES=	bin/regm
-NO_BUILD=	yes
-USE_PYTHON=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/env python|#!${PYTHON_CMD}|' \
-		${WRKSRC}/regm.py
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/regm.py ${PREFIX}/bin/regm
-
-.include <bsd.port.mk>
diff --git a/mail/regm/distinfo b/mail/regm/distinfo
deleted file mode 100644
index 5e33d6202e8c..000000000000
--- a/mail/regm/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (regm-1.0.tar.gz) = 6a99788829bb0e21b64b559b88238c5a
-SHA256 (regm-1.0.tar.gz) = a1a4d3ac27a3b1dcf8eada7649ca2430c0c6339af83714eb6e96dec02352a372
-SIZE (regm-1.0.tar.gz) = 11978
diff --git a/mail/regm/pkg-descr b/mail/regm/pkg-descr
deleted file mode 100644
index e0e17b947671..000000000000
--- a/mail/regm/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-regm is a Python script to extract messages from a mbox-style
-mailbox using a regular expression.  There are advanced options to
-specify multiple regular expressions, different output formats,
-and more.
-
-WWW: http://hamete.org/regm/
diff --git a/mail/ricochet/Makefile b/mail/ricochet/Makefile
deleted file mode 100644
index 892de4accc1d..000000000000
--- a/mail/ricochet/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	ricochet
-# Date created:				02 September 2001
-# Whom:	      				Yen-Ming Lee <leeym@leeym.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ricochet
-PORTVERSION=	0.98
-PORTREVISION=	2
-CATEGORIES=	mail
-MASTER_SITES=	http://vipul.net/perl/sources/spamcontrol/ricochet/ \
-		http://mirage.izhnet.ru/distfiles/ \
-		http://freebsd.unixfreunde.de/sources/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An automated agent for tracing and reporting internet junk mail
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-RUN_DEPENDS=	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
-		${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
-
-NO_BUILD=	yes
-PERL_CONFIGURE=	yes
-
-do-configure:
-.for file in install ricochet
-	${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' ${WRKSRC}/${file}
-	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/${file}
-	${REINPLACE_CMD} -e 's,%%INSTALL_DATA%%,${INSTALL_DATA},g' ${WRKSRC}/${file}
-.endfor
-
-do-install:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ./install
-
-.include <bsd.port.mk>
diff --git a/mail/ricochet/distinfo b/mail/ricochet/distinfo
deleted file mode 100644
index 7060a6bc1789..000000000000
--- a/mail/ricochet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ricochet-0.98.tar.gz) = d2e45dadd61c7d0f19b63e40604d9c66
-SHA256 (ricochet-0.98.tar.gz) = 88283587359a45146f3dc7d9c8cc9f3ec7e9cf2a691b4f38693445c89460297d
-SIZE (ricochet-0.98.tar.gz) = 32057
diff --git a/mail/ricochet/files/patch-complaint b/mail/ricochet/files/patch-complaint
deleted file mode 100644
index 666f8df1e7f1..000000000000
--- a/mail/ricochet/files/patch-complaint
+++ /dev/null
@@ -1,9 +0,0 @@
---- complaint-template.bak	Thu Feb  8 18:09:41 2001
-+++ complaint-template	Wed Oct  8 06:50:31 2003
-@@ -14,5 +14,5 @@
- 
- ------------ unsolicited commercial mail follows -----------
- 
--{return $self->spam} 
-+>{return $self->spam}
- 
diff --git a/mail/ricochet/files/patch-install b/mail/ricochet/files/patch-install
deleted file mode 100644
index 88080974bf35..000000000000
--- a/mail/ricochet/files/patch-install
+++ /dev/null
@@ -1,59 +0,0 @@
---- install.orig	Sat Oct 23 07:22:23 1999
-+++ install	Fri Sep  7 09:05:47 2001
-@@ -11,13 +11,13 @@
- 
- $APP = 'Ricochet'; 
- $VERSION = '0.92';
--$DIR = "$ENV{HOME}/.ricochet"; 
-+$DIR = "%%PREFIX%%/share/ricochet";
- @PACKAGE = qw/TODO CHANGES README ARTISTIC complaint-template ricochet abuse-contacts/; 
- 
- @REQUIRED = qw /Mail::Internet Net::DNS Text::Template Net::XWhois LWP::UserAgent/;  
- 
--$BINDIR = '/usr/local/bin'; 
-+$BINDIR = '%%PREFIX%%/bin'; 
--$EMAIL = defined $ENV{EMAIL} ? $ENV{EMAIL} : "$ENV{USERNAME}\@$ENV{HOSTNAME}";
-+$EMAIL = defined $ENV{EMAIL} ? $ENV{EMAIL} : "$ENV{USER}\@$ENV{HOST}";
- 
- ## Print an intro message.
- print "\n---== $APP $VERSION Install ==---\n\n"; 
-@@ -89,25 +89,25 @@
- }
- 
- ## Take config params: 
--&take_input ("Where should I place the Ricochet executable [Default: $BINDIR]?", \$BINDIR); 
--&take_input ("Return email address for complaint mails [Default: $EMAIL]?", \$EMAIL);  
-+#&take_input ("Where should I place the Ricochet executable [Default: $BINDIR]?", \$BINDIR); 
-+#&take_input ("Return email address for complaint mails [Default: $EMAIL]?", \$EMAIL);  
- 
- ## Make $HOME/.ricochet 
- unless (-e $DIR) { 
-     print "\nMaking $DIR...\n"; 
--    mkdir $DIR, 0700; 
-+    mkdir $DIR, 0755; 
- }
- print "\n"; 
- 
- unless (-e "$DIR/whois") { 
-     print "\nMaking $DIR/whois ...\n"; 
--    mkdir "$DIR/whois", 0700; 
-+    mkdir "$DIR/whois", 0755; 
- }
- print "\n"; 
- 
- unless (-e "$DIR/backup") { 
-     print "\nMaking $DIR/backup ...\n"; 
--    mkdir "$DIR/backup", 0700; 
-+    mkdir "$DIR/backup", 0755; 
- }
- print "\n"; 
- 
-@@ -119,7 +119,7 @@
-         system "mv $DIR/$_ $DIR/backup/$_";
-     }    
-     print "Copying $_ to $DIR ...\n"; 
--    system "cp $_ $DIR"; 
-+    system "%%INSTALL_DATA%% $_ $DIR"; 
-     print "\n";
- } @PACKAGE; 
- 
diff --git a/mail/ricochet/files/patch-ricochet b/mail/ricochet/files/patch-ricochet
deleted file mode 100644
index 328cbabbcaf3..000000000000
--- a/mail/ricochet/files/patch-ricochet
+++ /dev/null
@@ -1,41 +0,0 @@
---- ricochet.orig	Tue Jun 24 22:40:18 2003
-+++ ricochet	Wed Oct  8 06:42:08 2003
-@@ -566,15 +566,14 @@
-     my ( $domain ) = @_;
-     $ua = new LWP::UserAgent;
-     $ua->agent("Ricochet/0.1 " . $ua->agent);
--    my $req = new HTTP::Request POST => 'http://www.abuse.net/lookup.phtml'; 
--    $req->content_type('application/x-www-form-urlencoded');
--    $req->content("DOMAIN=$domain");
-+    my $req = new HTTP::Request GET => "http://www.abuse.net/lookup.phtml?DOMAIN=$domain";
-+    $ua->timeout(20);
-     my $res = $ua->request($req);
- 
-    if ($res->is_success) {
-         my $content = $res->content;
-         return undef if $content =~ /no information for this domain/;
--        my @matches = $content =~ /(\S+\@\S+)\s*<BR>/ig; 
-+	my @matches = $content =~ /<tt>(\S+\@\S+)<\/tt>/g;
-         return \@matches;
-    } else {
-         return undef;
-@@ -607,13 +606,17 @@
- 
- sub initialize { 
-     my $self = shift; 
--    my $rc = "$ENV{RICOCHET}" || "$ENV{HOME}/.ricochet"; $rc .= "/ricochetrc"; 
-+    my $rc = "$ENV{RICOCHET}" || -d "$ENV{HOME}/.ricochet" ? "$ENV{HOME}/.ricochet" : "%%PREFIX%%/share/ricochet";
-+    $rc .= "/ricochetrc"; 
-     Carp::croak "** Ricochet configuration file $rc doesn't exist. Aborting.\n" unless -e $rc; 
-     open (RC, $rc); 
-     grep { 
-         chomp; 
-         s/#.*$//; 
--        my ($field, $value) = split /:/, $_, 2; $value =~ s/\s//g; $field =~ s/\s//g; 
-+	my ($field, $value) = split /:/, $_, 2;
-+	$value =~ s/^\s+//;
-+	$value =~ s/\s+$//;
-+	$field =~ s/\s//g;
-         $self->{$field} = $value unless $field ne "SENDMAIL" && defined $self->{$field}; 
-     } (<RC>); 
-     close RC; 
diff --git a/mail/ricochet/pkg-descr b/mail/ricochet/pkg-descr
deleted file mode 100644
index 22eee5ceba88..000000000000
--- a/mail/ricochet/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-    Ricochet is an automated agent for tracing and reporting  internet  junk
-    mail (a.k.a Spam). Ricochet analyses the headers of a spam  to  identity
-    the machines used for its injection, looks up the email addresses of the
-    machine owners and mails out a complaint to them. Ricochet uses  various
-    network information resources like nameserver records,  MX  records  and
-    Whois databases worldwide to collect and verify this information.
-
-WWW: http://www.vipul.net/ricochet/
diff --git a/mail/ricochet/pkg-plist b/mail/ricochet/pkg-plist
deleted file mode 100644
index a247fc0b72ab..000000000000
--- a/mail/ricochet/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/ricochet
-%%DATADIR%%/ARTISTIC
-%%DATADIR%%/CHANGES
-%%DATADIR%%/README
-%%DATADIR%%/TODO
-%%DATADIR%%/abuse-contacts
-%%DATADIR%%/complaint-template
-%%DATADIR%%/ricochet
-%%DATADIR%%/ricochetrc
-%%DATADIR%%/skip-list
-@dirrm %%DATADIR%%/whois
-@dirrm %%DATADIR%%/backup
-@dirrm %%DATADIR%%
diff --git a/mail/smtpclient/Makefile b/mail/smtpclient/Makefile
deleted file mode 100644
index a9a63fb9c816..000000000000
--- a/mail/smtpclient/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Ports collection makefile for:  smtpclient
-# Date created:			  24 Aug 2001
-# Whom:				  Kris Kennaway <kris@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	smtpclient
-PORTVERSION=	1.0.0
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	ftp://www.ossp.org/pkg/tool/smtpclient/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple SMTP client
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-GNU_CONFIGURE=	yes
-MAN1=		smtpclient.1
-PLIST_FILES=	bin/smtpclient
-
-.include <bsd.port.mk>
diff --git a/mail/smtpclient/distinfo b/mail/smtpclient/distinfo
deleted file mode 100644
index 731dda5c1ac7..000000000000
--- a/mail/smtpclient/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (smtpclient-1.0.0.tar.gz) = 8b5d9260572107bb901edf6aacbf3747
-SHA256 (smtpclient-1.0.0.tar.gz) = 746034fdf91a676ef79132a4aa0fd70c20e1471f539d4d1e9ec642099720c5bc
-SIZE (smtpclient-1.0.0.tar.gz) = 40033
diff --git a/mail/smtpclient/files/patch-smtpclient_errno_c b/mail/smtpclient/files/patch-smtpclient_errno_c
deleted file mode 100644
index 75593f94b9eb..000000000000
--- a/mail/smtpclient/files/patch-smtpclient_errno_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- smtpclient_errno.c.orig	Wed Aug  1 15:09:39 2001
-+++ smtpclient_errno.c	Wed Aug  1 15:11:36 2001
-@@ -91,7 +91,7 @@ char *errorstr(int errnum)
- #else
- 	static char buffer[50];
- 	if (errnum < 0 || errnum >= sys_nerr)  {
--	    sprintf(buffer, "ERR-UNKNOWN (%d)", errnum);
-+	    snprintf(buffer, (sizeof(buffer) - 1), "ERR-UNKNOWN (%d)", errnum);
- 	    return(buffer);
- 	}
- 	return(sys_errlist[errnum]);
diff --git a/mail/smtpclient/files/patch-smtpclient_main_c b/mail/smtpclient/files/patch-smtpclient_main_c
deleted file mode 100644
index a79101e26486..000000000000
--- a/mail/smtpclient/files/patch-smtpclient_main_c
+++ /dev/null
@@ -1,54 +0,0 @@
---- smtpclient_main.c.orig	Tue Feb 24 11:49:07 2004
-+++ smtpclient_main.c	Tue Feb 24 12:47:11 2004
-@@ -86,7 +86,7 @@ void log(char *str, ...)
-     char buf[1024];
- 
-     va_start(ap, str);
--    vsprintf(buf, str, ap);
-+    vsnprintf(buf, 1024, str, ap);
-     if (usesyslog)
-         syslog(LOG_ERR, "SMTPclient: %s", buf);
-     else
-@@ -395,16 +395,16 @@ int main(int argc, char **argv)
-         log("%s: unknown host\n", my_name);
-         exit(1);
-     }
--    strcpy(my_name, hp->h_name);
-+    strlcpy(my_name, hp->h_name, sizeof(my_name));
- 
-     /*
-      *  Determine from address.
-      */
-     if (from_addr == NULL) {
-         if ((pwd = getpwuid(getuid())) == 0) {
--            sprintf(buf, "userid-%d@%s", getuid(), my_name);
-+            snprintf(buf, (sizeof(buf) - 1), "userid-%d@%s", getuid(), my_name);
-         } else {
--            sprintf(buf, "%s@%s", pwd->pw_name, my_name);
-+            snprintf(buf, (sizeof(buf) - 1), "%s@%s", pwd->pw_name, my_name);
-         }
-         from_addr = strdup(buf);
-     }
-@@ -453,8 +453,20 @@ int main(int argc, char **argv)
-     chat("MAIL FROM: <%s>\r\n", from_addr);
-     for (i = optind; i < argc; i++)
-         chat("RCPT TO: <%s>\r\n", argv[i]);
--    if (cc_addr)
--        chat("RCPT TO: <%s>\r\n", cc_addr);
-+    if (cc_addr) {
-+    	char *cc_tmp,*p;
-+	if(!(cc_tmp=malloc(strlen(cc_addr+1)))) {
-+	    log("memory allocation failed.");
-+	    exit(1);
-+	}
-+	strcpy(cc_tmp,cc_addr);
-+	p=strtok(cc_tmp,",");
-+	while(p) {
-+	    chat("RCPT TO: <%s>\r\n", p);
-+	    p=strtok(NULL,",");
-+	}
-+	free(cc_tmp);
-+    }
-     chat("DATA\r\n");
- 
-     /* 
diff --git a/mail/smtpclient/pkg-descr b/mail/smtpclient/pkg-descr
deleted file mode 100644
index c951708d04e0..000000000000
--- a/mail/smtpclient/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-SMTPclient -- simple SMTP client
-
-This program is a minimal SMTP client that takes an email
-message body and passes it on to a SMTP server (default is the
-MTA on the local host). Since it is completely self-supporting,
-it is especially suitable for use in restricted environments.
-
-WWW: http://www.engelschall.com/sw/smtpclient/
diff --git a/mail/smtpproxy/Makefile b/mail/smtpproxy/Makefile
deleted file mode 100644
index 6b9b111dcf8f..000000000000
--- a/mail/smtpproxy/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:   smtpproxy
-# Date created:                15 December 2001
-# Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	smtpproxy
-PORTVERSION=	1.3.3
-CATEGORIES=	mail
-MASTER_SITES=	http://quietsche-entchen.de/cgi-bin/wiki.cgi/download/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	SMTP proxy server
-
-MAKEFILE=	makefile
-DISABLE_SIZE=	yes
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-MAN1=		smtp.proxy.1
-PLIST_FILES=	libexec/smtp.proxy
-PORTDOCS=	README rfc821.txt
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,<wait.h>,<sys/wait.h>,' ${WRKSRC}/acp.c
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/smtpproxy/distinfo b/mail/smtpproxy/distinfo
deleted file mode 100644
index 0888cf104da1..000000000000
--- a/mail/smtpproxy/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (smtpproxy-1.3.3.tar.gz) = 3dc32a5483543f0c3c1254785d746265
-SHA256 (smtpproxy-1.3.3.tar.gz) = 9b9f4314777e06eb8d2ea120f8cb36f8dd1ef50f5574b63d5c584b5a741697b1
-SIZE (smtpproxy-1.3.3.tar.gz) = 52276
diff --git a/mail/smtpproxy/files/patch-makefile b/mail/smtpproxy/files/patch-makefile
deleted file mode 100644
index 72921f378777..000000000000
--- a/mail/smtpproxy/files/patch-makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- makefile.orig	Sat Jun 26 08:51:01 2004
-+++ makefile	Sat Jun 26 08:52:52 2004
-@@ -1,6 +1,6 @@
- 
--CC =		gcc
--CFLAGS =	-ggdb -Wall -DVERSION='"$(VERSION)"'
-+CC ?=		gcc
-+CFLAGS +=	-DVERSION='"$(VERSION)"'
- 
- VERSION =	1.3.3
- TAR =		smtpproxy-$(VERSION)
-@@ -18,9 +18,8 @@
- 
- install:	all
- 	strip $(TARGETS)
--	cp smtp.proxy /usr/local/sbin/smtp.proxy
--	cp $(TARGETS) /usr/local/sbin
--	cp *.1 /usr/local/man/man1
-+	${BSD_INSTALL_PROGRAM} $(TARGETS) ${PREFIX}/libexec/smtp.proxy
-+	${BSD_INSTALL_MAN} *.1 ${PREFIX}/man/man1
- 
- 
- smtp.proxy:	$(SMTPPROXY)
diff --git a/mail/smtpproxy/pkg-descr b/mail/smtpproxy/pkg-descr
deleted file mode 100644
index ccc4ea98faae..000000000000
--- a/mail/smtpproxy/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-smtp.proxy is an application level gateway for SMTP. It connects a
-client to a server running on another machine watching that the
-protocol is accomplished. If commands outside the specification are
-sent they are not forwarded to the server.
-
-WWW: http://quietsche-entchen.de/cgi-bin/wiki.cgi/proxies/SmtpProxy
diff --git a/mail/solidpop3d/Makefile b/mail/solidpop3d/Makefile
deleted file mode 100644
index 6003fd14ac90..000000000000
--- a/mail/solidpop3d/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	solidpop3d
-# Date created:		22 May 2000
-# Whom:			Marco Rodrigues <drkangel@drkangel.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	solidpop3d
-PORTVERSION=	0.15
-PORTREVISION=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://pld.ouraynet.com/software/solidpop3d/ \
-		http://fr2.rpmfind.net/linux/PLD/software/solidpop3d/ \
-		http://www.netsw.org/net/mail/transport/pop/
-DISTNAME=	solid-pop3d-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	SolidPop3 POP3 daemon (fully RFC1939 compliant)
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-pam --enable-apop --enable-bulletins \
-		--enable-last --enable-mapping --enable-nonip --enable-connect
-CONFIGURE_ENV=	LDFLAGS="-lmd"
-
-OPTIONS=	IPV6	"Enable IPv6 support"	On
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-MAN1=		pop_auth.1
-MAN5=		spop3d.conf.5 dot-spop3d.5
-MAN8=		spop3d.8
-
-post-extract:
-	${RM} ${WRKSRC}/src/md5.h
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/spop3d ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/src/pop_auth ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/pop_auth.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/spop3d.conf.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/man/dot-spop3d.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/man/spop3d.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/doc/config.example ${PREFIX}/etc/spop3d.conf.sample
-	${MKDIR} /var/spool/spop3d
-
-.include <bsd.port.post.mk>
diff --git a/mail/solidpop3d/distinfo b/mail/solidpop3d/distinfo
deleted file mode 100644
index 50bd0fe269fd..000000000000
--- a/mail/solidpop3d/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (solid-pop3d-0.15.tar.gz) = 1b893fcfdceef7d3c209094e34023c02
-SHA256 (solid-pop3d-0.15.tar.gz) = 0d666da31d0971de00dad79e7f2ad3ecfc857e01e00b8cf8c9cc3bd1f4be25f8
-SIZE (solid-pop3d-0.15.tar.gz) = 102927
diff --git a/mail/solidpop3d/files/patch-aa b/mail/solidpop3d/files/patch-aa
deleted file mode 100644
index 5636763ad2f1..000000000000
--- a/mail/solidpop3d/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/const.h.orig	Wed Apr 19 00:04:05 2000
-+++ src/const.h	Tue Nov  7 08:59:40 2000
-@@ -36,7 +36,7 @@
- #define DEFWCCOUNT 5
- 
- #ifdef MDMAILBOX
--#define DEFMAILDROPNAME "/var/spool/mail/%s"
-+#define DEFMAILDROPNAME "/var/mail/%s"
- #else
- #define DEFMAILDROPNAME "Maildir"
- #endif
-@@ -50,7 +50,7 @@
- #define MAXMDTYPENAMELENGTH 40
- #define USERCFG ".spop3d"
- #define USERBULL ".spop3d-bull"
--#define POPUSER "spop3d"
-+#define POPUSER "pop"
- 
- #define PER_SOURCE 5
- #define MAX_SESSIONS 50
diff --git a/mail/solidpop3d/files/patch-ab b/mail/solidpop3d/files/patch-ab
deleted file mode 100644
index 3b8faf4312ff..000000000000
--- a/mail/solidpop3d/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/Makefile.in.orig	Fri Apr 21 04:55:44 2000
-+++ src/Makefile.in	Tue Nov  7 09:18:04 2000
-@@ -60,11 +60,11 @@
- 
- 
- noinst_HEADERS = apop.h authenticate.h cmds.h configfile.h const.h fdfgets.h \
--log.h mailbox.h maildir.h maildrop.h md5.h includes.h options.h response.h \
-+log.h mailbox.h maildir.h maildrop.h includes.h options.h response.h \
- userconfig.h mapping.h spipv6.h
- 
- 
--spop3d_SOURCES = authenticate.c cmds.c log.c fdfgets.c maildrop.c main.c md5.c \
-+spop3d_SOURCES = authenticate.c cmds.c log.c fdfgets.c maildrop.c main.c \
- memops.c options.c response.c vsnprintf.c
- 
- 
-@@ -90,12 +90,12 @@
- 
- 
- DEFS = @DEFS@ -DDEFCONFIGFILENAME=\"$(sysconfdir)/spop3d.conf\" \
---DBULLDIR=\"$(localstatedir)/bulletins/\" -I. -I$(srcdir) -I..
-+-DBULLDIR=\"/var/spool/spop3d\" -I. -I$(srcdir) -I..
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- pop_auth_OBJECTS =  pop_auth.o fdfgets.o vsnprintf.o
- spop3d_OBJECTS = authenticate.o cmds.o log.o fdfgets.o maildrop.o main.o \
--md5.o memops.o options.o response.o vsnprintf.o
-+memops.o options.o response.o vsnprintf.o
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS)
- CCLD = $(CC)
diff --git a/mail/solidpop3d/files/patch-ac b/mail/solidpop3d/files/patch-ac
deleted file mode 100644
index 5bb51164fc2d..000000000000
--- a/mail/solidpop3d/files/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/mailbox.c.orig	Sat May 13 21:18:33 2000
-+++ src/mailbox.c	Tue Nov  7 08:59:40 2000
-@@ -45,6 +45,9 @@
- #endif
- #endif
- 
-+#define md5_finish_ctx(ctx, dig) MD5Final((unsigned char *)dig, ctx)
-+#define md5_init_ctx(ctx) MD5Init(ctx)
-+#define md5_process_bytes(buf, len, ctx) MD5Update (ctx, (unsigned char *)buf, len)
- 
- extern void check_wccount(void);
- extern char maildrop_name[];
-@@ -207,7 +210,7 @@
- 	char linebuf[128];
- 	char msgdate[21];
- 	struct mb_message *mbspecific;
--	struct md5_ctx context;
-+	MD5_CTX context;
- 	int header = 1, fixed = 0, newline = 1;
- 	
- 	if (mailboxfd < 0) {
-@@ -342,7 +345,7 @@
- 	off_t act_ofs = 0;
- 	char msgdate[21];
- 	struct mb_message *tmp;
--	struct md5_ctx context;
-+	MD5_CTX context;
- 	int tmpmsgnr = 0;
- 	time_t tmpmsg_time;
- 	off_t tmpfrom_where = 0, tmpwhere = 0;
diff --git a/mail/solidpop3d/files/patch-ad b/mail/solidpop3d/files/patch-ad
deleted file mode 100644
index 2816732e5e3d..000000000000
--- a/mail/solidpop3d/files/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/maildir.c.orig	Sat May 13 21:18:35 2000
-+++ src/maildir.c	Tue Nov  7 08:59:40 2000
-@@ -59,6 +59,10 @@
- #endif
- #endif
- 
-+#define md5_finish_ctx(ctx, dig) MD5Final((unsigned char *)dig, ctx)
-+#define md5_init_ctx(ctx) MD5Init(ctx)
-+#define md5_process_bytes(buf, len, ctx) MD5Update (ctx, (unsigned char *)buf, len)
-+
- extern void check_wccount(void);
- 
- extern char maildrop_name[];
-@@ -650,7 +654,7 @@
- char *mdir_md5_uidl_message(unsigned int number, char *result) {
- 	size_t length;
- 	char *tmp2, *tmp3;
--	struct md5_ctx context;
-+	MD5_CTX context;
- 	
- 	md5_init_ctx(&context);
- 	tmp2 = ((struct mdir_message *) (messages[number].md_specific))->filename;
diff --git a/mail/solidpop3d/files/patch-configure b/mail/solidpop3d/files/patch-configure
deleted file mode 100644
index c1dbbffa3f35..000000000000
--- a/mail/solidpop3d/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Dec 15 10:21:19 2000
-+++ configure	Fri Dec 15 10:21:28 2000
-@@ -2914,7 +2914,7 @@
- #define HAVE_PAM 1
- EOF
- 
--				SPOPLIBS="$SPOPLIBS -lpam -ldl"
-+				SPOPLIBS="$SPOPLIBS -lpam"
- 				echo "$ac_t""yes" 1>&6
- 			else
- 				echo "$ac_t""no" 1>&6
diff --git a/mail/solidpop3d/files/patch-src_apop.c b/mail/solidpop3d/files/patch-src_apop.c
deleted file mode 100644
index 1e1a2b5fdc41..000000000000
--- a/mail/solidpop3d/files/patch-src_apop.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/apop.c.orig	Tue Nov  7 09:00:11 2000
-+++ src/apop.c	Tue Nov  7 09:02:38 2000
-@@ -26,11 +26,15 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-+#define md5_finish_ctx(ctx, dig) MD5Final((unsigned char *)dig, ctx)
-+#define md5_init_ctx(ctx) MD5Init(ctx)
-+#define md5_process_bytes(buf, len, ctx) MD5Update (ctx, (unsigned char *)buf, len)
-+
- extern char apop_secret[];
- 
- int apop_authenticate(char *username, char *apoptimestamp, char *udigest) {
- 	char adigest[16], digest[16];
--	struct md5_ctx context;
-+	MD5_CTX context;
- 	int tmp;
- 	
- 	for (tmp = 0; tmp < 16; tmp++) {
diff --git a/mail/solidpop3d/pkg-descr b/mail/solidpop3d/pkg-descr
deleted file mode 100644
index c37c1bfe99d7..000000000000
--- a/mail/solidpop3d/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-The Solid POP3 Server is an implementation of a Post Office Protocol version 3
-server that has flexibility as its main goal. The server is easily configurable
-and has support for few features such as:
-
-- APOP authentication scheme
-- virtual hosting
-- maildir and mailbox handling
-- bulletins
-- expiration of messages
-
-Each user can specify his maildrop (its position and type). The format used in
-specification of maildrop's position should handle almost all widely-used
-system configurations. The server also seems to be fast, however no tests have
-been performed, so it's rather relative feeling. The design used is very
-similar to the design of Solar Designer's POPA3D server. This solution let's
-minimalize size of code working with root privileges. The code was also heavily
-checked for buffer overflow leaks and file races. None have been found as for
-now. All operations on files are done with user privileges. There is no SUID
-APOP secrets database management program (as in QPOP). Each user can specify
-his secret in his own home directory.
diff --git a/mail/solidpop3d/pkg-plist b/mail/solidpop3d/pkg-plist
deleted file mode 100644
index 1fd2cf1f5084..000000000000
--- a/mail/solidpop3d/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/pop_auth
-etc/spop3d.conf.sample
-libexec/spop3d
diff --git a/mail/solidpop3d/pkg-req b/mail/solidpop3d/pkg-req
deleted file mode 100644
index 01bcc6374f10..000000000000
--- a/mail/solidpop3d/pkg-req
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ "$2" != "INSTALL" ]; then
-  exit 0
-fi
-if ! id -u pop > /dev/null 2>&1; then
-  echo "You need an account \"pop\" to install this package."
-  echo "Please add it by hand (try \"man vipw\") and try again."
-  echo ""
-  echo "An example passwd entry is:"
-  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
-  echo ""
-  exit 1
-fi
-exit 0
diff --git a/mail/solidpop3d/scripts/pre-install b/mail/solidpop3d/scripts/pre-install
deleted file mode 100644
index 75197624f8ca..000000000000
--- a/mail/solidpop3d/scripts/pre-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if ! id -u pop > /dev/null 2>&1; then
-  echo "You need an account \"pop\" to install this package."
-  echo "Please add it by hand (try \"man vipw\") and try again."
-  echo ""
-  echo "An example passwd entry is:"
-  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
-  echo ""
-  exit 1
-fi
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
deleted file mode 100644
index 1f37afc414d4..000000000000
--- a/mail/spruce/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	spruce
-# Date created:		05 June 1999
-# Whom:			Chris Piazza <cpiazza@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	spruce
-PORTVERSION=	0.6.5
-PORTREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A simple GTK based email client
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-MAKE_ENV=	OLD_PO_FILE_INPUT=1
-
-MAN1=		spruce.1
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/spruce/distinfo b/mail/spruce/distinfo
deleted file mode 100644
index 807923aea6e7..000000000000
--- a/mail/spruce/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (spruce-0.6.5.tar.gz) = 9109cd1a7ccd82e5138bd831f4920c31
-SHA256 (spruce-0.6.5.tar.gz) = 64f8255a2a1a80c4e8f5ad4416774a099c5b9f0fc8edfcd199fe96afe7df4f04
-SIZE (spruce-0.6.5.tar.gz) = 480851
diff --git a/mail/spruce/files/patch-ab b/mail/spruce/files/patch-ab
deleted file mode 100644
index 3ac7be1dc3a7..000000000000
--- a/mail/spruce/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- server.h.orig	Sun May 21 14:33:13 2000
-+++ server.h	Sun May 21 14:33:30 2000
-@@ -26,11 +26,11 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- /*#include <sys/param.h>*/
-+#include <netinet/in.h>
- #ifdef __unix__
- #include <arpa/inet.h>
- #endif
- #include <netdb.h>
--#include <netinet/in.h>
- #include <unistd.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/mail/spruce/files/patch-ad b/mail/spruce/files/patch-ad
deleted file mode 100644
index f11ace70b96a..000000000000
--- a/mail/spruce/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun May 21 14:32:23 2000
-+++ Makefile.in	Sun May 21 14:32:44 2000
-@@ -98,7 +98,7 @@
- spruce_SOURCES = defines.h 	about.c about.h 	accounts.c accounts.h 	addrbook.c addrbook.h 	composer.c composer.h 	cram_md5.c cram_md5.h 	date.c date.h 	filters.h filters.c 	globals.c globals.h 	gti.c gti.h 	gtkmanip.c gtkmanip.h 	gui.c gui.h 	imap.c imap.h 	init.c init.h 	mailbox.c mailbox.h 	mbox.c mbox.h 	md5.c md5.h 	mime.c mime.h 	mesgreader.c mesgreader.h 	msgid.c msgid.h 	options.c options.h 	parse.c parse.h 	pop3io.c pop3io.h 	pgp.c pgp.h 	print.c print.h 	rc.c rc.h 	server.c server.h 	smtpio.c smtpio.h 	sockio.c sockio.h 	sort.c sort.h 	status.c status.h 	main.c main.h
- 
- 
--spruce_LDADD = @GTK_LIBS@ -lpthread -lgthread
-+spruce_LDADD = @GTK_LIBS@ `@GTK_CONFIG@ --libs gthread` 
- 
- spruce_MANS = man/spruce.1
- 
diff --git a/mail/spruce/files/patch-ae b/mail/spruce/files/patch-ae
deleted file mode 100644
index ac9b506f69a4..000000000000
--- a/mail/spruce/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sun May 21 14:41:15 2000
-+++ po/Makefile.in.in	Sun May 21 14:41:44 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(gnulocaledir) 
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/mail/spruce/files/patch-filters.c b/mail/spruce/files/patch-filters.c
deleted file mode 100644
index 5b1c2407e27d..000000000000
--- a/mail/spruce/files/patch-filters.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- filters.c.orig	Sun Aug 22 17:24:12 2004
-+++ filters.c	Sun Aug 22 17:24:23 2004
-@@ -514,7 +514,7 @@
-          gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(move_combo)->entry), "");
-          gtk_entry_set_text(GTK_ENTRY(forward_entry), "");
-          break;
--      default:
-+      default: break;
-    }
- }
-  
diff --git a/mail/spruce/files/patch-po::ko.po b/mail/spruce/files/patch-po::ko.po
deleted file mode 100644
index 6fccb4e76045..000000000000
--- a/mail/spruce/files/patch-po::ko.po
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- po/ko.po	2002/09/25 07:02:37	1.1
-+++ po/ko.po	2002/09/25 07:03:04
-@@ -662,10 +662,6 @@
- msgid "All"
- msgstr "���"
- 
--#: print.c:173
--msgid "From:"
--msgstr "�Ϻ�:"
--
- #: print.c:185 print.c:198
- msgid "1"
- msgstr "1"
diff --git a/mail/spruce/pkg-descr b/mail/spruce/pkg-descr
deleted file mode 100644
index 93966ed88dea..000000000000
--- a/mail/spruce/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Spruce is a very simple email client that uses GTK+ for its user interface.
-
-WWW: http://spruce.sourceforge.net/
diff --git a/mail/spruce/pkg-plist b/mail/spruce/pkg-plist
deleted file mode 100644
index 7375a6d31d36..000000000000
--- a/mail/spruce/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/spruce
-%%NLS%%share/locale/ca/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/da/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/de/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/es/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/it/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/ru_RU/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/spruce.mo
-%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/spruce.mo
-%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
deleted file mode 100644
index e639857192e2..000000000000
--- a/mail/teapop-devel/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-# New ports collection makefile for:	teapop-devel
-# Date created:				7/08/2003
-# Whom:					sheepkiller@cultdeadsheep.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	teapop
-PORTVERSION=	20030414
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/snapshots/ \
-		http://www.toontown.org/pub/teapop/snapshots/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Yet another RFC1939 compliant POP3 server
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--enable-flock
-
-LATEST_LINK=	teapop-devel
-
-##
-## Available knobs:
-## General options
-##   WITHOUT_IPV6: disable IPv6 support
-##   WITH_TCPWRAPPERS: enable the use of tcp_wrappers
-##   WITHOUT_APOP: don't allow users to authenticate with APOP
-##   WITHOUT_VPOP: don't support virtual domains
-##   WITH_DRAC: enable support for DRAC
-##   WITH_POPAUTHFILE: enable support for a popauth file
-##   POPAUTH_FILE: popauth file name (default : ${PREFIX}/etc/teapop.popauth)
-
-POPAUTH_FILE?=		${PREFIX}/etc/teapop.popauth
-
-.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if defined(WITH_TCPWRAPPERS)
-CONFIGURE_ARGS+=	--enable-tcp_wrappers
-.endif
-
-.if defined(WITHOUT_APOP)
-CONFIGURE_ARGS+=	--disable-apop
-.endif
-
-.if defined(WITHOUT_VPOP)
-CONFIGURE_ARGS+=	--disable-vpop
-.endif
-
-.if defined(WITH_DRAC)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if defined(WITH_POPAUTHFILE)
-CONFIGURE_ARGS+=	--enable-popauth-file=${POPAUTH_FILE}
-.endif
-
-MAN8=		teapop.8
-
-##
-## Authentication backend
-##   WITH_OPENLDAP: add support for authentication through OpenLDAP server
-##   WITH_MYSQL: enable support for authentication from MySQL database
-##   WITH_PGSQL: enable support for authentication from PostgreSQL database
-##
-
-.if defined(WITH_PGSQL)
-USE_PGSQL=		YES
-CONFIGURE_ARGS+=	--with-pgsql
-.endif
-
-.if defined(WITH_MYSQL)
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-mysql
-.endif
-
-.if defined(WITH_OPENLDAP)
-USE_OPENLDAP=		YES
-CONFIGURE_ARGS+=	--with-ldap=openldap
-.endif
-
-show-options:
-	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
-
-post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "------------------------------------------------------------------------"
-	@${ECHO_MSG} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
-	@${ECHO_MSG} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
-	@${ECHO_MSG} "------------------------------------------------------------------------"
-	@${ECHO_MSG} ""
-
-.include <bsd.port.mk>
diff --git a/mail/teapop-devel/distinfo b/mail/teapop-devel/distinfo
deleted file mode 100644
index e2d03d9540c0..000000000000
--- a/mail/teapop-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (teapop-20030414.tar.gz) = 9bf2c0631bbe16d99d43ebc2f08c078d
-SHA256 (teapop-20030414.tar.gz) = 6d14f874423a11b76a5f4f56dca9443a86c1db17819a98b59d2e49925e7f79a2
-SIZE (teapop-20030414.tar.gz) = 145502
diff --git a/mail/teapop-devel/files/patch-etc::Makefile.in b/mail/teapop-devel/files/patch-etc::Makefile.in
deleted file mode 100644
index a0834203cc94..000000000000
--- a/mail/teapop-devel/files/patch-etc::Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- etc/Makefile.in.orig	Sun Jun 30 14:32:20 2002
-+++ etc/Makefile.in	Sun Jun 30 14:34:14 2002
-@@ -23,16 +23,9 @@
- 	fi
- 
- install: build
--	@ echo Checking for existing teapop.passwd;			\
--	if [ -f ${DESTDIR}/${sysconfdir}/teapop.passwd ]; then		\
--		echo "Exists...NOT installing teapop.passwd";		\
--	else								\
--		echo "Not found, installing teapop.passwd";		\
--		${INSTALL} -d ${DESTDIR}/${sysconfdir};			\
--		${INSTALL} teapop.passwd 				\
--			${DESTDIR}/${sysconfdir};			\
--		${CHMOD} 0644 ${DESTDIR}/${sysconfdir}/teapop.passwd;	\
--	fi
-+	@echo Installing teapop.passwd.sample;
-+	${INSTALL} -d ${sysconfdir}; \
-+	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
- 
- makefile: ../config/timestamp
- 	@ echo Updating Makefile
diff --git a/mail/teapop-devel/pkg-descr b/mail/teapop-devel/pkg-descr
deleted file mode 100644
index 501537850b50..000000000000
--- a/mail/teapop-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Teapop is yet another RFC1939 compliant POP3 server.  It includes
-flexible virtual domain support that distinguishes it from all other
-POP3 servers.
-
-WWW:	http://www.toontown.org/teapop/
diff --git a/mail/teapop-devel/pkg-plist b/mail/teapop-devel/pkg-plist
deleted file mode 100644
index 83b019008a2a..000000000000
--- a/mail/teapop-devel/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/teapop.passwd.sample
-libexec/teapop
-sbin/cronpopauth.pl
-@dirrmtry var
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
deleted file mode 100644
index 88e176e33721..000000000000
--- a/mail/wmmail/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:  wmmail
-# Date created:        7 Jun 1998
-# Whom:                rom
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wmmail
-PORTVERSION=	0.64
-PORTREVISION=	3
-CATEGORIES=	mail windowmaker
-MASTER_SITES=	# none
-DISTNAME=	WMMail.app-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A little mail notifier for the Window Maker dock
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
-
-USE_XORG=	xpm
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-PL-libs="-L${LOCALBASE}/lib" \
-		--with-PL-incs="-I${LOCALBASE}/include"
-
-post-install:
-	@${ECHO} "		"
-	@${ECHO} "------------------------------------------------------------------------------"
-	@${ECHO} "===> Installing WMMail defaults in ${PREFIX}/GNUstep/Apps/WMMail.app/Defaults"
-	@${ECHO} "===> Modify to your config and copy to ~/GNUstep/Defaults/WMMail"
-	@${ECHO} "		"
-	@${ECHO} "===> Installing README in ${PREFIX}/GNUstep/Apps/WMMail.app"
-	@${ECHO} "------------------------------------------------------------------------------"
-	@${ECHO} "		"
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/GNUstep/Apps/WMMail.app
-
-.include <bsd.port.mk>
diff --git a/mail/wmmail/distinfo b/mail/wmmail/distinfo
deleted file mode 100644
index c44cb3927eee..000000000000
--- a/mail/wmmail/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (WMMail.app-0.64.tar.gz) = fc596db9f2f6b52eec3a303178106c8e
-SHA256 (WMMail.app-0.64.tar.gz) = 4e00ba702aaa9ac7ed1d8a6443dc27370145e254db22c4867b6e51da5166ff16
-SIZE (WMMail.app-0.64.tar.gz) = 147305
diff --git a/mail/wmmail/pkg-descr b/mail/wmmail/pkg-descr
deleted file mode 100644
index 25654a1ee49f..000000000000
--- a/mail/wmmail/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-WMMail.app is a "mail-checker" like xbiff.  It indicates the status of the
-user's mailbox by showing animated XPM icons when incoming mails are
-detected.  Additionally, it can be configured to execute a program on
-incoming mail and/or on mouse double-clicks, and can provide a count of
-emails in the user's mailbox.  It currently supports UNIX mbox files, MH
-and MailDir mail folders, and IMAP4 remote mailboxes.
-
-WMMail.app is based on asmail, a similar applet designed to work with the
-Wharf of the AfterStep window manager.  However, WMMail.app has been
-re-written to be compatible with the Window Maker Dock, i.e. WMMail.app
-can be dragged and dropped on to (and off from) the Dock dynamically. 
diff --git a/mail/wmmail/pkg-plist b/mail/wmmail/pkg-plist
deleted file mode 100644
index 923d4d377579..000000000000
--- a/mail/wmmail/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-GNUstep/Apps/WMMail.app/WMMail
-GNUstep/Apps/WMMail.app/README
-GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm
-GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm
-GNUstep/Apps/WMMail.app/Anims/NeXT/Mail3.xpm
-GNUstep/Apps/WMMail.app/Anims/asmail/asmail-new.xpm
-GNUstep/Apps/WMMail.app/Anims/asmail/asmail-no.xpm
-GNUstep/Apps/WMMail.app/Anims/asmail/asmail-old.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e-no.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e0.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e1.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e2.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e3.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e4.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e5.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e6.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e7.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e8.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e9.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e10.xpm
-GNUstep/Apps/WMMail.app/Anims/e/e11.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-no.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e0.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e1.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e2.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e3.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e4.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e5.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e6.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e7.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e8.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e9.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e10.xpm
-GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e11.xpm
-GNUstep/Apps/WMMail.app/Defaults/WMMail
-GNUstep/Apps/WMMail.app/Sounds/NewMail.au
-GNUstep/Apps/WMMail.app/Sounds/NoMail.au
-GNUstep/Apps/WMMail.app/Sounds/bark.au
-GNUstep/Apps/WMMail.app/Sounds/bass_snap.au
-GNUstep/Apps/WMMail.app/Sounds/clink.au
-GNUstep/Apps/WMMail.app/Sounds/doorbell.au
-GNUstep/Apps/WMMail.app/Sounds/drip.au
-GNUstep/Apps/WMMail.app/Sounds/hammer.au
-GNUstep/Apps/WMMail.app/Sounds/monkey.au
-@dirrm GNUstep/Apps/WMMail.app/Anims/NeXT
-@dirrm GNUstep/Apps/WMMail.app/Anims/asmail
-@dirrm GNUstep/Apps/WMMail.app/Anims/e
-@dirrm GNUstep/Apps/WMMail.app/Anims/monitor-e
-@dirrm GNUstep/Apps/WMMail.app/Anims
-@dirrm GNUstep/Apps/WMMail.app/Defaults
-@dirrm GNUstep/Apps/WMMail.app/Sounds
-@dirrm GNUstep/Apps/WMMail.app
-@dirrmtry GNUstep/Apps
-@dirrmtry GNUstep
diff --git a/mail/wmmultipop3/Makefile b/mail/wmmultipop3/Makefile
deleted file mode 100644
index a4a596c7bf47..000000000000
--- a/mail/wmmultipop3/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	wmmultipop3
-# Date created:				Fri Sep 28 16:25:34 EDT 2001
-# Whom:					Patrick Li <pat@databits.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wmmultipop3
-PORTVERSION=	0.8
-PORTREVISION=	2
-CATEGORIES=	mail windowmaker
-MASTER_SITES=	http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/
-DISTNAME=	wmMultiPop3-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A WindowMaker dockapp that checks multiple pop3 accounts for new mail
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-BUILD_WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
-USE_XORG=	xpm
-
-DOC_FILES=	ChangeLog INSTALL README
-
-do-install:
-	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/wmmultipop3 ${PREFIX}/bin
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/wmmultipop3/distinfo b/mail/wmmultipop3/distinfo
deleted file mode 100644
index 033e64898714..000000000000
--- a/mail/wmmultipop3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (wmMultiPop3-0.8.tar.gz) = 23f9351e7c0cabf2aa18f405a2e9b8fd
-SHA256 (wmMultiPop3-0.8.tar.gz) = 7c51e05b3291e9d73695fd6a42745272b8bb4b94929054218737b52cecf5631d
-SIZE (wmMultiPop3-0.8.tar.gz) = 27063
diff --git a/mail/wmmultipop3/files/patch-Makefile b/mail/wmmultipop3/files/patch-Makefile
deleted file mode 100644
index dcba0ab4befe..000000000000
--- a/mail/wmmultipop3/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- wmmultipop3/Makefile.orig	Sun May 26 13:43:33 2002
-+++ wmmultipop3/Makefile	Sun May 26 19:40:43 2002
-@@ -1,14 +1,13 @@
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${LOCALBASE}/lib
- LIBS   = -lXpm -lXext -lX11
--FLAGS  = -O2
- OBJS   = wmmultipop3.o Pop3Client.o ../wmgeneral/wmgeneral.o ../wmgeneral/misc.o ../wmgeneral/list.o
- 
- 
- .c.o:
--	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
-+	${CC} -I${LOCALBASE}/include ${CFLAGS} -c -Wall $< -o $@
- 
- wmmultipop3: $(OBJS) 
--	cc $(FLAGS) -o wmmultipop3 $^ -lXext $(LIBDIR) $(LIBS)
-+	${CC} ${CFLAGS} -o wmmultipop3 ${OBJS} ${LIBDIR} ${LIBS}
- 
- all:: wmmultipop3
- 
diff --git a/mail/wmmultipop3/pkg-descr b/mail/wmmultipop3/pkg-descr
deleted file mode 100644
index a0e496ce35e5..000000000000
--- a/mail/wmmultipop3/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-wmMultiPop3 is a WindowMaker dockapp which checks one or more
-pop3-accounts for new mail. It's based on wmPop3 written by Scott
-Helden.
-
-WWW: http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/
diff --git a/mail/wmmultipop3/pkg-message b/mail/wmmultipop3/pkg-message
deleted file mode 100644
index 28e53d657414..000000000000
--- a/mail/wmmultipop3/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-------------------------------------------------------------------
-WARNING!!! - When you run wmmultipop3 and it automatically creates
-.wmmultipop3rc in your home directory, make sure you set chmod 600
-on that configuration file because passwords will be in plain text
-------------------------------------------------------------------
diff --git a/mail/wmmultipop3/pkg-plist b/mail/wmmultipop3/pkg-plist
deleted file mode 100644
index d1a442fc5f86..000000000000
--- a/mail/wmmultipop3/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/wmmultipop3
-%%PORTDOCS%%share/doc/wmmultipop3/ChangeLog
-%%PORTDOCS%%share/doc/wmmultipop3/INSTALL
-%%PORTDOCS%%share/doc/wmmultipop3/README
-%%PORTDOCS%%@dirrm share/doc/wmmultipop3
diff --git a/mail/wmymail/Makefile b/mail/wmymail/Makefile
deleted file mode 100644
index 7dda26762719..000000000000
--- a/mail/wmymail/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	wmymail
-# Date created:		27 August 2002
-# Whom:			Bruce M Simpson <bms@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME=	wmymail
-PORTVERSION=	0.2
-PORTREVISION=	5
-CATEGORIES=	mail x11
-MASTER_SITES=	http://yath.mine.nu/wmymail/ \
-		http://dockapps.org/files/65/96/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Check inbox using a WindowMaker DockApp
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
-RUN_DEPENDS=	fetchmail:${PORTSDIR}/mail/fetchmail
-
-NOMAN=
-PLIST_FILES=	bin/wmymail
-
-.include <bsd.port.mk>
diff --git a/mail/wmymail/distinfo b/mail/wmymail/distinfo
deleted file mode 100644
index 4f4ab30643ce..000000000000
--- a/mail/wmymail/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (wmymail-0.2.tar.gz) = c2600ab388e92c6a1474e3f30aecf4bf
-SHA256 (wmymail-0.2.tar.gz) = 1cf993108af898e79cfba18669dd75e8c68131a301b2efb6b152641a97361c49
-SIZE (wmymail-0.2.tar.gz) = 55126
diff --git a/mail/wmymail/files/patch-Makefile b/mail/wmymail/files/patch-Makefile
deleted file mode 100644
index 98d70fa456c6..000000000000
--- a/mail/wmymail/files/patch-Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.orig	Fri Jul 27 00:25:37 2001
-+++ Makefile	Tue Aug 27 12:34:53 2002
-@@ -1,32 +1,22 @@
- #
--# Makefile for wmymail
-+# Makefile for xmymail (FreeBSD) -bms
- #
- 
-+PROG=	wmymail
- 
--VERSION = 0.2
--CC      = gcc
--LIBS    = -L/usr/X11R6/lib -lX11 -lXpm -lXext -ldockapp
--CFLAGS  = -O2 -I/usr/X11R6/include -Wall
--XPMS = xpm/main.xpm xpm/mbox_1.xpm xpm/mbox_2.xpm xpm/mbox_3.xpm \
--  xpm/numbers.xpm xpm/unumbers.xpm
--DISTFILES = Makefile README README.old ChangeLog wmymail.c raw-envelope.jpg
-+SRCS=	wmymail.c
-+
-+CFLAGS+=	-I${LOCALBASE}/include -O2 -Wall
-+LDADD+=	-lXpm -lX11 -lXext -ldockapp
-+LDADD+= -L${LOCALBASE}/lib
- 
--default all target: wmymail
-+NOMAN=
-+
-+XPMS= xpm/main.xpm xpm/mbox_1.xpm xpm/mbox_2.xpm xpm/mbox_3.xpm \
-+  xpm/numbers.xpm xpm/unumbers.xpm
- 
--wmymail: wmymail.o
--	$(CC) $< $(CFLAGS) $(LIBS) -o $@
-+BINDIR?=	${LOCALBASE}/bin
- 
--wmymail.o: wmymail.c $(XPMS)
--	$(CC) $(CFLAGS) $(MY_INCS) -o $@ -c $<
--
--clean:
--	rm -f wmymail wmymail.o
--
--dist:
--	rm -fr wmymail-$(VERSION)
--	mkdir -p wmymail-$(VERSION)/xpm
--	cp $(DISTFILES) wmymail-$(VERSION)
--	cp $(XPMS) wmymail-$(VERSION)/xpm
--	rm -f wmymail-$(VERSION).tar.gz
--	tar czvf wmymail-$(VERSION).tar.gz wmymail-$(VERSION)
-+wmymail.o: wmymail.c ${XPMS}
- 
-+.include <bsd.prog.mk>
diff --git a/mail/wmymail/pkg-descr b/mail/wmymail/pkg-descr
deleted file mode 100644
index 08c6b990680d..000000000000
--- a/mail/wmymail/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-wmymail is a small program which uses the fetchmail port to determine how
-many new messages are in your inbox.
-
-WWW: http://dockapps.org/file.php/id/65
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
deleted file mode 100644
index 162afa12def0..000000000000
--- a/mail/xpbiff/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for:    xpbiff
-# Date created:         2 April 1997
-# Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	xpbiff
-PORTVERSION?=	1.27
-PORTREVISION=	3
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/xpbiff/
-DISTNAME=	xpbiff
-DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	A replacement for xbiff that handles popup window with mail header
-
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
-USE_IMAKE=	yes
-USE_XORG=	xpm xaw xmu
-NO_INSTALL_MANPAGES=	yes
-PLIST_FILES=	bin/xpbiff
-WRKSRC=		${WRKDIR}/xpbiff
-
-.if defined(PREFIX) && ${PREFIX} != ${LOCALBASE}
-YOUBINBINDIR=	${PREFIX}
-.else
-YOUBINBINDIR=	${LOCALBASE}
-.endif
-
-.include <bsd.port.pre.mk>
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR}; \
-	  if [ ! -f ${DISTDIR}/${DISTNAME}.tar.gz ]; then \
-	    uudecode -p ${DISTDIR}/${DISTFILES} | ${TAR} xzf -; \
-	  else \
-	    ${TAR} xzf ${DISTDIR}/${DISTNAME}.tar.gz; \
-	  fi)
-
-pre-patch:
-	@(${RM} -rf ${WRKSRC}/LocPixmap.c; \
-	  ${CP} ${FILESDIR}/LocPixmap.c ${WRKSRC} );
-
-post-patch:
-.if defined(YOUBIN)
-	@(cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/xpbiff.youbin.diff );
-.endif
-	@${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.org
-	@${SED} "s=%YOUBINBINDIR%=${YOUBINBINDIR}/bin=" < ${WRKSRC}/config.h.org > ${WRKSRC}/config.h
-
-.include <bsd.port.post.mk>
diff --git a/mail/xpbiff/distinfo b/mail/xpbiff/distinfo
deleted file mode 100644
index e446961aa209..000000000000
--- a/mail/xpbiff/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xpbiff-1.27-with-YOUBIN.tar.gz.uu) = ac22b7cea37557317d456b95eb7ad70d
-SHA256 (xpbiff-1.27-with-YOUBIN.tar.gz.uu) = c8ac29b08c24caecbcdc26c150a181376c3645e039244af54ddce9c54297ecb3
-SIZE (xpbiff-1.27-with-YOUBIN.tar.gz.uu) = 37423
diff --git a/mail/xpbiff/files/LocPixmap.c b/mail/xpbiff/files/LocPixmap.c
deleted file mode 100644
index 7c89f3b5d32f..000000000000
--- a/mail/xpbiff/files/LocPixmap.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* Change for xpbiff by Yoshikazu Yamamoto(y-yamamt@ics.es.osaka-u.ac.jp) at Oct 19, 1993 */
-
-/* * Last edited: Sep 17 14:39 1991 (mallet) */
-/*
- * $FreeBSD$
- *
- * Copyright 1991 Lionel Mallet
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Lionel MALLET not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  Lionel MALLET makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * Lionel MALLET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL Lionel MALLET BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Lionel Mallet - SIMULOG
- */
-
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-#include <X11/Xutil.h>
-#include <X11/StringDefs.h>
-#include <sys/param.h>			/* get MAXPATHLEN if possible */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
-
-#include <X11/Xmu/CvtCache.h>
-#include <X11/xpm.h>
-#include <X11/Xmu/Drawing.h>
-
-
-/*
- * LocatePixmapFile - read a pixmap file using the normal defaults
- */
-
-static char **split_path_string();
-
-Pixmap LocatePixmapFile (screen, name, srcname, srcnamelen,
-			    widthp, heightp, mask)
-    Screen *screen;
-    char *name;
-    char *srcname;			/* RETURN */
-    int srcnamelen;
-    int *widthp, *heightp;              /* RETURN */
-    Pixmap *mask;			/* RETURN */
-{
-    Display *dpy = DisplayOfScreen (screen);
-    Window root = RootWindowOfScreen (screen);
-    Bool try_plain_name = True;
-    XmuCvtCache *cache = _XmuCCLookupDisplay (dpy);
-    char **file_paths;
-    char filename[MAXPATHLEN];
-    unsigned int width, height;
-    int xhot, yhot;
-    int i;
-
-
-    /*
-     * look in cache for pixmap path
-     */
-    if (cache) {
-	if (!cache->string_to_bitmap.bitmapFilePath) {
-	    XrmName xrm_name[2];
-	    XrmClass xrm_class[2];
-	    XrmRepresentation rep_type;
-	    XrmValue value;
-
-	    xrm_name[0] = XrmStringToName ("bitmapFilePath");
-	    xrm_name[1] = NULL;
-	    xrm_class[0] = XrmStringToClass ("BitmapFilePath");
-	    xrm_class[1] = NULL;
-	    /*
-	     * XXX - warning, derefing Display * until XDisplayDatabase
-	     */
-	    if (!XrmGetDatabase(dpy)) {
-		/* what a hack; need to initialize dpy->db */
-		(void) XGetDefault (dpy, "", "");
-	    }
-	    if (XrmQGetResource (XrmGetDatabase(dpy), xrm_name, xrm_class, 
-				 &rep_type, &value) &&
-		rep_type == XrmStringToQuark(XtRString)) {
-		cache->string_to_bitmap.bitmapFilePath = 
-		  split_path_string (value.addr);
-	    }
-	}
-	file_paths = cache->string_to_bitmap.bitmapFilePath;
-    }
-
-
-    /*
-     * Search order:
-     *    1.  name if it begins with / or ./
-     *    2.  "each prefix in file_paths"/name
-     *    3.  BITMAPDIR/name
-     *    4.  name if didn't begin with / or .
-     */
-
-#ifndef BITMAPDIR
-#define BITMAPDIR "/usr/include/X11/bitmaps"
-#endif
-
-    for (i = 1; i <= 4; i++) {
-	char *fn = filename;
-	Pixmap pixmap;
-	XpmAttributes attributes;
-	unsigned char *data;
-
-	switch (i) {
-	  case 1:
-	    if (!(name[0] == '/' || (name[0] == '.') && name[1] == '/')) 
-	      continue;
-	    fn = name;
-	    try_plain_name = False;
-	    break;
-	  case 2:
-	    if (file_paths && *file_paths) {
-		sprintf (filename, "%s/%s", *file_paths, name);
-		file_paths++;
-		i--;
-		break;
-	    }
-	    continue;
-	  case 3:
-	    sprintf (filename, "%s/%s", BITMAPDIR, name);
-	    break;
-	  case 4:
-	    if (!try_plain_name) continue;
-	    fn = name;
-	    break;
-	}
-
-	data = NULL;
-	pixmap = None;
-	if (XmuReadBitmapDataFromFile (fn, &width, &height, &data,
-				       &xhot, &yhot) == BitmapSuccess) {
-	    pixmap = XCreatePixmapFromBitmapData (dpy, root, (char *) data,
-						  width, height,
-						  (unsigned long) 1,
-						  (unsigned long) 0,
-						  (unsigned int) 1);
-	    XFree ((char *)data);
-	    if (pixmap != None) {
-		if (widthp) *widthp = (int)width;
-		if (heightp) *heightp = (int)height;
-		if (srcname && srcnamelen > 0) {
-		    strncpy (srcname, fn, srcnamelen - 1);
-		    srcname[srcnamelen - 1] = '\0';
-		}
-		*mask = None;
-		return pixmap;
-	    }
-	}
-	attributes.visual = DefaultVisualOfScreen (screen);
-	attributes.colormap = DefaultColormapOfScreen (screen);
-	attributes.depth = DefaultDepthOfScreen (screen);
-	attributes.colorsymbols = (ColorSymbol *)NULL;
-	attributes.numsymbols = 0;
-	attributes.valuemask = XpmVisual | XpmColormap | XpmDepth;
-	if (pixmap == None &&
-	    XpmReadPixmapFile (dpy, root, fn, &pixmap, mask,
-			       &attributes) == XpmPixmapSuccess) {
-	    if (widthp) *widthp = (int)attributes.width;
-	    if (heightp) *heightp = (int)attributes.height;
-	    if (srcname && srcnamelen > 0) {
-		strncpy (srcname, fn, srcnamelen - 1);
-		srcname[srcnamelen - 1] = '\0';
-	    }
-	    XpmFreeAttributes(&attributes);
-	    return pixmap;
-	}
-    }
-    *mask = None;
-    return None;
-}
-
-
-/*
- * split_path_string - split a colon-separated list into its constituent
- * parts; to release, free list[0] and list.
- */
-static char **split_path_string (src)
-    register char *src;
-{
-    int nelems = 1;
-    register char *dst;
-    char **elemlist, **elem;
-
-    /* count the number of elements */
-    for (dst = src; *dst; dst++) if (*dst == ':') nelems++;
-
-    /* get memory for everything */
-    dst = (char *) malloc (dst - src + 1);
-    if (!dst) return NULL;
-    elemlist = (char **) calloc ((nelems + 1), sizeof (char *));
-    if (!elemlist) {
-	free (dst);
-	return NULL;
-    }
-
-    /* copy to new list and walk up nulling colons and setting list pointers */
-    strcpy (dst, src);
-    for (elem = elemlist, src = dst; *src; src++) {
-	if (*src == ':') {
-	    *elem++ = dst;
-	    *src = '\0';
-	    dst = src + 1;
-	}
-    }
-    *elem = dst;
-
-    return elemlist;
-}
-
-/*
-void _XmuStringToBitmapInitCache (c)
-    register XmuCvtCache *c;
-{
-    c->string_to_bitmap.bitmapFilePath = NULL;
-}
-
-void _XmuStringToBitmapFreeCache (c)
-    register XmuCvtCache *c;
-{
-    if (c->string_to_bitmap.bitmapFilePath) {
-	if (c->string_to_bitmap.bitmapFilePath[0]) 
-	  free (c->string_to_bitmap.bitmapFilePath[0]);
-	free ((char *) (c->string_to_bitmap.bitmapFilePath));
-    }
-}
-*/
diff --git a/mail/xpbiff/files/patch-aa b/mail/xpbiff/files/patch-aa
deleted file mode 100644
index 0351c9e1df71..000000000000
--- a/mail/xpbiff/files/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
---- config.h.orig	Wed Oct 19 06:56:25 1994
-+++ config.h	Fri Dec 12 13:16:55 2003
-@@ -8,7 +8,7 @@
- /*
-  *	For X11R6
-  */
--#undef X11R6
-+#define X11R6
- 
- /*
-  *	For System V
-@@ -33,6 +33,12 @@
- #undef NO_CUSERID
- 
- /*
-+ *      Your system has getpwuid() in library
-+ */
-+
-+#define HAVE_GETPWUID
-+
-+/*
-  *	For MH scan users
-  */
- 
-@@ -42,12 +48,12 @@
-  *	For Shape Extension
-  */
- 
--#undef SHAPE
-+#define SHAPE
- 
- /*
-  *	Check Environment Variable MAIL for check file
-  */
--#undef GETENV_MAIL
-+#define GETENV_MAIL
- 
- /*
-  *	Set Local Spool pathname
-@@ -57,30 +63,47 @@
- /*
-  *	For X pixmap
-  */
--#undef XPM
--#undef DepXpmLib	/usr/local/lib/libXpm.a
-+#define XPM
-+
-+#ifdef XPM
-+#ifdef FreeBSDArchitecture
-+#undef DepXpmLib
-+#else
-+#define DepXpmLib	/usr/local/lib/libXpm.a
-+#endif /* FreeBSDArchitecture */
-+#endif /* XPM */
- 
- /*
-  *	For using I18N Xaw
-  */
--#undef XI18N
--/* If you use X11R6, these settings below are not necessary */
-+#ifndef XI18N
-+#ifdef FreeBSDArchitecture
-+#define XI18N
-+#endif
-+#endif
-+
-+#ifdef XI18N
-+#undef X11R5_Xsi	/* define if X11R5 Xsi */
-+#endif
-+
-+#ifdef X11R5_Xsi	/* When X11R5 Xsi, define followings if you want */
- #undef DepXawLib	/usr/local/lib/I18N/libXaw.a
- #undef DepXwcharLib	/usr/local/lib/I18N/libXwchar.a
- #undef Xi18nLibDir	-L/usr/local/lib/I18N \
- 			-L/usr/local/lib
- #undef Xi18nIncDir	-I/usr/local/X11/include
-+#endif
- 
- /*
-  *	Convert JIS to Japanese EUC
-  */
--#undef JCONVERT
-+#define JCONVERT
- #undef GUESS_JIS
- 
- /*
-  *	Process MIME header, charset=ISO-2022-JP, base 64 encoding
-  */
--#undef ISO_2022_JP
-+#define ISO_2022_JP
- 
- /*
-  *	For SUN Audio
-@@ -88,9 +111,19 @@
- #undef SUN_AUDIO
- #undef AudioIncDir /usr/demo/SOUND
- 
-+/*
-+ * For BSD Audio (FreeBSD)
-+ */
-+#ifndef __alpha
-+#define BSD_AUDIO
-+#endif
-+
- /* 
-  * For YOUBIN Service
- */
- #undef YOUBIN
--#undef YoubinBinDir /usr/local/bin
--#undef YOUBIN_DEFAULT_SERVER_HOST "server"
-+
-+#ifdef YOUBIN
-+#define YoubinBinDir %YOUBINBINDIR%
-+#define YOUBIN_DEFAULT_SERVER_HOST "server"
-+#endif /* YOUBIN */
diff --git a/mail/xpbiff/files/patch-ab b/mail/xpbiff/files/patch-ab
deleted file mode 100644
index 2bf6efa618c6..000000000000
--- a/mail/xpbiff/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- StrToPmap.c.org	Fri Apr 11 01:27:17 1997
-+++ StrToPmap.c	Fri Apr 11 01:27:38 1997
-@@ -90,8 +90,7 @@
- 	done(pixmap, Pixmap2);
- 	return;
-     }
--
--    pixmap[0] = locate_pixmap_file (*((Screen **) args[0].addr), name,
-+    pixmap[0] = LocatePixmapFile(*((Screen **) args[0].addr), name,
- 			       NULL, 0, NULL, NULL, &pixmap[1]);
- 
-     if (pixmap[0] != None) {
diff --git a/mail/xpbiff/files/patch-ad b/mail/xpbiff/files/patch-ad
deleted file mode 100644
index e199776d4d41..000000000000
--- a/mail/xpbiff/files/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
---- Imakefile.org	Thu Sep 21 23:42:04 2000
-+++ Imakefile	Thu Sep 21 23:42:16 2000
-@@ -62,4 +62,4 @@
-            SRCS = xpbiff.c $(CONVSRC)
-            OBJS = xpbiff.o $(CONVOBJ)
- 
--ComplexProgramTarget(xpbiff)
-+ComplexProgramTargetNoMan(xpbiff)
diff --git a/mail/xpbiff/files/patch-ae b/mail/xpbiff/files/patch-ae
deleted file mode 100644
index 0d36d557df4f..000000000000
--- a/mail/xpbiff/files/patch-ae
+++ /dev/null
@@ -1,958 +0,0 @@
---- xpbiff.c.orig	1994-10-27 15:42:52.000000000 +0900
-+++ xpbiff.c	2010-11-17 14:40:26.457077878 +0900
-@@ -60,6 +60,7 @@
- 
- #include "config.h"
- 
-+#include <paths.h>	/* _PATH_MAILDIR */
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
-@@ -74,6 +75,12 @@
- #endif
- #endif /* SUN_AUDIO */
- 
-+#ifdef BSD_AUDIO
-+#include <sys/soundcard.h>
-+#define MAX_SOUND_VOL 95
-+#define MIN_SOUND_VOL 05
-+#endif
-+
- #ifndef X11R3
- #include <X11/Xaw/Box.h>
- #include <X11/Xaw/Label.h>
-@@ -116,7 +123,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <math.h>
-+#ifdef HAVE_GETPWUID
-+#include <pwd.h>
-+#endif /* HAVE_GETPWUID */
- 
- #ifdef YOUBIN
- 
-@@ -149,11 +160,7 @@
- 
- #ifndef YOUBIN
- 
--#ifdef USG
--#define SPOOLPATH	"/usr/mail/"
--#else
--#define SPOOLPATH	"/usr/spool/mail/"
--#endif
-+#define SPOOLPATH	_PATH_MAILDIR
- 
- #else /* YOUBIN */
- 
-@@ -256,34 +263,11 @@
-  */
- 
- GC		gcArrive, gcNo, gcAnimate, gcAnimateBack;
--#ifdef XPM
--Pixmap		arrivePixmaps[2], noPixmaps[2];
--#define arrivePixmap	arrivePixmaps[0]
--#define noPixmap	noPixmaps[0]
--#else
--Pixmap		arrivePixmap, noPixmap;
--#endif
- Pixmap		workPixmap;
- int		width, height;
- unsigned char	current_status = NO;
- unsigned char	showing_header = 0;
- long		mail_size = 0;
--#ifndef YOUBIN
--XtIntervalId	polling_id;
--#endif
--Pixel		colors[4];
--#ifndef YOUBIN
--char		spool_path[100];
--int		polling_time;
--#endif
--int		popup_time;
--
--Boolean		raise;
--Boolean		stay_raised;
--Boolean		animate;
--Boolean		popup;
--Boolean		bell;
--Boolean		popdown;
- 
- unsigned int	Arrive_pixmap_width, Arrive_pixmap_height;
- unsigned int	Arrive_pixmap_depth;
-@@ -291,24 +275,11 @@
- unsigned int	No_pixmap_width, No_pixmap_height;
- unsigned int	No_pixmap_depth;
- 
--Boolean		mono;
--String		popupGeometry;
--
--#ifndef YOUBIN
--String		prefers;
--
--String		spoolPath;
--#endif
--
--#ifdef MHSCAN
--Boolean		mhscan;
--String		scanCommand;
--String		scanCommandPath;
--#endif
--
--#ifdef SHAPE
--Boolean		shape;
--Pixmap		noPixmapMask, arrivePixmapMask;
-+#ifdef YOUBIN
-+XtIntervalId	timeout_id;
-+#else
-+XtIntervalId	polling_id;
-+char		spool_path[100];
- #endif
- 
- static String		fallback_resources[] = {
-@@ -324,86 +295,125 @@
-     NULL
- };
- 
--#ifdef SUN_AUDIO
--String mail_sndfile;
--int volume;
-+typedef struct _appRes {
-+#ifdef XPM
-+    Pixmap	arrivePixmaps[2];
-+    Pixmap	noPixmaps[2];
-+#define	arrivePixmap	arrivePixmaps[0]
-+#define	noPixmap	noPixmaps[0]
-+#else
-+    Pixmap	arrivePixmap;
-+    Pixmap	noPixmap;
- #endif
--
-+    Pixel	colors[4];
-+#ifndef YOUBIN
-+    String	prefers;
-+    int		polling_time;
-+    String	spoolPath;
-+#endif
-+    Boolean	mono;
-+    String	popupGeometry;
-+    Boolean	raise;
-+    Boolean	stay_raised;
-+    Boolean	animate;
-+    Boolean	popup;
-+    int		popup_time;
-+    Boolean	bell;
-+    Boolean	popdown;
- #ifdef YOUBIN
--Boolean		use_pipe;
--String		server;
--Boolean		preserve;
--XtIntervalId	timeout_id;
-+    Boolean	use_pipe;
-+    String	server;
-+    Boolean	preserve;
-+#endif
-+#ifdef MHSCAN
-+    Boolean	mhscan;
-+    String	scanCommand;
-+    String	scanCommandPath;
- #endif
-+#ifdef SHAPE
-+    Boolean	shape;
-+    Pixmap	arrivePixmapMask;
-+    Pixmap	noPixmapMask;
-+#endif
-+#if (defined(SUN_AUDIO) || defined(BSD_AUDIO))
-+    String	mail_sndfile;
-+    int		volume;
-+#endif
-+} AppResourcesRec, *AppResources;
-+
-+#define	SetResOffset(n, field)	resources[n].resource_offset = ((char *)&appResources.field - (char *)&appResources)
-+#define	offset(field)	XtOffset(struct _appRes *, field)
-+
-+AppResourcesRec appResources;
- 
- static XtResource	resources[] = {
-     {"arrivePixmap", "ArrivePixmap", RPixmap2, sizeof(Pixmap2),
--	 (Cardinal)&arrivePixmap, XtRString, "None"},
-+     offset(arrivePixmap), XtRString, "None"},
-     {"nomailPixmap", "NomailPixmap", RPixmap2, sizeof(Pixmap2),
--	 (Cardinal)&noPixmap, XtRString, "None"},
-+     offset(noPixmap), XtRString, "None"},
-     {"nomailForeground", "NomailForeground", XtRPixel, sizeof(Pixel),
--	 (Cardinal)&colors[0], XtRString, "black"},
-+     offset(colors[0]), XtRString, "black"},
-     {"nomailBackground", "NomailBackground", XtRPixel, sizeof(Pixel),
--	 (Cardinal)&colors[1], XtRString, "cyan"},
-+     offset(colors[1]), XtRString, "cyan"},
-     {"arriveForeground", "ArriveForeground", XtRPixel, sizeof(Pixel),
--	 (Cardinal)&colors[2], XtRString, "yellow"},
-+     offset(colors[2]), XtRString, "yellow"},
-     {"arriveBackground", "ArriveBackground", XtRPixel, sizeof(Pixel),
--	 (Cardinal)&colors[3], XtRString, "red"},
-+     offset(colors[3]), XtRString, "red"},
- #ifndef YOUBIN
-     {"pollingTime", "PollingTime", XtRInt, sizeof(int),
--	 (Cardinal)&polling_time, XtRImmediate, (XtPointer)15000},
-+     offset(polling_time), XtRImmediate, (XtPointer)15000},
-     {"prefer", "Prefer", XtRString, sizeof(String),
--	 (Cardinal)&prefers, XtRString, (XtPointer)"From Subject"},
-+     offset(prefers), XtRString, (XtPointer)"From Subject"},
-     {"spoolPath", "SpoolPath", XtRString, sizeof(String),
--	 (Cardinal)&spoolPath, XtRString, None},
-+     offset(spoolPath), XtRString, None},
- #endif
-     {"mono", "Mono", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&mono, XtRImmediate, (XtPointer)False},
-+     offset(mono), XtRImmediate, (XtPointer)False},
-     {"popupGeometry", "PopupGeometry", XtRString, sizeof(String),
--	 (Cardinal)&popupGeometry, XtRString, NULL},
-+     offset(popupGeometry), XtRString, NULL},
-     {"raise", "Raise", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&raise, XtRImmediate, (XtPointer)True},
-+     offset(raise), XtRImmediate, (XtPointer)True},
-     {"stayRaised", "StayRaised", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&stay_raised, XtRImmediate, (XtPointer)False},
-+     offset(stay_raised), XtRImmediate, (XtPointer)False},
-     {"animate", "Animate", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&animate, XtRImmediate, (XtPointer)True},
-+     offset(animate), XtRImmediate, (XtPointer)True},
-     {"popup", "Popup", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&popup, XtRImmediate, (XtPointer)True},
-+     offset(popup), XtRImmediate, (XtPointer)True},
-     {"popupTime", "PopupTime", XtRInt, sizeof(int),
--     (Cardinal)&popup_time, XtRImmediate, (XtPointer)15000},
-+     offset(popup_time), XtRImmediate, (XtPointer)15000},
-     {"bell", "Bell", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&bell, XtRImmediate, (XtPointer)True},
-+     offset(bell), XtRImmediate, (XtPointer)True},
-     {"popdown", "Popdown", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&popdown, XtRImmediate, (XtPointer)True},
-+     offset(popdown), XtRImmediate, (XtPointer)True},
- #ifdef YOUBIN
-     {"pipe", "Pipe", XtRBoolean, sizeof(Boolean),
--     (Cardinal)&use_pipe, XtRString, "false"},
-+     offset(use_pipe), XtRString, "false"},
-     {"server", "Server", XtRString, sizeof(String),
--	(Cardinal)&server, XtRString, YOUBIN_DEFAULT_SERVER_HOST},
-+     offset(server), XtRString, YOUBIN_DEFAULT_SERVER_HOST},
-     {"preserve", "preserve", XtRBoolean, sizeof(Boolean),
--	(Cardinal)&preserve, XtRString, "true"},
-+     offset(preserve), XtRString, "true"},
- #endif
- #ifdef MHSCAN
-     {"mhscan", "Mhscan", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&mhscan, XtRImmediate, (XtPointer)False},
-+     offset(mhscan), XtRImmediate, (XtPointer)False},
-     {"scanCommand", "ScanCommand", XtRString, sizeof(String),
--	 (Cardinal)&scanCommand, XtRString, DEFAULT_SCAN_COMMAND},
-+     offset(scanCommand), XtRString, DEFAULT_SCAN_COMMAND},
-     {"scanCommandPath", "ScanCommandPath", XtRString, sizeof(String),
--	 (Cardinal)&scanCommandPath, XtRString, DEFAULT_SCAN_COMMAND_PATH},
-+     offset(scanCommandPath), XtRString, DEFAULT_SCAN_COMMAND_PATH},
- #endif
- #ifdef SHAPE
-     {"shape", "Shape", XtRBoolean, sizeof(Boolean),
--	 (Cardinal)&shape, XtRImmediate, (XtPointer)False},
-+     offset(shape), XtRImmediate, (XtPointer)False},
-     {"arrivePixmapMask", "ArrivePixmapMask", XtRBitmap, sizeof(Pixmap),
--	 (Cardinal)&arrivePixmapMask, XtRBitmap, None},
-+     offset(arrivePixmapMask), XtRBitmap, None},
-     {"nomailPixmapMask", "NomailPixmapMask", XtRBitmap, sizeof(Pixmap),
--	 (Cardinal)&noPixmapMask, XtRBitmap, None},
-+     offset(noPixmapMask), XtRBitmap, None},
- #endif
--#ifdef SUN_AUDIO
-+#if (defined(SUN_AUDIO) || defined(BSD_AUDIO))
-     {"mailSndFile", "MailSndFile", XtRString, sizeof(String),
--     (Cardinal)&mail_sndfile, XtRString, None},
-+     offset(mail_sndfile), XtRString, None},
-     {"volume", "Volume", XtRInt, sizeof(int),
--     (Cardinal)&volume, XtRString, "33"},
-+     offset(volume), XtRString, "33"},
- #endif    
- };
- 
-@@ -445,7 +455,7 @@
-     {"-server",		"*server",		XrmoptionSepArg,	NULL},
-     {"-preserve",	"*preserve",		XrmoptionNoArg,		"true"},
- #endif /* YOUBIN */
--#ifdef SUN_AUDIO
-+#if (defined(SUN_AUDIO) || defined(BSD_AUDIO))
-     {"-sndfile",	"*mailSndFile",		XrmoptionSepArg,	NULL},
-     {"-volume",		"*volume",		XrmoptionSepArg,	NULL},
- #endif
-@@ -461,6 +471,7 @@
- #ifdef JCONVERT
- static Locale_ent	locale_list[] = {
-     {"ja_JP.EUC",	EUC},
-+    {"ja_JP.eucJP",	EUC},
-     {"ja_JP.SJIS",	SJIS},
-     {"ja_JP.jis7",	JIS},
-     {"ja_JP.jis8",	JIS},
-@@ -485,9 +496,9 @@
-     XGCValues		values;
-     XtTranslations	newTranslations;
-     static XtActionsRec redrawActions[] = {
--	{"expose", (XtCallbackProc) redraw_callback},
--	{"select", (XtCallbackProc) popup_again},
--	{"quit", (XtCallbackProc) quit},
-+	{"expose", (XtActionProc) redraw_callback},
-+	{"select", (XtActionProc) popup_again},
-+	{"quit", (XtActionProc) quit},
-     };
- 
-     static char		*overrideTranslations =
-@@ -498,6 +509,9 @@
-     int			dummy;
-     int			i;
- 
-+#ifdef HAVE_GETPWUID
-+    struct passwd	*pw;
-+#endif
- #ifdef JCONVERT
-     char		*locale_name;
-     Locale_ent		*p;
-@@ -514,28 +528,40 @@
- #endif /* !YOUBIN */
- 
- #ifdef YOUBIN
--	if ((prog_name = strrchr(argv[0], '/')) != NULL) {
--	    prog_name++;
--	} else {
--	    prog_name = argv[0];
--	}
-+    if ((prog_name = strrchr(argv[0], '/')) != NULL) {
-+	prog_name++;
-+    } else {
-+	prog_name = argv[0];
-+    }
- #else	/* !YOUBIN */
--    if (spoolPath != NULL && spoolPath[0] != '\0')
--	strcpy(spool_path, spoolPath);
--    else
-+    if (appResources.spoolPath != NULL && appResources.spoolPath[0] != '\0') {
-+	strcpy(spool_path, appResources.spoolPath);
-+    } else {
-     	strcpy(spool_path, SPOOLPATH);
--    if (spool_path[strlen(spool_path) - 1] != '/')
-+    }
-+    if (spool_path[strlen(spool_path) - 1] != '/') {
- 	strcat(spool_path, "/");
-+    }
-+
- #ifdef GETENV_MAIL
--    if (getenv("MAIL") != NULL)
-+    if (getenv("MAIL") != NULL) {
- 	strcpy(spool_path, getenv("MAIL"));
--    else
--#endif
--#ifndef NO_CUSERID
--	strcat(spool_path, cuserid(NULL));
--#else
-+    } else {
-+#endif /* GETENV_MAIL */
-+
-+#ifdef HAVE_GETPWUID
-+	pw = getpwuid(getuid());
-+	strcat(spool_path, pw->pw_name);
-+#elif defined(NO_CUSERID)
- 	strcat(spool_path, getenv("USER"));
--#endif
-+#else
-+	strcat(spool_path, (char *)cuserid(NULL));
-+#endif /* NO_CUSERID && HAVE_GETPWUID */
-+
-+#ifdef GETENV_MAIL
-+    }
-+#endif /* GETENV_MAIL */
-+
- #endif /* !YOUBIN */
- 
- #ifdef XI18N
-@@ -646,7 +672,7 @@
- 	    fprintf(stderr, "		[-server host]\n");
- 	    fprintf(stderr, "		[-nopreserve]\n");
- #endif
--#ifdef SUN_AUDIO
-+#if (defined(SUN_AUDIO) || defined(BSD_AUDIO))
- 	    fprintf(stderr, "		[-sndfile audio_file]\n");
- 	    fprintf(stderr, "		[-volume percentage]\n");
- #endif
-@@ -659,33 +685,33 @@
- 		      convertArgs, XtNumber(convertArgs));
- #endif
- 
--    XtGetApplicationResources(toplevel, (caddr_t) NULL,
-+    XtGetApplicationResources(toplevel, (XtPointer)&appResources,
- 			      resources, XtNumber(resources), NULL, 0);
- 
--    if (mono == True) {
--	colors[0] = colors[3] = BlackPixelOfScreen(XtScreen(toplevel));
--	colors[1] = colors[2] = WhitePixelOfScreen(XtScreen(toplevel));
-+    if (appResources.mono == True) {
-+	appResources.colors[0] = appResources.colors[3] = BlackPixelOfScreen(XtScreen(toplevel));
-+	appResources.colors[1] = appResources.colors[2] = WhitePixelOfScreen(XtScreen(toplevel));
-     }
- 
- #ifndef YOUBIN
--    split_prefer(prefers);
-+    split_prefer(appResources.prefers);
- #endif
- 
- #ifdef XPM
--    if (arrivePixmapMask == None)
--	arrivePixmapMask = arrivePixmaps[1];
--    if (noPixmapMask == None)
--	noPixmapMask = noPixmaps[1];
-+    if (appResources.arrivePixmapMask == None)
-+	appResources.arrivePixmapMask = appResources.arrivePixmaps[1];
-+    if (appResources.noPixmapMask == None)
-+	appResources.noPixmapMask = appResources.noPixmaps[1];
- #endif
- 
- #ifdef SHAPE
--    if (shape == True
-+    if (appResources.shape == True
-        && !XShapeQueryExtension(XtDisplay(toplevel), &dummy, &dummy))
--	shape = False;
-+	appResources.shape = False;
- #endif
- 
--    if (noPixmap == None) {
--	noPixmap = XCreatePixmapFromBitmapData
-+    if (appResources.noPixmap == None) {
-+	appResources.noPixmap = XCreatePixmapFromBitmapData
- 	    (XtDisplay(toplevel), RootWindowOfScreen(XtScreen(toplevel)),
- 	     no_bits, no_width, no_height, 1, 0, 1);
- 	No_pixmap_width = no_width;
-@@ -695,14 +721,14 @@
-     else {
- 	Window r;
- 	unsigned int x, y, bw;
--	XGetGeometry(XtDisplay(toplevel), noPixmap,
-+	XGetGeometry(XtDisplay(toplevel), appResources.noPixmap,
- 		     &r, &x, &y,
- 		     &No_pixmap_width, &No_pixmap_height,
- 		     &bw, &No_pixmap_depth);
-     }
- 
--    if (arrivePixmap == None) {
--	arrivePixmap = XCreatePixmapFromBitmapData
-+    if (appResources.arrivePixmap == None) {
-+	appResources.arrivePixmap = XCreatePixmapFromBitmapData
- 	    (XtDisplay(toplevel), RootWindowOfScreen(XtScreen(toplevel)),
- 	     arrive_bits, arrive_width, arrive_height,
- 	     1, 0, 1);
-@@ -713,7 +739,7 @@
-     else {
- 	Window r;
- 	unsigned int x, y, bw;
--	XGetGeometry(XtDisplay(toplevel), arrivePixmap,
-+	XGetGeometry(XtDisplay(toplevel), appResources.arrivePixmap,
- 		     &r, &x, &y,
- 		     &Arrive_pixmap_width, &Arrive_pixmap_height,
- 		     &bw, &Arrive_pixmap_depth);
-@@ -741,14 +767,14 @@
- 
-     /* Get graphic context	 */
- 
--    values.foreground	= colors[0];
--    values.background	= colors[1];
-+    values.foreground	= appResources.colors[0];
-+    values.background	= appResources.colors[1];
-     values.graphics_exposures = False;
-     gcNo = XtGetGC(toplevel,
- 		   GCForeground | GCBackground | GCGraphicsExposures,
- 		   &values);
--    values.foreground	= colors[2];
--    values.background	= colors[3];
-+    values.foreground	= appResources.colors[2];
-+    values.background	= appResources.colors[3];
-     values.graphics_exposures = False;
-     gcArrive = XtGetGC(toplevel,
- 		       GCForeground | GCBackground | GCGraphicsExposures,
-@@ -760,13 +786,13 @@
- 			       Arrive_pixmap_width, Arrive_pixmap_height,
- 			       DefaultDepthOfScreen(XtScreen(toplevel)));
- 
--    values.foreground	= colors[2];
-+    values.foreground	= appResources.colors[2];
-     values.graphics_exposures = False;
-     gcAnimate = XtGetGC(toplevel,
- 			GCForeground | GCGraphicsExposures,
- 			&values);
- 
--    values.foreground	= colors[3];
-+    values.foreground	= appResources.colors[3];
-     values.graphics_exposures = False;
-     gcAnimateBack = XtGetGC(toplevel,
- 			    GCForeground | GCGraphicsExposures,
-@@ -775,11 +801,11 @@
-     /* Interval timer start	 */
- #ifndef YOUBIN
-     polling_id = XtAppAddTimeOut(app_con,
--				 (unsigned long) polling_time, Polling, NULL);
-+				 (unsigned long) appResources.polling_time, (XtTimerCallbackProc) Polling, NULL);
- #else  /* YOUBIN */
--    if (server == NULL) {
-+    if (appResources.server == NULL) {
- 	gethostname(serv_name, sizeof(serv_name));
--	server = serv_name;
-+	appResources.server = serv_name;
-     }
- 
-     /* make new process group */
-@@ -789,9 +815,9 @@
- 	    exit(EXIT_FAILURE);
- 	}
- 
--    if (use_pipe == False) {
-+    if (appResources.use_pipe == False) {
- 	sprintf(child_process, "%s/%s -b -s %s",
--		BINDIR, CHILD_PROGRAM_NAME, server);
-+		BINDIR, CHILD_PROGRAM_NAME, appResources.server);
- 	if ((pfile = popen(child_process, "r")) == NULL) {
- 	    perror("popen");
- 	    exit(EXIT_FAILURE);
-@@ -831,21 +857,21 @@
- {
-     if (current_status == ARRIVE) {
- 	if (Arrive_pixmap_depth == 1)
--	    XCopyPlane(XtDisplay(toplevel), arrivePixmap, XtWindow(biff),
-+	    XCopyPlane(XtDisplay(toplevel), appResources.arrivePixmap, XtWindow(biff),
- 		       gcArrive,
- 		       0, 0, Arrive_pixmap_width, Arrive_pixmap_height, 0, 0, 1);
- 	else
--	    XCopyArea(XtDisplay(toplevel), arrivePixmap, XtWindow(biff),
-+	    XCopyArea(XtDisplay(toplevel), appResources.arrivePixmap, XtWindow(biff),
- 		      gcArrive,
- 		      0, 0, Arrive_pixmap_width, Arrive_pixmap_height, 0, 0);
-     }
-     else {
- 	if (No_pixmap_depth == 1)
--	    XCopyPlane(XtDisplay(toplevel), noPixmap, XtWindow(biff),
-+	    XCopyPlane(XtDisplay(toplevel), appResources.noPixmap, XtWindow(biff),
- 		       gcNo,
- 		       0, 0, No_pixmap_width, No_pixmap_height, 0, 0, 1);
- 	else
--	    XCopyArea(XtDisplay(toplevel), noPixmap, XtWindow(biff),
-+	    XCopyArea(XtDisplay(toplevel), appResources.noPixmap, XtWindow(biff),
- 		      gcNo, 0, 0, No_pixmap_width, No_pixmap_height, 0, 0);
-     }
- }
-@@ -853,9 +879,9 @@
- #ifdef SHAPE
- void shape_window()
- {
--    if (shape == True) {
-+    if (appResources.shape == True) {
- 	if (current_status == ARRIVE) {
--	    if (arrivePixmapMask == None) {
-+	    if (appResources.arrivePixmapMask == None) {
- 		XRectangle	rect;
- 		rect.x = rect.y = 0;
- 		rect.width = Arrive_pixmap_width;
-@@ -866,11 +892,11 @@
- 	    }
- 	    else
- 		XShapeCombineMask(XtDisplay(toplevel), XtWindow(toplevel),
--				  ShapeBounding, 0, 0, arrivePixmapMask,
-+				  ShapeBounding, 0, 0, appResources.arrivePixmapMask,
- 				  ShapeSet);
- 	}
- 	else {
--	    if (noPixmapMask == None) {
-+	    if (appResources.noPixmapMask == None) {
- 		XRectangle	rect;
- 		rect.x = rect.y = 0;
- 		rect.width = No_pixmap_width;
-@@ -881,7 +907,7 @@
- 	    }
- 	    else
- 		XShapeCombineMask(XtDisplay(toplevel), XtWindow(toplevel),
--				  ShapeBounding, 0, 0, noPixmapMask,
-+				  ShapeBounding, 0, 0, appResources.noPixmapMask,
- 				  ShapeSet);
- 	}
-     }
-@@ -915,53 +941,54 @@
- 	    /* NEW mail !! */
- 	    current_status = ARRIVE;
- 	    mail_size = file_stat.st_size;
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		mail_header = GetMailHeader();
- 	    XtResizeWidget(toplevel, Arrive_pixmap_width, Arrive_pixmap_height, 1);
- 	    XtResizeWidget(biff,  Arrive_pixmap_width, Arrive_pixmap_height, 0);
--	    if (raise == True)
-+	    if (appResources.raise == True)
- 		XRaiseWindow(XtDisplay(toplevel), XtWindow(toplevel));
--	    if (animate == True)
-+	    if (appResources.animate == True)
- 		AnimateBiff();
- 	    redraw_window();
- #ifdef SHAPE
- 	    shape_window();
- #endif
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		PopupMailHeader(mail_header);
- 	    XSync(XtDisplay(toplevel), 0);
--	    if (bell == True)
--		beep(XtDisplay(toplevel), 0);
-+	    if (appResources.bell == True)
-+		beep(XtDisplay(toplevel));
- 	    /*	XBell(XtDisplay(toplevel), 0); */
- 	}
- 	else if (file_stat.st_size > mail_size) {
- 	    mail_size = file_stat.st_size;
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		mail_header = GetMailHeader();
- 	    /* more come! only ringing bell. */
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
- 	    XtResizeWidget(toplevel,  Arrive_pixmap_width, Arrive_pixmap_height, 1);
- 	    XtResizeWidget(biff,  Arrive_pixmap_width, Arrive_pixmap_height, 0);
--	    if (raise == True)
-+	    if (appResources.raise == True)
- 		XRaiseWindow(XtDisplay(toplevel), XtWindow(toplevel));
--	    if (animate == True)
-+	    if (appResources.animate == True)
- 		AnimateBiff();
- 	    redraw_window();
- #ifdef SHAPE
- 	    shape_window();
- #endif
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		PopupMailHeader(mail_header);
- 	    XSync(XtDisplay(toplevel), 0);
--	    if (bell == True)
--		XBell(XtDisplay(toplevel), 0);
-+	    if (appResources.bell == True)
-+		beep(XtDisplay(toplevel));
-+	    /*	XBell(XtDisplay(toplevel), 0); */
- 	}
- 	else {
- 	    mail_size = file_stat.st_size;
--	    if (raise == True && stay_raised == False)
-+	    if (appResources.raise == True && appResources.stay_raised == False)
- 		XLowerWindow(XtDisplay(toplevel), XtWindow(toplevel));
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
- 	}
-     } else
-@@ -974,15 +1001,15 @@
- #ifdef SHAPE
- 	    shape_window();
- #endif
--	    if (raise == True && stay_raised == False)
-+	    if (appResources.raise == True && appResources.stay_raised == False)
- 		XLowerWindow(XtDisplay(toplevel), XtWindow(toplevel));
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
- 	}
-     /* No arrive */
- 
-     polling_id = XtAppAddTimeOut(XtWidgetToApplicationContext(toplevel),
--				 (unsigned long) polling_time, Polling, NULL);
-+				 (unsigned long) appResources.polling_time, (XtTimerCallbackProc) Polling, NULL);
- 
- }
- #endif /* !YOUBIN */
-@@ -995,7 +1022,7 @@
-     double	    r, angle, t1, t2, t3, t4;
- 
- #ifdef SHAPE
--    if(shape == True) {
-+    if(appResources.shape == True) {
- 	XRectangle	rect;
- 	rect.x = rect.y = 0;
- 	rect.width = Arrive_pixmap_width;
-@@ -1038,9 +1065,9 @@
- 
-     /* Create Popup Shell */
- 
--    if (popupGeometry != NULL) {
-+    if (appResources.popupGeometry != NULL) {
- 	arg_count = 0;
--	XtSetArg(args[arg_count], XtNgeometry, popupGeometry);
-+	XtSetArg(args[arg_count], XtNgeometry, appResources.popupGeometry);
- 	arg_count++;
-     }
-     else {
-@@ -1068,10 +1095,10 @@
-     info_base = XtCreateManagedWidget("info_base", boxWidgetClass, header, args,
- 				      arg_count);
- 
--    if (popdown == True) {
-+    if (appResources.popdown == True) {
- 	popdown_button = XtCreateManagedWidget("popdown_button", commandWidgetClass, info_base, NULL,
- 					       ZERO);
--	XtAddCallback(popdown_button, XtNcallback, BreakPopup, (XtPointer) NULL);
-+	XtAddCallback(popdown_button, XtNcallback, (XtCallbackProc) BreakPopup, (XtPointer) NULL);
-     }
-     arg_count = 0;
-     XtSetArg(args[arg_count], XtNlabel, head);
-@@ -1131,37 +1158,38 @@
- 	    /* the click catchs new mail */
- 	    current_status = ARRIVE;
- 	    mail_size = file_stat.st_size;
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		mail_header = GetMailHeader();
- 	    XtResizeWidget(toplevel, Arrive_pixmap_width, Arrive_pixmap_height, 1);
- 	    XtResizeWidget(biff, Arrive_pixmap_width, Arrive_pixmap_height, 0);
--	    if (raise == True)
-+	    if (appResources.raise == True)
- 		XRaiseWindow(XtDisplay(toplevel), XtWindow(toplevel));
--	    if (animate == True)
-+	    if (appResources.animate == True)
- 		AnimateBiff();
- 	    redraw_window();
- #ifdef SHAPE
- 	    shape_window();
- #endif
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		PopupMailHeader(mail_header);
- 	    XSync(XtDisplay(toplevel), 0);
--	    if (bell == True)
--		XBell(XtDisplay(toplevel), 0);
-+	    if (appResources.bell == True)
-+		beep(XtDisplay(toplevel));
-+	    /*	XBell(XtDisplay(toplevel), 0); */
- 	}
- 	else {
- 	    mail_size = file_stat.st_size;
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		mail_header = GetMailHeader();
--	    if (popup == True && showing_header)
-+	    if (appResources.popup == True && showing_header)
- 		BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
--	    if (raise == True)
-+	    if (appResources.raise == True)
- 		XRaiseWindow(XtDisplay(toplevel), XtWindow(toplevel));
- 	    redraw_window();
- #ifdef SHAPE
- 	    shape_window();
- #endif
--	    if (popup == True)
-+	    if (appResources.popup == True)
- 		PopupMailHeader(mail_header);
- 	    XSync(XtDisplay(toplevel), 0);
- 	}
-@@ -1169,7 +1197,7 @@
- 
-     XtRemoveTimeOut(polling_id);
-     polling_id = XtAppAddTimeOut(XtWidgetToApplicationContext(toplevel),
--				 (unsigned long) polling_time, Polling, NULL);
-+				 (unsigned long) appResources.polling_time, (XtTimerCallbackProc) Polling, NULL);
- }
- #endif /* !YOUBIN */
- 
-@@ -1749,14 +1777,23 @@
- static void beep (display)
-     Display *display; 
- {
--#ifdef SUN_AUDIO
-+#if defined(SUN_AUDIO) || defined(BSD_AUDIO)
-     int		audiofd, filefd;
--    int		rn, wn, len;
-+    int		rn;
-+#ifdef SUN_AUDIO
-+    int		wn, len;
-     unsigned char	buf[256];
-     Audio_filehdr	*au_hdr;
-     audio_info_t 	ais;
--
--    if (mail_sndfile) {
-+#elif defined(BSD_AUDIO)
-+    int mixerfd, mixerid, supported;
-+    static int bsize;
-+    static char *buf;
-+    struct stat sbuf;
-+    int level, level_tmp;
-+#endif
-+	
-+    if (appResources.mail_sndfile) {
- 	audiofd = open( "/dev/audio", O_WRONLY | O_NDELAY ); 
- 	if (audiofd < 0)
- 	    {
-@@ -1766,6 +1803,7 @@
- 		return;
- 	    }
- 
-+#ifdef SUN_AUDIO
- 	if( ioctl( audiofd, AUDIO_GETINFO, &ais ) )
- 	    {
- 		fprintf(stderr, "%s: Problem retrieving /dev/audio info.\n",
-@@ -1782,15 +1820,34 @@
- 	    return;
- 	}
- 
--	filefd = open(mail_sndfile, O_RDONLY);
-+#elif defined(BSD_AUDIO)
-+	/* Open the mixer device */
-+	mixerfd = open ("/dev/mixer", O_RDWR, 0);
-+	if (mixerfd > 0)
-+	    {
-+		if (appResources.volume > MAX_SOUND_VOL)
-+			appResources.volume = MAX_SOUND_VOL;
-+		else if (appResources.volume < MIN_SOUND_VOL)
-+			appResources.volume = MIN_SOUND_VOL;
-+		mixerid = SOUND_MIXER_PCM;
-+		    /* storing volume level */
-+		ioctl(mixerfd,MIXER_READ(mixerid),&level_tmp);
-+
-+		level = (appResources.volume << 8) | appResources.volume;
-+		ioctl(mixerfd,MIXER_WRITE(mixerid),&level);
-+	}
-+#endif
-+
-+	filefd = open(appResources.mail_sndfile, O_RDONLY);
- 	if (filefd < 0)
- 	    {
- 		fprintf(stderr, "%s: Couldn't play file \"%s\"\n", 
--			"Mailbox widget", mail_sndfile);
-+			"Mailbox widget", appResources.mail_sndfile);
- 		close(audiofd);
- 		return;
- 	    }
- 
-+#ifdef SUN_AUDIO
- 	/* Read in the audio header */
- 	rn = read(filefd, buf, sizeof(Audio_filehdr)); 
- 
-@@ -1841,12 +1898,28 @@
- 		    usleep(1000);
- 		}
- 	    }
--	close(audiofd);
-+#elif defined(BSD_AUDIO)
-+	ioctl(audiofd, SNDCTL_DSP_RESET, 0);
-+	fstat(filefd, &sbuf);
-+	bsize = sbuf.st_size;
-+	buf = malloc((u_int)bsize);
-+	if ( (rn = read(filefd, buf, bsize)) > 0)
-+	    write(audiofd, buf, rn);
-+	ioctl(audiofd, SNDCTL_DSP_SYNC, 0);
-+	free(buf);
-+	if (mixerfd > 0)
-+	    {
-+		    /* restoring volume level */
-+		ioctl(mixerfd,MIXER_WRITE(mixerid),&level_tmp);
-+		close(mixerfd);
-+	    }
-+#endif
-+	close(audiofd); 
- 	close(filefd);
-     }
-     else
--    XBell (display, volume);
--#else  /* !SUN_AUDIO */
-+    XBell (display, 0);
-+#else  /* !SUN_AUDIO && !BSD_AUDIO */
-     XBell (display, 0);
- #endif /* SUN_AUDIO */
-     return;
-@@ -1888,7 +1961,7 @@
- 
-     if (mail_size > saved_mail_size) {
- 	/* NEW mail */
--	if (popup == True || *cp == ' ') {
-+	if (appResources.popup == True || *cp == ' ') {
- 	    date = strtol(cp, &cp2, 10);
- 	    if (*cp2 == '\0' || isspace(*cp2)) {
- 		get_mail_header((*cp2 == '\0') ? NULL : (cp2 + 1));
-@@ -1898,31 +1971,31 @@
- 	current_status = ARRIVE;
- 	XtResizeWidget(toplevel, Arrive_pixmap_width, Arrive_pixmap_height, 1);
- 	XtResizeWidget(biff, Arrive_pixmap_width, Arrive_pixmap_height, 0);
--	if (popup == True) {
-+	if (appResources.popup == True) {
- 	    BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
- 	}
--	if (raise == True) {
-+	if (appResources.raise == True) {
- 	    XRaiseWindow(XtDisplay(toplevel), XtWindow(toplevel));
- 	}
--	if (animate == True && mail_header != NULL) {
-+	if (appResources.animate == True && mail_header != NULL) {
- 	    AnimateBiff();
- 	}
- 	redraw_window();
- #ifdef SHAPE
- 	shape_window();
- #endif
--	if (popup == True) {
-+	if (appResources.popup == True) {
- 	    if (mail_header != NULL) {
- 		PopupMailHeader(mail_header);
- 
--		if (popup_time)
-+		if (appResources.popup_time)
- 		    XtAppAddTimeOut(XtWidgetToApplicationContext(toplevel),
--				    (unsigned long) popup_time, BreakPopup, NULL);
-+				    (unsigned long) appResources.popup_time, (XtTimerCallbackProc) BreakPopup, NULL);
- 	    }
- 	}
- 	XSync(XtDisplay(toplevel), 0);
--	if (bell == True) {
--	    beep(XtDisplay(toplevel), 0);
-+	if (appResources.bell == True) {
-+	    beep(XtDisplay(toplevel));
- 	}
-     } else if (mail_size < saved_mail_size){
- 	/* No mail */
-@@ -1934,10 +2007,10 @@
- #ifdef SHAPE
- 	shape_window();
- #endif
--	if (popup == True) {
-+	if (appResources.popup == True) {
- 	    BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
- 	}
--	if (raise == True && stay_raised == False) {
-+	if (appResources.raise == True && appResources.stay_raised == False) {
- 	    XLowerWindow(XtDisplay(toplevel), XtWindow(toplevel));
- 	}
- 	free(mail_header);
-@@ -1974,7 +2047,7 @@
- 	if (header_count > 1 || *cp == '\0')	break;
- 	cp = strtok(NULL, "\n");
-     }
--    if (preserve == False) {
-+    if (appResources.preserve == False) {
- 	free(mail_header);
- 	mail_header = NULL;
-     }
-@@ -2024,16 +2097,16 @@
-     if (current_status == ARRIVE) {
- 	redraw_window();
- 
--	if (popup == True) {
-+	if (appResources.popup == True) {
- 	    BreakPopup(toplevel, (XtPointer) NULL, (XtPointer) NULL);
- 	    if (mail_header != NULL) {
- 		PopupMailHeader(mail_header);
- 	    }
--	    if (popup_time)
-+	    if (appResources.popup_time)
- 		XtAppAddTimeOut(XtWidgetToApplicationContext(toplevel),
--				(unsigned long) popup_time, BreakPopup, NULL);
-+				(unsigned long) appResources.popup_time, (XtTimerCallbackProc) BreakPopup, NULL);
- 	}
--	if (raise == True) {
-+	if (appResources.raise == True) {
- 	    XRaiseWindow(XtDisplay(toplevel), XtWindow(toplevel));
- 	}
- #ifdef SHAPE
diff --git a/mail/xpbiff/files/xpbiff.youbin.diff b/mail/xpbiff/files/xpbiff.youbin.diff
deleted file mode 100644
index 6806651b518f..000000000000
--- a/mail/xpbiff/files/xpbiff.youbin.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.org	Sat Jun 14 14:47:22 1997
-+++ config.h	Sat Jun 14 14:47:28 1997
-@@ -122,7 +122,7 @@
- /* 
-  * For YOUBIN Service
- */
--#undef YOUBIN
-+#define YOUBIN
- 
- #ifdef YOUBIN
- #ifdef LOCALBASE
diff --git a/mail/xpbiff/pkg-descr b/mail/xpbiff/pkg-descr
deleted file mode 100644
index 829b73d4a8a2..000000000000
--- a/mail/xpbiff/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-xpbiff:  fancy biff program under X11 environment, supporting Japanese MIME
-extensions
-
-	This port supports Japanese strings in the From and Subject fields.
-Please set the LANG enviroment variable to ja_JP.EUC by doing:
-		setenv LANG ja_JP.EUC
-	There is experimental support for Sun audio.  This port also supports
-XPM bitmap files.
-
-known problem:
-	(1) HANKAKU-KANA
-	   Xpbiff dumps core, because code conversion routines jis2euc()
-	assumes "the conversion does not makes the string longer".   But
-	when converting so-called 'hankaku-kana', this assumption breaks.
-Thank you.
author	Baptiste Daroussin <bapt@FreeBSD.org>	2011-05-02 07:37:31 +0000
committer	Baptiste Daroussin <bapt@FreeBSD.org>	2011-05-02 07:37:31 +0000
commit	b792cc5809657214baafaf9e6c91c0f2c60ae2d3 (patch)
tree	2819644bae64c8f4c44733d6d7dcbf578855d2d2 /mail
parent	362cb389be3b570d1c92fc52e966116cfbbfe25c (diff)
download	ports-b792cc5809657214baafaf9e6c91c0f2c60ae2d3.tar.gz ports-b792cc5809657214baafaf9e6c91c0f2c60ae2d3.zip