3 files changed, 10 insertions, 50 deletions

diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index 976e4e031ae1..caed93e16e55 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -6,53 +6,37 @@
 #
 
 PORTNAME=	imapsync
-PORTVERSION=	1.267
-PORTREVISION=	1
+PORTVERSION=	1.285
 CATEGORIES=	mail perl5
-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
+MASTER_SITES=	http://www.linux-france.org/prj/imapsync/dist/ \
+		http://christianserving.org/ports/mail/imapsync/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@christianserving.org
 COMMENT=	IMAP synchronization copy or migration tool
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
+BUILD_DEPENDS=	p5-Mail-IMAPClient>0:${PORTSDIR}/mail/p5-Mail-IMAPClient \
 		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
 
+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 fc9207f41b9c..fb43ac973f40 100644
--- a/mail/imapsync/distinfo
+++ b/mail/imapsync/distinfo
@@ -1,6 +1,3 @@
-MD5 (imapsync-1.267.tgz) = 3ca055a54b89e2ec01f687cfb6abfd1c
-SHA256 (imapsync-1.267.tgz) = be71ff9e9add9c0b785fa322063840c488389d317c62068285d6b54596b83641
-SIZE (imapsync-1.267.tgz) = 488633
-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
+MD5 (imapsync-1.285.tgz) = 5ae83a8a5cdd29e591526f85199f79f4
+SHA256 (imapsync-1.285.tgz) = 1365933d1295a531624cc44ece3eebea7be07af44f5b02dfee9fccc4f64830f5
+SIZE (imapsync-1.285.tgz) = 739588
diff --git a/mail/imapsync/pkg-plist b/mail/imapsync/pkg-plist
deleted file mode 100644
index bc8647409236..000000000000
--- a/mail/imapsync/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/imapsync
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient.pm
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient.pod
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient/BodyStructure.pm
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient/BodyStructure/Parse.pm
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient/MessageSet.pm
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient/Thread.pm
-%%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/mach/auto/Mail/IMAPClient/.packlist
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/mach/auto/Mail/IMAPClient
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/mach/auto/Mail
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/mach/auto
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/mach
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient/BodyStructure
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail/IMAPClient
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%/Mail
-@dirrm %%DATADIR%%/Mail-IMAPClient-2.2.9/%%SITE_PERL%%
-@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%%