- Update to 1.255

- Use bundled Mail::IMAPClient instead of the one in ports which is too new

PR:		ports/125462
Submitted by:	Jim Riggs <ports@christianserving.org> (maintainer)

3 files changed, 59 insertions, 15 deletions

diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index 694f29a5ce28..bbe85abbf261 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -6,32 +6,52 @@
 #
 
 PORTNAME=	imapsync
-PORTVERSION=	1.252
+PORTVERSION=	1.255
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://www.linux-france.org/prj/imapsync/dist/ \
-		http://christianserving.org/ports/mail/imapsync/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.linux-france.org/prj/imapsync/dist/:imapsync \
+		${MASTER_SITE_PERL_CPAN:S/$/:imapclient229/} \
+		http://christianserving.org/ports/mail/imapsync/:imapsync,imapclient229
+MASTER_SITE_SUBDIR=	Mail/:imapclient229
+DISTFILES=	${DISTNAME}.tgz:imapsync \
+		Mail-IMAPClient-2.2.9.tar.gz:imapclient229
 
 MAINTAINER=	ports@christianserving.org
 COMMENT=	IMAP synchronization copy or migration tool
 
-BUILD_DEPENDS=	${SITE_PERL}/Mail/IMAPClient.pm:${PORTSDIR}/mail/p5-Mail-IMAPClient \
-		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC \
-		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
+		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-Date-Manip>0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
+		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
-NO_BUILD=	yes
-POD2MAN?=	pod2man
 
-PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
 
+POD2MAN?=	pod2man
+
+IMAPCLIENTNAME=	Mail-IMAPClient-2.2.9
+IMAPCLIENTWRKSRC=	${WRKDIR}/${IMAPCLIENTNAME}
+IMAPCLIENTDIR=	${DATADIR}/${IMAPCLIENTNAME}
+
+do-patch:
+	${REINPLACE_CMD} \
+		-e 's|/usr/bin/perl|${PERL}|g' \
+		-e '2{p;s|^|use lib '"'"'${IMAPCLIENTDIR}/lib/perl5/site_perl'"'"';|;G;}' \
+		${WRKSRC}/${PORTNAME}
+
+do-configure:
+	(cd ${IMAPCLIENTWRKSRC} && echo 'n' | ${PERL} Makefile.PL PREFIX=${IMAPCLIENTDIR})
+
+do-build:
+	${MAKE} -C ${IMAPCLIENTWRKSRC} PREFIX=${IMAPCLIENTDIR}
+
 do-install:
 	${POD2MAN} ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
+	${MAKE} -C ${IMAPCLIENTWRKSRC} pure_install PREFIX=${IMAPCLIENTDIR} INSTALLSITEMAN3DIR=none
 
 .include <bsd.port.mk>
diff --git a/mail/imapsync/distinfo b/mail/imapsync/distinfo
index 71f74faccf14..6a95209ed2a5 100644
--- a/mail/imapsync/distinfo
+++ b/mail/imapsync/distinfo
@@ -1,3 +1,6 @@
-MD5 (imapsync-1.252.tgz) = 182315ef95b79934b2c74e10623a46b5
-SHA256 (imapsync-1.252.tgz) = 8e9e81d169c6aa2ff4a6eee7eb229fb8e7446bcea7adcb168134d82feea26659
-SIZE (imapsync-1.252.tgz) = 392208
+MD5 (imapsync-1.255.tgz) = 509f2230ef1ed5fc192587f2b935f2e9
+SHA256 (imapsync-1.255.tgz) = 4d4eaaa7caddd7b7f94e8d54be7e026cd720f09415bc36b577476c06e71f01b0
+SIZE (imapsync-1.255.tgz) = 392609
+MD5 (Mail-IMAPClient-2.2.9.tar.gz) = 21c1901d55a2d57f73840cad478c665d
+SHA256 (Mail-IMAPClient-2.2.9.tar.gz) = fa67a4407295e50a9975769afb9b13ae14db58225d552cbb10c034636c2560c9
+SIZE (Mail-IMAPClient-2.2.9.tar.gz) = 376791
diff --git a/mail/imapsync/pkg-plist b/mail/imapsync/pkg-plist
new file mode 100644
index 000000000000..4322ddab51e2
--- /dev/null
+++ b/mail/imapsync/pkg-plist
@@ -0,0 +1,21 @@
+bin/imapsync
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient.pm
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient.pod
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient/BodyStructure.pm
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient/BodyStructure/Parse.pm
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient/MessageSet.pm
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient/Thread.pm
+%%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/mach/auto/Mail/IMAPClient/.packlist
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/mach/auto/Mail/IMAPClient
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/mach/auto/Mail
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/mach/auto
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/mach
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient/BodyStructure
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail/IMAPClient
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8/Mail
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl/5.8.8
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5/site_perl
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib/perl5
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/lib
+@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9
+@dirrm %%DATADIR%%