3 files changed, 28 insertions, 38 deletions

diff --git a/mail/popfile/Makefile b/mail/popfile/Makefile
index f816734264cf..72492014c796 100644
--- a/mail/popfile/Makefile
+++ b/mail/popfile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	popfile
-PORTVERSION=	0.22.5
+PORTVERSION=	1.0.0
 #PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -26,7 +26,7 @@ NO_WRKSUBDIR=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 USE_ZIP=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5_RUN=	5.8.0+
 
 START_SCRIPTS_SUB= DATADIR=${DATADIR}
 
@@ -51,17 +51,14 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-B
 .endif
 
 .if defined(WITH_POPFILE_JAPANESE)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Text/Kakasi.pm:${PORTSDIR}/japanese/p5-Text-Kakasi
+# For backward compatibility; popfile 0.x supports Kakasi only.
+WITH_POPFILE_KAKASI=YES
 .endif
-
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-.if defined(WITH_POPFILE_JAPANESE)
-RUN_DEPENDS+=	${SITE_PERL}/jcode.pl:${PORTSDIR}/japanese/p5-jcode.pl
-PATCH_SITES+=	http://home.jp.FreeBSD.org/~matusita/distfiles/
-PATCHFILES+=	popfile-${PORTVERSION}-use-jcode.pl.patch
+.if defined(WITH_POPFILE_KAKASI)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Text/Kakasi.pm:${PORTSDIR}/japanese/p5-Text-Kakasi
 .endif
+.if defined(WITH_POPFILE_MECAB)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MeCab.pm:${PORTSDIR}/japanese/p5-MeCab
 .endif
 
 pre-fetch:
@@ -77,14 +74,10 @@ pre-fetch:
 	@${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} "        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} "        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
+	@${ECHO_CMD} "   * make WITH_POPFILE_KAKASI=YES"
+	@${ECHO_CMD} "        Depend Kakasi library to handle Japanese text."
+	@${ECHO_CMD} "   * make WITH_POPFILE_MECAB=YES"
+	@${ECHO_CMD} "        Depend MeCab library to handle Japanese text."
 
 post-patch:
 	${CHMOD} +x ${WRKSRC}/popfile.pl
diff --git a/mail/popfile/distinfo b/mail/popfile/distinfo
index aaff9c9a3c5d..8a95238cf3d9 100644
--- a/mail/popfile/distinfo
+++ b/mail/popfile/distinfo
@@ -1,6 +1,3 @@
-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
+MD5 (popfile/popfile-1.0.0.zip) = cda5e55f934fcde1e4488375136b2e82
+SHA256 (popfile/popfile-1.0.0.zip) = e4be990ee826c02b98b000bd960749a16679e561d55144859413272aae9c41e2
+SIZE (popfile/popfile-1.0.0.zip) = 1627402
diff --git a/mail/popfile/pkg-plist b/mail/popfile/pkg-plist
index 61d43ece4a9d..e295a2d8a92d 100644
--- a/mail/popfile/pkg-plist
+++ b/mail/popfile/pkg-plist
@@ -17,6 +17,7 @@ sbin/popfile.sh
 %%DATADIR%%/Proxy/Proxy.pm
 %%DATADIR%%/Proxy/SMTP.pm
 %%DATADIR%%/Services/IMAP.pm
+%%DATADIR%%/Services/IMAP/Client.pm
 %%DATADIR%%/UI/HTML.pm
 %%DATADIR%%/UI/HTTP.pm
 %%DATADIR%%/UI/XMLRPC.pm
@@ -42,7 +43,6 @@ sbin/popfile.sh
 %%DATADIR%%/languages/Hellenic.msg
 %%DATADIR%%/languages/Hungarian.msg
 %%DATADIR%%/languages/Italiano.msg
-%%DATADIR%%/languages/Klingon.msg
 %%DATADIR%%/languages/Korean.msg
 %%DATADIR%%/languages/Nederlands.msg
 %%DATADIR%%/languages/Nihongo.msg
@@ -108,16 +108,19 @@ sbin/popfile.sh
 %%DATADIR%%/skins/coolblue/style.css
 %%DATADIR%%/skins/coolbrown/style.css
 %%DATADIR%%/skins/coolgreen/style.css
+%%DATADIR%%/skins/coolmint/style.css
 %%DATADIR%%/skins/coolorange/style.css
 %%DATADIR%%/skins/coolyellow/style.css
 %%DATADIR%%/skins/default/advanced-page.thtml
 %%DATADIR%%/skins/default/bar-chart-widget.thtml
 %%DATADIR%%/skins/default/bucket-page.thtml
 %%DATADIR%%/skins/default/common-bottom.thtml
+%%DATADIR%%/skins/default/common-javascript.thtml
 %%DATADIR%%/skins/default/common-middle.thtml
 %%DATADIR%%/skins/default/common-top.thtml
 %%DATADIR%%/skins/default/configuration-page.thtml
 %%DATADIR%%/skins/default/corpus-page.thtml
+%%DATADIR%%/skins/default/history-javascript.thtml
 %%DATADIR%%/skins/default/history-navigator-widget.thtml
 %%DATADIR%%/skins/default/history-page.thtml
 %%DATADIR%%/skins/default/history-search-filter-widget.thtml
@@ -155,7 +158,6 @@ sbin/popfile.sh
 %%DATADIR%%/skins/default/xmlrpc-port.thtml
 %%DATADIR%%/skins/glassblue/style.css
 %%DATADIR%%/skins/green/style.css
-%%DATADIR%%/skins/klingon/style.css
 %%DATADIR%%/skins/lavish/bottom.gif
 %%DATADIR%%/skins/lavish/bottomLeft.gif
 %%DATADIR%%/skins/lavish/bottomRight.gif
@@ -167,7 +169,11 @@ sbin/popfile.sh
 %%DATADIR%%/skins/lavish/top.gif
 %%DATADIR%%/skins/lavish/topLeft.gif
 %%DATADIR%%/skins/lavish/topRight.gif
-%%DATADIR%%/skins/lrclaptop/style.css
+%%DATADIR%%/skins/ocean/common-bottom.thtml
+%%DATADIR%%/skins/ocean/common-middle.thtml
+%%DATADIR%%/skins/ocean/history-page.thtml
+%%DATADIR%%/skins/ocean/style.css
+%%DATADIR%%/skins/ocean/view-page.thtml
 %%DATADIR%%/skins/oceanblue/common-bottom.thtml
 %%DATADIR%%/skins/oceanblue/common-middle.thtml
 %%DATADIR%%/skins/oceanblue/common-top.thtml
@@ -177,10 +183,6 @@ sbin/popfile.sh
 %%DATADIR%%/skins/orangecream/style.css
 %%DATADIR%%/skins/osx/style.css
 %%DATADIR%%/skins/outlook/style.css
-%%DATADIR%%/skins/prjbluegrey/style.css
-%%DATADIR%%/skins/prjsteelbeach/chipped_obsidian.gif
-%%DATADIR%%/skins/prjsteelbeach/metalback.gif
-%%DATADIR%%/skins/prjsteelbeach/style.css
 %%DATADIR%%/skins/simplyblue/style.css
 %%DATADIR%%/skins/sleet-rtl/bottom.gif
 %%DATADIR%%/skins/sleet-rtl/bottomLeft.gif
@@ -211,37 +213,34 @@ sbin/popfile.sh
 %%DATADIR%%/skins/smalldefault/style.css
 %%DATADIR%%/skins/smallgrey/style.css
 %%DATADIR%%/skins/strawberryrose/style.css
-%%DATADIR%%/skins/tinydefault/style.css
 %%DATADIR%%/skins/tinygrey/style.css
 %%DATADIR%%/skins/white/style.css
 %%DATADIR%%/skins/windows/style.css
 %%DATADIR%%/stopwords
 %%DATADIR%%/v%%PORTVERSION%%.change
+%%DATADIR%%/v%%PORTVERSION%%.change.nihongo
 @dirrm %%DATADIR%%/skins/windows
 @dirrm %%DATADIR%%/skins/white
 @dirrm %%DATADIR%%/skins/tinygrey
-@dirrm %%DATADIR%%/skins/tinydefault
 @dirrm %%DATADIR%%/skins/strawberryrose
 @dirrm %%DATADIR%%/skins/smallgrey
 @dirrm %%DATADIR%%/skins/smalldefault
 @dirrm %%DATADIR%%/skins/sleet-rtl
 @dirrm %%DATADIR%%/skins/sleet
 @dirrm %%DATADIR%%/skins/simplyblue
-@dirrm %%DATADIR%%/skins/prjsteelbeach
-@dirrm %%DATADIR%%/skins/prjbluegrey
 @dirrm %%DATADIR%%/skins/outlook
 @dirrm %%DATADIR%%/skins/osx
 @dirrm %%DATADIR%%/skins/orangecream
 @dirrm %%DATADIR%%/skins/orange
 @dirrm %%DATADIR%%/skins/oceanblue
-@dirrm %%DATADIR%%/skins/lrclaptop
+@dirrm %%DATADIR%%/skins/ocean
 @dirrm %%DATADIR%%/skins/lavish
-@dirrm %%DATADIR%%/skins/klingon
 @dirrm %%DATADIR%%/skins/green
 @dirrm %%DATADIR%%/skins/glassblue
 @dirrm %%DATADIR%%/skins/default
 @dirrm %%DATADIR%%/skins/coolyellow
 @dirrm %%DATADIR%%/skins/coolorange
+@dirrm %%DATADIR%%/skins/coolmint
 @dirrm %%DATADIR%%/skins/coolgreen
 @dirrm %%DATADIR%%/skins/coolbrown
 @dirrm %%DATADIR%%/skins/coolblue
@@ -251,6 +250,7 @@ sbin/popfile.sh
 @dirrm %%DATADIR%%/manual
 @dirrm %%DATADIR%%/languages
 @dirrm %%DATADIR%%/UI
+@dirrm %%DATADIR%%/Services/IMAP
 @dirrm %%DATADIR%%/Services
 @dirrm %%DATADIR%%/Proxy
 @dirrm %%DATADIR%%/POPFile