--- Makefile	(revision 567579)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	FuzzyOcr
 DISTVERSION=	3.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:tl}/
 PKGNAMEPREFIX=	p5-
@@ -14,6 +14,10 @@ 
 COMMENT=	Plugin for SpamAssassin which scans image attachments for spam
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_SINGLE=	GIFINTER_EMULATION
+OPTIONS_SINGLE_GIFINTER_EMULATION=IMAGEMAGICK GRAPHICSMAGICK
+OPTIONS_DEFAULT=IMAGEMAGICK
+OPTIONS_SUB=	please
 
 RUN_DEPENDS=	giftopnm:graphics/netpbm			\
 		gifsicle:graphics/gifsicle			\
@@ -24,7 +28,12 @@ 
 		p5-MLDBM>=0:databases/p5-MLDBM	\
 		p5-MLDBM-Sync>=0:databases/p5-MLDBM-Sync \
 		p5-String-Approx>=0:devel/p5-String-Approx
+IMAGEMAGICK_RUN_DEPENDS=convert:graphics/ImageMagick7
+GRAPHICSMAGICK_RUN_DEPENDS=gm:graphics/GraphicsMagick
 
+IMAGEMAGICK_DESC=Use ImageMagick's convert to process interlaced GIFs
+GRAPHICSMAGICK_DESC=Use GraphicsMagick to process interlaced GIFs
+
 USES=		perl5
 NO_BUILD=	yes
 
@@ -36,7 +45,7 @@ 
 		samples/ocr-obfuscated.eml samples/ocr-png.eml samples/ocr-wrongext.eml
 PORTEXAMPLES=	*
 
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message gifinter
 
 SA_PLUGINDIR?=	Mail/SpamAssassin/Plugin
 SA_CONFIGDIR?=	etc/mail/spamassassin
@@ -49,7 +58,8 @@ 
 		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Misc.pm \
 		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Preprocessor.pm \
 		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Scanset.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Scoring.pm
+		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Scoring.pm \
+		bin/gifinter
 
 #.if defined(WITH_OCRAD)
 #RUN_DEPENDS+=	ocrad:graphics/ocrad
@@ -80,6 +90,7 @@ 
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.scansets ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.scansets
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.preps ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.preps
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.mysql ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.mysql
+	${INSTALL_SCRIPT} ${WRKDIR}/gifinter ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/samples
 .for f in ${PORTDOCS_F}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f}
--- files/gifinter.in	(nonexistent)
+++ files/gifinter.in	(working copy)
@@ -0,0 +1,3 @@ 
+exec \
+%%IMAGEMAGICK%%%%PREFIX%%/bin/convert -interlace "$@"
+%%GRAPHICSMAGICK%%%%PREFIX%%/bin/gm convert -interlace "$@"