8 files changed, 11 insertions, 54 deletions

diff --git a/mail/xc-mail/Makefile b/mail/xc-mail/Makefile
index db3290d8fb75..e83f21045679 100644
--- a/mail/xc-mail/Makefile
+++ b/mail/xc-mail/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	xc-mail
-PORTVERSION=	1.3
+PORTVERSION=	2.2
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://js.zet.net/XCmail/download/ \
-		ftp://trier.linux.de/pub/XCmail/ \
-		ftp://ftp.myth.co.uk/pub/mirrors/xcmail/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	xcmail
 
 MAINTAINER=	trevor@FreeBSD.org
 
@@ -33,4 +33,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib" \
 		LIBS="-L${X11BASE}/lib"
 
+post-install:
+		chown ${BINOWN}:mail ${PREFIX}/bin/xc-mail
+		chmod g+s ${PREFIX}/bin/xc-mail
+
 .include <bsd.port.mk>
diff --git a/mail/xc-mail/distinfo b/mail/xc-mail/distinfo
index da07948a36b6..17b1ae37fbd9 100644
--- a/mail/xc-mail/distinfo
+++ b/mail/xc-mail/distinfo
@@ -1 +1 @@
-MD5 (xc-mail-1.3.tar.gz) = d37f56af205ece0c9356befc239b1c62
+MD5 (xc-mail-2.2.tar.gz) = 249505fa6d95c1d07669b210c5f9a83b
diff --git a/mail/xc-mail/files/patch-aa b/mail/xc-mail/files/patch-aa
deleted file mode 100644
index 5eee1f95b680..000000000000
--- a/mail/xc-mail/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/linkshared.in.orig	Tue Sep 15 16:18:07 1998
-+++ plugins/linkshared.in	Sun Oct  1 05:02:54 2000
-@@ -26,7 +26,7 @@
- 
- case @host@ in
- 
--	*-linux-*|*-irix6*|*-freebsd3*|*solaris2*)
-+	*-linux-*|*-irix6*|*-freebsd3*|*-freebsd4*|*-freebsd5*|*solaris2*)
- 		echo @CXX@ -o $dest -shared -Wl,-soname,"$dest" $*
- 		@CXX@ -o $dest -shared -Wl,-soname,"$dest" $* || die
- 		;;
diff --git a/mail/xc-mail/files/patch-ab b/mail/xc-mail/files/patch-ab
deleted file mode 100644
index ea43351ff9ee..000000000000
--- a/mail/xc-mail/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/mail_class.cxx.orig	Mon Jun  5 12:11:04 2000
-+++ src/mail_class.cxx	Sun Oct  1 05:07:19 2000
-@@ -12,8 +12,8 @@
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <utime.h>
- #include <sys/types.h>
-+#include <utime.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>
diff --git a/mail/xc-mail/files/patch-ac b/mail/xc-mail/files/patch-ac
deleted file mode 100644
index b2aa48d58a99..000000000000
--- a/mail/xc-mail/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/npop3get.cxx.orig	Fri Jun 23 10:42:27 2000
-+++ src/npop3get.cxx	Sun Oct  1 05:08:18 2000
-@@ -12,8 +12,8 @@
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <utime.h>
- #include <sys/types.h>
-+#include <utime.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <ctype.h>
diff --git a/mail/xc-mail/files/patch-ad b/mail/xc-mail/files/patch-ad
deleted file mode 100644
index e770067308cb..000000000000
--- a/mail/xc-mail/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sendmail.cxx.orig	Sat Sep  9 14:45:54 2000
-+++ src/sendmail.cxx	Mon Oct  2 00:07:59 2000
-@@ -101,7 +101,7 @@
- 		::send(sockfd,b,len,0);
- //		alarm(0);
- 	}
--	fcntl(sockfd,F_SETFL,O_SYNC);
-+	fcntl(sockfd,F_SETFL,O_FSYNC);
- 	return r;
- }
- int sendmail::RCPT(void)
diff --git a/mail/xc-mail/pkg-descr b/mail/xc-mail/pkg-descr
index e4d33ee0cfb5..ec6c0bb113ee 100644
--- a/mail/xc-mail/pkg-descr
+++ b/mail/xc-mail/pkg-descr
@@ -6,7 +6,7 @@ history so mail which is left on the POP server but deleted on the
 client is only downloaded once.  XCmail has RFC 2015-compliant
 support for encrypted mail in multipart MIME format.
 
-WWW:  http://www.fsai.fh-trier.de/~schmitzj/Xclasses/XCmail/
+WWW:  http://www.js-home.org/XCmail/
 
 Trevor Johnson
 trevor@freebsd.org
diff --git a/mail/xc-mail/pkg-plist b/mail/xc-mail/pkg-plist
index 9add1aeff35a..523d85f59cab 100644
--- a/mail/xc-mail/pkg-plist
+++ b/mail/xc-mail/pkg-plist
@@ -1,15 +1,14 @@
 XCmail/converters/elm2xcmail
 XCmail/converters/ns2xcmail
-XCmail/plugins/babelfish_pl.o
 XCmail/plugins/binhex_encoding_pl.o
 XCmail/plugins/check_new_release_pl.o
+XCmail/plugins/dateresend_pl.o
 XCmail/plugins/dictionary_pl.o
 XCmail/plugins/js_code_pl.o
 XCmail/plugins/mhstyle_pl.o
 XCmail/plugins/rot13_encoding_pl.o
 XCmail/plugins/search_pl.o
 XCmail/plugins/simple_filter_pl.o
-XCmail/plugins/spam_bouncer_pl.o
 XCmail/plugins/test_pl.o
 XCmail/plugins/trashmgr_pl.o
 bin/xc-mail