Bug 172242

Summary: mail/popfile: Update to vesion 1.1.3
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: Marcelo Araujo <araujo>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
mail_popfile.diff.gz
none
mail_popfile.diff.gz
none
newpatch none

Description tkato432 2012-10-01 19:10:12 UTC 
- Update to vesion 1.1.3
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-10-01 19:12:33 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 Baptiste Daroussin freebsd_committer freebsd_triage 2012-10-29 09:41:31 UTC 
Responsible Changed
From-To: miwi->freebsd-ports-bugs

Reassign to the heap miwi being overloaded for now
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2012-11-02 13:26:14 UTC 
State Changed
From-To: open->feedback

Patch rejects on current tree
Comment 4 tkato432 2012-11-02 18:00:00 UTC 
Remake of the patch against current tree.
Comment 5 martin.dieringer 2012-11-27 21:55:01 UTC 
This patch is quite old. Can't it be committed?
Comment 6 Marcelo Araujo freebsd_committer freebsd_triage 2012-12-11 13:01:53 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->araujo

I'll take it.
Comment 7 Marcelo Araujo freebsd_committer freebsd_triage 2012-12-14 08:08:11 UTC 
State Changed
From-To: feedback->analyzed

Please send the patch once again.
Comment 8 martin.dieringer 2012-12-17 01:35:20 UTC 
and another one...

--- popfile-1.1.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/popfile/Makefile ./Makefile
--- /usr/ports/mail/popfile/Makefile	2012-12-16 07:16:56.000000000 +0100
+++ ./Makefile	2012-12-17 02:34:03.351022329 +0100
@@ -6,89 +6,83 @@
 #
 
 PORTNAME=	popfile
-PORTVERSION=	1.1.1
-#PORTREVISION=	0
+PORTVERSION=	1.1.3
 CATEGORIES=	mail
-MASTER_SITES=	http://getpopfile.org/downloads/
+MASTER_SITES=	http://getpopfile.org/downloads/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. archive
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatic mail classification tool, acts as a POP3 proxy
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+
+OPTIONS_DEFINE=	SSL XMLRPC UPGRADE_FROM_0_20 KAKASI MECABU
+SSL_DESC=	\
+	Depend SSL libraries/modules to use SSL connection to the servers
+XMLRPC_DESC=	\
+	Depend SOAP libraries to use POPFile as XMLRPC server
+UPGRADE_FROM_0_20_DESC=	\
+	Depend BerkeleyDB libraries to upgrade old POPFile corpus
+KAKASI_DESC=	\
+	Depend Kakasi library to handle Japanese text
+MECABU_DESC=	\
+	Depend MeCab library to handle Japanese text
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 USE_ZIP=	yes
 USE_PERL5_RUN=	yes
 
-START_SCRIPTS_SUB= DATADIR=${DATADIR}
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_POPFILE_SSL)
+.if ${PORT_OPTIONS:MSSL}
 # 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
+RUN_DEPENDS+=	p5-IO-Socket-SSL>=1.07:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
-.if defined(WITH_POPFILE_XMLRPC)
-RUN_DEPENDS+=  p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+.if ${PORT_OPTIONS:MXMLRPC}
+RUN_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
 .endif
 
-.if defined(WITH_POPFILE_SOCKS)
+#.if ${PORT_OPTIONS:MSOCKS}
 # XXX: IO::Socket::Socks should be listed here but no ports yet. For those
 # interested, check http://search.cpan.org/~reatmon/IO-Socket-Socks-0.1/.
-.endif
+#.endif
 
-.if defined(WITH_POPFILE_UPGRADE_FROM_0_20)
+.if ${PORT_OPTIONS:MUPGRADE_FROM_0_20}
 RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
 .endif
 
-.if defined(WITH_POPFILE_JAPANESE)
-# For backward compatibility; popfile 0.x supports Kakasi only.
-WITH_POPFILE_KAKASI=YES
-.endif
-.if defined(WITH_POPFILE_KAKASI)
+.if ${PORT_OPTIONS:MKAKASI}
 RUN_DEPENDS+=	p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi
 .endif
-.if defined(WITH_POPFILE_MECAB)
+
+.if ${PORT_OPTIONS:MMECAB}
 RUN_DEPENDS+=	p5-MeCab>=0:${PORTSDIR}/japanese/p5-MeCab
 .endif
 
-pre-fetch:
-	@${ECHO_CMD} "This port has some compile-time options:"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   * make WITH_POPFILE_SSL=YES"
-	@${ECHO_CMD} "        Depend SSL libraries/modules to use SSL connection to the servers."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   * make WITH_POPFILE_XMLRPC=YES"
-	@${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} "        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_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
-	${REINPLACE_CMD} -i '' -e "s,^#!/usr/bin/perl
$$,#!${PERL}," ${WRKSRC}/popfile.pl
-	${FIND} ${PATCH_WRKSRC} -name '*.orig' -delete
+	@${REINPLACE_CMD} -e \
+		's|^#!/usr/bin/perl$$|#!${PERL}|' ${WRKSRC}/popfile.pl
+	@${SED} 's|%%DATADIR%%|${DATADIR}|' \
+		< ${FILESDIR}/popfile.sh > ${WRKDIR}/popfile.sh
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/* ${DATADIR}
-	@${SED} ${START_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/popfile.sh > ${WRKDIR}/popfile.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/popfile.sh ${PREFIX}/sbin
-	${RM} ${WRKDIR}/popfile.sh
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} *.pl ${DATADIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} \
+		stopwords *.change* *.gif *.ico *.pck *.png ${DATADIR})
+.for i in Classifier POPFile Proxy Services UI languages skins
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${DATADIR})
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/popfile/Makefile~ ./Makefile~
--- /usr/ports/mail/popfile/Makefile~	1970-01-01 01:00:00.000000000 +0100
+++ ./Makefile~	2012-12-17 02:33:47.000000000 +0100
@@ -0,0 +1,89 @@
+# New ports collection makefile for:	popfile
+# Date created:		22 Feb 2004
+# Whom:			matusita@FreeBSD.org
+#
+# $FreeBSD: ports/mail/popfile/Makefile,v 1.27 2012/12/16 06:16:56 svnexp Exp $
+#
+
+PORTNAME=	popfile
+PORTVERSION=	1.1.3
+CATEGORIES=	mail
+MASTER_SITES=	http://getpopfile.org/downloads/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. archive
+DIST_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Automatic mail classification tool, acts as a POP3 proxy
+
+LICENSE=	GPLv2
+
+RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
+		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+
+OPTIONS_DEFINE=	SSL XMLRPC UPGRADE_FROM_0_20 KAKASI MECABU
+SSL_DESC=	\
+	Depend SSL libraries/modules to use SSL connection to the servers
+XMLRPC_DESC=	\
+	Depend SOAP libraries to use POPFile as XMLRPC server
+UPGRADE_FROM_0_20_DESC=	\
+	Depend BerkeleyDB libraries to upgrade old POPFile corpus
+KAKASI_DESC=	\
+	Depend Kakasi library to handle Japanese text
+MECABU_DESC=	\
+	Depend MeCab library to handle Japanese text
+
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+USE_ZIP=	yes
+USE_PERL5_RUN=	yes
+
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSSL}
+# 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 ${PORT_OPTIONS:MXMLRPC}
+RUN_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+.endif
+
+#.if ${PORT_OPTIONS:MSOCKS}
+# XXX: IO::Socket::Socks should be listed here but no ports yet. For those
+# interested, check http://search.cpan.org/~reatmon/IO-Socket-Socks-0.1/.
+#.endif
+
+.if ${PORT_OPTIONS:MUPGRADE_FROM_0_20}
+RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+.endif
+
+
+.if ${PORT_OPTIONS:MKAKASI}
+RUN_DEPENDS+=	p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi
+.endif
+
+.if ${PORT_OPTIONS:MMECAB}
+RUN_DEPENDS+=	p5-MeCab>=0:${PORTSDIR}/japanese/p5-MeCab
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^#!/usr/bin/perl$$|#!${PERL}|' ${WRKSRC}/popfile.pl
+	@${SED} 's|%%DATADIR%%|${DATADIR}|' \
+		< ${FILESDIR}/popfile.sh > ${WRKDIR}/popfile.sh
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/popfile.sh ${PREFIX}/sbin
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} *.pl ${DATADIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} \
+		stopwords *.change* *.gif *.ico *.pck *.png ${DATADIR})
+.for i in Classifier POPFile Proxy Services UI languages skins
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${DATADIR})
+.endfor
+
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/popfile/distinfo ./distinfo
--- /usr/ports/mail/popfile/distinfo	2011-07-03 15:53:25.000000000 +0200
+++ ./distinfo	2012-12-17 02:16:09.381384282 +0100
@@ -1,2 +1,2 @@
-SHA256 (popfile/popfile-1.1.1.zip) = 4c54d8fd483c248a2208cdd2dbe1f4f4a0b79b974f24977ae694482b56f4d0f4
-SIZE (popfile/popfile-1.1.1.zip) = 535334
+SHA256 (popfile/popfile-1.1.3.zip) = d197a187fbdaaf655f7eefceb969e0944cb4d5d290c0aba419b132797dfd6c54
+SIZE (popfile/popfile-1.1.3.zip) = 523431
diff -ruN --exclude=CVS /usr/ports/mail/popfile/pkg-descr ./pkg-descr
--- /usr/ports/mail/popfile/pkg-descr	2004-03-17 14:47:27.000000000 +0100
+++ ./pkg-descr	2012-12-17 02:16:09.386173652 +0100
@@ -1,14 +1,14 @@
-POPFile is an automatic mail classification tool. Once properly set up and
-trained, it will scan all email as it arrives and classify it based on your
-training. You can give it a simple job, like separating out junk e-mail, or
-a complicated one -- like filing mail into a dozen folders. Think of it as a
-personal assistant for your inbox. 
+POPFile is an automatic mail classification tool. Once properly set up
+and trained, it will scan all email as it arrives and classify it based
+on your training. You can give it a simple job, like separating out junk
+e-mail, or a complicated one -- like filing mail into a dozen folders.
+Think of it as a personal assistant for your inbox.
 
 Since v0.21.0, POPFile supports multiple user with a single instance.
-Using ${LOCALDIR}/sbin/popfile.sh, you can start your own POPFile easily;
-it uses ${HOME}/.popfile as a working directory.
+Using ${LOCALDIR}/sbin/popfile.sh, you can start your own POPFile
+easily; it uses ${HOME}/.popfile as a working directory.
 
-Note for old POPFile users: copy messages/ and corpus/ directory to
-your ${HOME}/.popfile directory (if not, create it), then start popfile.sh.
+Note for old POPFile users: copy messages/ and corpus/ directory to your
+${HOME}/.popfile directory (if not, create it), then start popfile.sh.
 
-WWW: http://popfile.sourceforge.net/
+WWW: http://getpopfile.org/
diff -ruN --exclude=CVS /usr/ports/mail/popfile/pkg-plist ./pkg-plist
--- /usr/ports/mail/popfile/pkg-plist	2008-05-27 06:46:46.000000000 +0200
+++ ./pkg-plist	2012-12-17 02:16:09.386173652 +0100
@@ -56,7 +56,6 @@
 %%DATADIR%%/languages/Svenska.msg
 %%DATADIR%%/languages/Turkce.msg
 %%DATADIR%%/languages/Ukrainian.msg
-%%DATADIR%%/license
 %%DATADIR%%/otto.gif
 %%DATADIR%%/otto.png
 %%DATADIR%%/pipe.pl
@@ -143,19 +142,6 @@
 %%DATADIR%%/skins/osx/style.css
 %%DATADIR%%/skins/outlook/style.css
 %%DATADIR%%/skins/simplyblue/style.css
-%%DATADIR%%/skins/sleet-rtl/bottom.gif
-%%DATADIR%%/skins/sleet-rtl/bottomLeft.gif
-%%DATADIR%%/skins/sleet-rtl/bottomRight.gif
-%%DATADIR%%/skins/sleet-rtl/button.gif
-%%DATADIR%%/skins/sleet-rtl/button2.gif
-%%DATADIR%%/skins/sleet-rtl/left.gif
-%%DATADIR%%/skins/sleet-rtl/menu.gif
-%%DATADIR%%/skins/sleet-rtl/menuButton.gif
-%%DATADIR%%/skins/sleet-rtl/right.gif
-%%DATADIR%%/skins/sleet-rtl/style.css
-%%DATADIR%%/skins/sleet-rtl/top.gif
-%%DATADIR%%/skins/sleet-rtl/topLeft.gif
-%%DATADIR%%/skins/sleet-rtl/topRight.gif
 %%DATADIR%%/skins/sleet/bottom.gif
 %%DATADIR%%/skins/sleet/bottomLeft.gif
 %%DATADIR%%/skins/sleet/bottomRight.gif
@@ -169,6 +155,19 @@
 %%DATADIR%%/skins/sleet/top.gif
 %%DATADIR%%/skins/sleet/topLeft.gif
 %%DATADIR%%/skins/sleet/topRight.gif
+%%DATADIR%%/skins/sleet-rtl/bottom.gif
+%%DATADIR%%/skins/sleet-rtl/bottomLeft.gif
+%%DATADIR%%/skins/sleet-rtl/bottomRight.gif
+%%DATADIR%%/skins/sleet-rtl/button.gif
+%%DATADIR%%/skins/sleet-rtl/button2.gif
+%%DATADIR%%/skins/sleet-rtl/left.gif
+%%DATADIR%%/skins/sleet-rtl/menu.gif
+%%DATADIR%%/skins/sleet-rtl/menuButton.gif
+%%DATADIR%%/skins/sleet-rtl/right.gif
+%%DATADIR%%/skins/sleet-rtl/style.css
+%%DATADIR%%/skins/sleet-rtl/top.gif
+%%DATADIR%%/skins/sleet-rtl/topLeft.gif
+%%DATADIR%%/skins/sleet-rtl/topRight.gif
 %%DATADIR%%/skins/smalldefault/style.css
 %%DATADIR%%/skins/smallgrey/style.css
 %%DATADIR%%/skins/strawberryrose/style.css
@@ -176,8 +175,8 @@
 %%DATADIR%%/skins/white/style.css
 %%DATADIR%%/skins/windows/style.css
 %%DATADIR%%/stopwords
-%%DATADIR%%/v%%PORTVERSION%%.change
-%%DATADIR%%/v%%PORTVERSION%%.change.nihongo
+%%DATADIR%%/v%%VERSION%%.change
+%%DATADIR%%/v%%VERSION%%.change.nihongo
 @dirrm %%DATADIR%%/skins/windows
 @dirrm %%DATADIR%%/skins/white
 @dirrm %%DATADIR%%/skins/tinygrey
--- popfile-1.1.3.patch ends here ---
Comment 9 Marcelo Araujo freebsd_committer freebsd_triage 2012-12-17 03:06:56 UTC 
State Changed
From-To: analyzed->feedback

Please fix the last patch, it cannot apply clean.
Comment 10 martin.dieringer 2012-12-17 11:16:59 UTC 
sorry. 


--- popfile-1.1.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/popfile/Makefile ./Makefile
--- /usr/ports/mail/popfile/Makefile	2012-12-16 07:16:56.000000000 +0100
+++ ./Makefile	2012-12-17 12:13:18.816060698 +0100
@@ -6,89 +6,83 @@
 #
 
 PORTNAME=	popfile
-PORTVERSION=	1.1.1
-#PORTREVISION=	0
+PORTVERSION=	1.1.3
 CATEGORIES=	mail
-MASTER_SITES=	http://getpopfile.org/downloads/
+MASTER_SITES=	http://getpopfile.org/downloads/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. archive
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatic mail classification tool, acts as a POP3 proxy
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
+
+OPTIONS_DEFINE=	SSL XMLRPC UPGRADE_FROM_0_20 KAKASI MECABU
+SSL_DESC=	\
+	Depend SSL libraries/modules to use SSL connection to the servers
+XMLRPC_DESC=	\
+	Depend SOAP libraries to use POPFile as XMLRPC server
+UPGRADE_FROM_0_20_DESC=	\
+	Depend BerkeleyDB libraries to upgrade old POPFile corpus
+KAKASI_DESC=	\
+	Depend Kakasi library to handle Japanese text
+MECABU_DESC=	\
+	Depend MeCab library to handle Japanese text
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 USE_ZIP=	yes
 USE_PERL5_RUN=	yes
 
-START_SCRIPTS_SUB= DATADIR=${DATADIR}
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_POPFILE_SSL)
+.if ${PORT_OPTIONS:MSSL}
 # 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
+RUN_DEPENDS+=	p5-IO-Socket-SSL>=1.07:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
-.if defined(WITH_POPFILE_XMLRPC)
-RUN_DEPENDS+=  p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+.if ${PORT_OPTIONS:MXMLRPC}
+RUN_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
 .endif
 
-.if defined(WITH_POPFILE_SOCKS)
+#.if ${PORT_OPTIONS:MSOCKS}
 # XXX: IO::Socket::Socks should be listed here but no ports yet. For those
 # interested, check http://search.cpan.org/~reatmon/IO-Socket-Socks-0.1/.
-.endif
+#.endif
 
-.if defined(WITH_POPFILE_UPGRADE_FROM_0_20)
+.if ${PORT_OPTIONS:MUPGRADE_FROM_0_20}
 RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
 .endif
 
-.if defined(WITH_POPFILE_JAPANESE)
-# For backward compatibility; popfile 0.x supports Kakasi only.
-WITH_POPFILE_KAKASI=YES
-.endif
-.if defined(WITH_POPFILE_KAKASI)
+.if ${PORT_OPTIONS:MKAKASI}
 RUN_DEPENDS+=	p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi
 .endif
-.if defined(WITH_POPFILE_MECAB)
+
+.if ${PORT_OPTIONS:MMECAB}
 RUN_DEPENDS+=	p5-MeCab>=0:${PORTSDIR}/japanese/p5-MeCab
 .endif
 
-pre-fetch:
-	@${ECHO_CMD} "This port has some compile-time options:"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   * make WITH_POPFILE_SSL=YES"
-	@${ECHO_CMD} "        Depend SSL libraries/modules to use SSL connection to the servers."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   * make WITH_POPFILE_XMLRPC=YES"
-	@${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} "        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_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
-	${REINPLACE_CMD} -i '' -e "s,^#!/usr/bin/perl
$$,#!${PERL}," ${WRKSRC}/popfile.pl
-	${FIND} ${PATCH_WRKSRC} -name '*.orig' -delete
+	@${REINPLACE_CMD} -e \
+		's|^#!/usr/bin/perl$$|#!${PERL}|' ${WRKSRC}/popfile.pl
+	@${SED} 's|%%DATADIR%%|${DATADIR}|' \
+		< ${FILESDIR}/popfile.sh > ${WRKDIR}/popfile.sh
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/* ${DATADIR}
-	@${SED} ${START_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/popfile.sh > ${WRKDIR}/popfile.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/popfile.sh ${PREFIX}/sbin
-	${RM} ${WRKDIR}/popfile.sh
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} *.pl ${DATADIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} \
+		stopwords *.change* *.gif *.ico *.pck *.png ${DATADIR})
+.for i in Classifier POPFile Proxy Services UI languages skins
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${DATADIR})
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/popfile/distinfo ./distinfo
--- /usr/ports/mail/popfile/distinfo	2011-07-03 15:53:25.000000000 +0200
+++ ./distinfo	2012-12-17 12:13:18.826008253 +0100
@@ -1,2 +1,2 @@
-SHA256 (popfile/popfile-1.1.1.zip) = 4c54d8fd483c248a2208cdd2dbe1f4f4a0b79b974f24977ae694482b56f4d0f4
-SIZE (popfile/popfile-1.1.1.zip) = 535334
+SHA256 (popfile/popfile-1.1.3.zip) = d197a187fbdaaf655f7eefceb969e0944cb4d5d290c0aba419b132797dfd6c54
+SIZE (popfile/popfile-1.1.3.zip) = 523431
diff -ruN --exclude=CVS /usr/ports/mail/popfile/pkg-descr ./pkg-descr
--- /usr/ports/mail/popfile/pkg-descr	2004-03-17 14:47:27.000000000 +0100
+++ ./pkg-descr	2012-12-17 12:13:18.830978983 +0100
@@ -1,14 +1,14 @@
-POPFile is an automatic mail classification tool. Once properly set up and
-trained, it will scan all email as it arrives and classify it based on your
-training. You can give it a simple job, like separating out junk e-mail, or
-a complicated one -- like filing mail into a dozen folders. Think of it as a
-personal assistant for your inbox. 
+POPFile is an automatic mail classification tool. Once properly set up
+and trained, it will scan all email as it arrives and classify it based
+on your training. You can give it a simple job, like separating out junk
+e-mail, or a complicated one -- like filing mail into a dozen folders.
+Think of it as a personal assistant for your inbox.
 
 Since v0.21.0, POPFile supports multiple user with a single instance.
-Using ${LOCALDIR}/sbin/popfile.sh, you can start your own POPFile easily;
-it uses ${HOME}/.popfile as a working directory.
+Using ${LOCALDIR}/sbin/popfile.sh, you can start your own POPFile
+easily; it uses ${HOME}/.popfile as a working directory.
 
-Note for old POPFile users: copy messages/ and corpus/ directory to
-your ${HOME}/.popfile directory (if not, create it), then start popfile.sh.
+Note for old POPFile users: copy messages/ and corpus/ directory to your
+${HOME}/.popfile directory (if not, create it), then start popfile.sh.
 
-WWW: http://popfile.sourceforge.net/
+WWW: http://getpopfile.org/
diff -ruN --exclude=CVS /usr/ports/mail/popfile/pkg-plist ./pkg-plist
--- /usr/ports/mail/popfile/pkg-plist	2008-05-27 06:46:46.000000000 +0200
+++ ./pkg-plist	2012-12-17 12:13:18.830978983 +0100
@@ -56,7 +56,6 @@
 %%DATADIR%%/languages/Svenska.msg
 %%DATADIR%%/languages/Turkce.msg
 %%DATADIR%%/languages/Ukrainian.msg
-%%DATADIR%%/license
 %%DATADIR%%/otto.gif
 %%DATADIR%%/otto.png
 %%DATADIR%%/pipe.pl
@@ -143,19 +142,6 @@
 %%DATADIR%%/skins/osx/style.css
 %%DATADIR%%/skins/outlook/style.css
 %%DATADIR%%/skins/simplyblue/style.css
-%%DATADIR%%/skins/sleet-rtl/bottom.gif
-%%DATADIR%%/skins/sleet-rtl/bottomLeft.gif
-%%DATADIR%%/skins/sleet-rtl/bottomRight.gif
-%%DATADIR%%/skins/sleet-rtl/button.gif
-%%DATADIR%%/skins/sleet-rtl/button2.gif
-%%DATADIR%%/skins/sleet-rtl/left.gif
-%%DATADIR%%/skins/sleet-rtl/menu.gif
-%%DATADIR%%/skins/sleet-rtl/menuButton.gif
-%%DATADIR%%/skins/sleet-rtl/right.gif
-%%DATADIR%%/skins/sleet-rtl/style.css
-%%DATADIR%%/skins/sleet-rtl/top.gif
-%%DATADIR%%/skins/sleet-rtl/topLeft.gif
-%%DATADIR%%/skins/sleet-rtl/topRight.gif
 %%DATADIR%%/skins/sleet/bottom.gif
 %%DATADIR%%/skins/sleet/bottomLeft.gif
 %%DATADIR%%/skins/sleet/bottomRight.gif
@@ -169,6 +155,19 @@
 %%DATADIR%%/skins/sleet/top.gif
 %%DATADIR%%/skins/sleet/topLeft.gif
 %%DATADIR%%/skins/sleet/topRight.gif
+%%DATADIR%%/skins/sleet-rtl/bottom.gif
+%%DATADIR%%/skins/sleet-rtl/bottomLeft.gif
+%%DATADIR%%/skins/sleet-rtl/bottomRight.gif
+%%DATADIR%%/skins/sleet-rtl/button.gif
+%%DATADIR%%/skins/sleet-rtl/button2.gif
+%%DATADIR%%/skins/sleet-rtl/left.gif
+%%DATADIR%%/skins/sleet-rtl/menu.gif
+%%DATADIR%%/skins/sleet-rtl/menuButton.gif
+%%DATADIR%%/skins/sleet-rtl/right.gif
+%%DATADIR%%/skins/sleet-rtl/style.css
+%%DATADIR%%/skins/sleet-rtl/top.gif
+%%DATADIR%%/skins/sleet-rtl/topLeft.gif
+%%DATADIR%%/skins/sleet-rtl/topRight.gif
 %%DATADIR%%/skins/smalldefault/style.css
 %%DATADIR%%/skins/smallgrey/style.css
 %%DATADIR%%/skins/strawberryrose/style.css
@@ -176,8 +175,8 @@
 %%DATADIR%%/skins/white/style.css
 %%DATADIR%%/skins/windows/style.css
 %%DATADIR%%/stopwords
-%%DATADIR%%/v%%PORTVERSION%%.change
-%%DATADIR%%/v%%PORTVERSION%%.change.nihongo
+%%DATADIR%%/v%%VERSION%%.change
+%%DATADIR%%/v%%VERSION%%.change.nihongo
 @dirrm %%DATADIR%%/skins/windows
 @dirrm %%DATADIR%%/skins/white
 @dirrm %%DATADIR%%/skins/tinygrey
--- popfile-1.1.3.patch ends here ---
Comment 11 tkato432 2012-12-23 17:58:32 UTC 
Remake of the patch against current tree.
Comment 12 martin.dieringer 2013-01-03 13:04:38 UTC 
could you please submit readable patches?
Comment 13 martin.dieringer 2013-01-11 11:30:00 UTC 
another one?
Comment 14 Marcelo Araujo freebsd_committer freebsd_triage 2013-01-18 06:32:05 UTC 
State Changed
From-To: feedback->closed

Impossible to verify the patch.