Update to 0.22.5. Also some cleanups on RUN_DEPENDS and messages.

3 files changed, 19 insertions, 43 deletions

diff --git a/mail/popfile/Makefile b/mail/popfile/Makefile
index cc5b01034c61..f816734264cf 100644
--- a/mail/popfile/Makefile
+++ b/mail/popfile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	popfile
-PORTVERSION=	0.22.4
+PORTVERSION=	0.22.5
 #PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -16,8 +16,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=Automatic mail classification tool, acts as a POP3 proxy
 
-# Use DBD::SQLite2 since POPFile doesn't support SQLite 1.x.
-# See also files/patch-Bayes.pm.
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite2.pm:${PORTSDIR}/databases/p5-DBD-SQLite2 \
 		${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
 		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
@@ -35,9 +33,8 @@ START_SCRIPTS_SUB= DATADIR=${DATADIR}
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_POPFILE_SSL)
-# POPFile v0.22.4 works with IO::Socket::SSL version 0.96 but not 0.97.
-#RUN_DEPENDS+=  ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
-IGNORE=		does not work with IO::Socket::SSL version 0.97
+# POPFile works with IO::Socket::SSL version 1.07 (and not 0.97/0.99).
+RUN_DEPENDS+=  p5-IO-Socket-SSL>=1.07:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
 .if defined(WITH_POPFILE_XMLRPC)
@@ -68,35 +65,25 @@ PATCHFILES+=	popfile-${PORTVERSION}-use-jcode.pl.patch
 .endif
 
 pre-fetch:
-	@${ECHO_CMD} "This port has some compile options:"
+	@${ECHO_CMD} "This port has some compile-time options:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   * make WITH_POPFILE_SSL=YES"
-	@${ECHO_CMD} "        POPFile supports SSL for all proxy protocols.  You may use SSL"
-	@${ECHO_CMD} "        protocol to connect an actual servers.  Note that this does NOT"
-	@${ECHO_CMD} "        enable POPFile to accept SSL connection from clients.  Enable
-	@${ECHO_CMD} "        this option to install net/p5-SOAP-Lite."
+	@${ECHO_CMD} "        Depend SSL libraries/modules to use SSL connection to the servers."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   * make WITH_POPFILE_XMLRPC=YES"
-	@${ECHO_CMD} "        Your program may communicate to POPFile via XMLRPC or SOAP."
-	@${ECHO_CMD} "        Note that POPFile acts as a server, no client implementation is"
-	@${ECHO_CMD} "        provided; you have to have your own client by yourself.  Enable"
-	@${ECHO_CMD} "        this option to install net/p5-SOAP-Lite."
+	@${ECHO_CMD} "        Depend SOAP libraries to use POPFile as XMLRPC server."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   * make WITH_POPFILE_UPGRADE_FROM_0_20=YES"
-	@${ECHO_CMD} "        Since v0.21.0, The corpus format Is changed from BerkeleyDB to."
-	@${ECHO_CMD} "        SQLite.  If you have old (v0.20.1 or before) corpus and upgrade to"
-	@${ECHO_CMD} "        new POPFile, enable this option to install databases/p5-BerkeleyDB"
-	@${ECHO_CMD} "        for upgrading your corpus.  Note that once you have converted to"
-	@${ECHO_CMD} "        new SQLite corpus, you do not need this option next time."
+	@${ECHO_CMD} "        Depend BerkeleyDB libraries to upgrade old POPFile corpus."
+	@${ECHO_CMD} "        This option is required only for upgrading POPFile 0.20.1 or before."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   * make WITH_POPFILE_JAPANESE=YES"
-	@${ECHO_CMD} "        Even though POPFile supports Japanese help messages, parsing"
-	@${ECHO_CMD} "        Japanese email is not supported by POPFile itself, but by KAKASI"
-	@${ECHO_CMD} "        (Kanji Kana Simple Inverter.)  If you need Japanese email support,"
-	@${ECHO_CMD} "        enable this option to install japanese/p5-Text-Kakasi."
+	@${ECHO_CMD} "        Depend libraries to handle email that is written in Japanese."
+	@${ECHO_CMD} "        Note that UI menus in Japanese is supported by default."
 .if ${PERL_LEVEL} < 500800
-	@${ECHO_CMD} "        If you still using perl 5.6 or before, a hacky patch (use jcode.pl"
-	@${ECHO_CMD} "        instead of Encode::from_to) is applied for using POPFile."
+	@${ECHO_CMD} "        For perl 5.6 users: Since POPFile uses Encode module to convert email"
+	@${ECHO_CMD} "        texts that are not available on perl 5.6, a local patch is"
+	@${ECHO_CMD} "        applied to this ports (uses jcode.pl for conversion)."
 .endif
 
 post-patch:
diff --git a/mail/popfile/distinfo b/mail/popfile/distinfo
index f5b94c4d1d0b..aaff9c9a3c5d 100644
--- a/mail/popfile/distinfo
+++ b/mail/popfile/distinfo
@@ -1,6 +1,6 @@
-MD5 (popfile/popfile-0.22.4.zip) = 3261686efd19835e131ac9fe0b63346d
-SHA256 (popfile/popfile-0.22.4.zip) = 22bde2f4271eccce4c572436f15b13caa6547f442fd512ce04d89c43c783a906
-SIZE (popfile/popfile-0.22.4.zip) = 1644941
-MD5 (popfile/popfile-0.22.4-use-jcode.pl.patch) = 8f8cfe8a7043eb8bff43f4d794d5762c
-SHA256 (popfile/popfile-0.22.4-use-jcode.pl.patch) = 90d2ab090b4d9ef659171fce40301bf9d49d3226b0668680e31603319fc822c8
-SIZE (popfile/popfile-0.22.4-use-jcode.pl.patch) = 2876
+MD5 (popfile/popfile-0.22.5.zip) = e1fc54d38ad77873674923ff67cae520
+SHA256 (popfile/popfile-0.22.5.zip) = 6a8df62cfdeb2294972ea7dc2b5e09c330b81ec8785df36321f445cc65d99292
+SIZE (popfile/popfile-0.22.5.zip) = 1645171
+MD5 (popfile/popfile-0.22.5-use-jcode.pl.patch) = 19179a75e02589f73d85e1597aee9a9e
+SHA256 (popfile/popfile-0.22.5-use-jcode.pl.patch) = f00170671a9f038ff423c81aa593940be8a1a5563681c7e4182078ddc8012393
+SIZE (popfile/popfile-0.22.5-use-jcode.pl.patch) = 2625
diff --git a/mail/popfile/files/patch-Bayes.pm b/mail/popfile/files/patch-Bayes.pm
deleted file mode 100644
index dcfd65aaa3cf..000000000000
--- a/mail/popfile/files/patch-Bayes.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- Classifier/Bayes.pm.orig	Wed Dec 15 19:48:24 2004
-+++ Classifier/Bayes.pm	Mon Dec 20 23:27:16 2004
-@@ -218,7 +218,7 @@
-     # $dbname can be used within it and it resolves to the full path
-     # to the database named in the database parameter above.
- 
--    $self->config_( 'dbconnect', 'dbi:SQLite:dbname=$dbname' );
-+    $self->config_( 'dbconnect', 'dbi:SQLite2:dbname=$dbname' );
-     $self->config_( 'dbuser', '' ); $self->config_( 'dbauth', '' );
- 
-     # SQLite 1.05+ have some problems we are resolving.  This lets us