3 files changed, 96 insertions, 107 deletions

diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 48e06bc3a895..de253c50e20f 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gscan2pdf
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -12,81 +11,56 @@ COMMENT=	Produce PDF from scanned documents
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
-		p5-Set-IntSpan>=0:${PORTSDIR}/math/p5-Set-IntSpan \
-		p5-XML-LibXML-Simple>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Simple \
-		p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
-		p5-forks>=0:${PORTSDIR}/devel/p5-forks \
-		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		p5-Goo-Canvas>=0:${PORTSDIR}/devel/p5-Goo-Canvas \
-		p5-Pango>=0:${PORTSDIR}/x11-toolkits/p5-Pango \
-		p5-Acme-Damn>=0:${PORTSDIR}/devel/p5-Acme-Damn \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
+BUILD_DEPENDS=	p5-Config-General>=2.40:${PORTSDIR}/devel/p5-Config-General \
+		p5-Glib2>=1.210:${PORTSDIR}/devel/p5-Glib2 \
+		p5-Goo-Canvas>0:${PORTSDIR}/devel/p5-Goo-Canvas \
 		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		cjb2:${PORTSDIR}/graphics/djvulibre \
-		gocr:${PORTSDIR}/graphics/gocr \
-		p5-Sane>=0:${PORTSDIR}/graphics/p5-Sane \
-		scanimage:${PORTSDIR}/graphics/sane-backends \
-		scanadf:${PORTSDIR}/graphics/sane-frontends \
-		tesseract:${PORTSDIR}/graphics/tesseract \
-		unpaper:${PORTSDIR}/graphics/unpaper \
+		p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl \
+		p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly \
+		ImageMagick>0:${PORTSDIR}/graphics/ImageMagick \
+		p5-Sane>=0.05:${PORTSDIR}/graphics/p5-Sane \
+		p5-Set-IntSpan>=1.10:${PORTSDIR}/math/p5-Set-IntSpan \
+		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
+		p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
+		bash:${PORTSDIR}/shells/bash \
+		p5-PDF-API2>0.57:${PORTSDIR}/textproc/p5-PDF-API2 \
+		p5-Gtk2>=1.090:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Ex-Simple-List>0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List \
+		p5-Gtk2-ImageView>0:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView
+RUN_DEPENDS:=	p5-Archive-Tar>0:${PORTSDIR}/archivers/p5-Archive-Tar \
+		p5-Proc-ProcessTable>0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		ocropus:${PORTSDIR}/graphics/ocropus \
-		p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2 \
-		p5-Gtk2>=1.112:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-PodViewer>=0.17:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
-		p5-Gtk2-Ex-Simple-List>=0.50:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List \
-		p5-Gtk2-ImageView>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
 		cjb2:${PORTSDIR}/graphics/djvulibre \
-		gocr:${PORTSDIR}/graphics/gocr \
-		p5-Sane>=0:${PORTSDIR}/graphics/p5-Sane \
 		scanimage:${PORTSDIR}/graphics/sane-backends \
 		scanadf:${PORTSDIR}/graphics/sane-frontends \
-		tesseract:${PORTSDIR}/graphics/tesseract \
 		unpaper:${PORTSDIR}/graphics/unpaper \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		ocropus:${PORTSDIR}/graphics/ocropus \
-		p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2 \
-		p5-Gtk2>=1.112:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-PodViewer>=0.17:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
-		p5-Gtk2-Ex-Simple-List>=0.50:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List \
-		p5-Gtk2-ImageView>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView \
-		bash:${PORTSDIR}/shells/bash
+		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Gtk2-Ex-PodViewer>0.17:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
+		${BUILD_DEPENDS}
 
-USES=		gmake perl5
+USES=		gettext gmake perl5
 USE_GNOME=	gtk20 librsvg2
 USE_PERL5=	configure
-MAN1=		${PORTNAME}.1 scanadf-perl.1 scanimage-perl.1
-PORT_VERBS=	${PORTNAME} Gscan2pdf
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.options.mk>
+OPTIONS_MULTI=		OCR
+OPTIONS_MULTI_OCR=	CUNEIFORM GOCR OCROPUS TESSERACT
+OPTIONS_DEFAULT=	GOCR
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+CUNEIFORM_DESC=		Multi-language OCR system
+CUNEIFORM_RUN_DEPENDS=	cuneiform:${PORTSDIR}/graphics/cuneiform
+GOCR_DESC=		OCR program developed under GPL
+GOCR_RUN_DEPENDS=	gocr:${PORTSDIR}/graphics/gocr
+OCR_DESC=		Optical Character Recognition
+OCROPUS_DESC=		Document analysis and OCR system
+OCROPUS_RUN_DEPENDS=	ocropus:${PORTSDIR}/graphics/ocropus
+TESSERACT_DESC=		OCR engine developed at Google
+TESSERACT_RUN_DEPENDS=	tesseract:${PORTSDIR}/graphics/tesseract
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/--parents/-p/g;s|$$sharedir/man|${MANPREFIX}/man|g;s|1p|1|g'\
-		-e '/SITEPREFIX/s|/usr|${PREFIX}|' ${WRKSRC}/Makefile.PL
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/bin/${PORTNAME}
+	@${REINPLACE_CMD} -e \
+		's|$$sharedir/man|$$prefixdir/man| ; \
+		 s|1p|1|' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e \
+		's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/graphics/gscan2pdf/distinfo b/graphics/gscan2pdf/distinfo
index cc5f735fd692..1761462d1e40 100644
--- a/graphics/gscan2pdf/distinfo
+++ b/graphics/gscan2pdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gscan2pdf-1.0.4.tar.gz) = 6f3f20b2540bed43199761592fe68be5c462d9285e88cd1a63dbea8636413399
-SIZE (gscan2pdf-1.0.4.tar.gz) = 542167
+SHA256 (gscan2pdf-1.2.5.tar.gz) = 5611c14343b548a82ffa153cf57d1846e9c2d1a6afe1fcc71bfa9f4ef4a98dd0
+SIZE (gscan2pdf-1.2.5.tar.gz) = 641090
diff --git a/graphics/gscan2pdf/pkg-plist b/graphics/gscan2pdf/pkg-plist
index f8d8e4de5d00..7c49afa1773d 100644
--- a/graphics/gscan2pdf/pkg-plist
+++ b/graphics/gscan2pdf/pkg-plist
@@ -1,61 +1,76 @@
 bin/gscan2pdf
 bin/scanadf-perl
 bin/scanimage-perl
-%%SITE_PERL%%/Gscan2pdf.pm
-%%SITE_PERL%%/Gscan2pdf/Frontend/Sane.pm
-%%SITE_PERL%%/Gscan2pdf/Scanner/Options.pm
 %%SITE_PERL%%/Gscan2pdf/Cuneiform.pm
+%%SITE_PERL%%/Gscan2pdf/Dialog.pm
+%%SITE_PERL%%/Gscan2pdf/Dialog/Renumber.pm
+%%SITE_PERL%%/Gscan2pdf/Dialog/Scan.pm
+%%SITE_PERL%%/Gscan2pdf/Dialog/Scan/CLI.pm
+%%SITE_PERL%%/Gscan2pdf/Dialog/Scan/Sane.pm
 %%SITE_PERL%%/Gscan2pdf/Document.pm
+%%SITE_PERL%%/Gscan2pdf/Frontend/CLI.pm
+%%SITE_PERL%%/Gscan2pdf/Frontend/Sane.pm
+%%SITE_PERL%%/Gscan2pdf/NetPBM.pm
 %%SITE_PERL%%/Gscan2pdf/Ocropus.pm
 %%SITE_PERL%%/Gscan2pdf/Page.pm
+%%SITE_PERL%%/Gscan2pdf/PageRange.pm
+%%SITE_PERL%%/Gscan2pdf/Scanner/Options.pm
 %%SITE_PERL%%/Gscan2pdf/Tesseract.pm
 %%SITE_PERL%%/Gscan2pdf/Unpaper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/gscan2pdf/.packlist
+man/man1/gscan2pdf.1.gz
+man/man1/scanadf-perl.1.gz
+man/man1/scanimage-perl.1.gz
+share/appdata/gscan2pdf.appdata.xml
 share/applications/gscan2pdf.desktop
-share/pixmaps/gscan2pdf.svg
 %%DATADIR%%/gscan2pdf.svg
 %%DATADIR%%/pdf.svg
 %%DATADIR%%/scanner.svg
-%%DATADIR%%/stock-selection-all-16.png
 %%DATADIR%%/stock-rotate-180.svg
 %%DATADIR%%/stock-rotate-270.svg
 %%DATADIR%%/stock-rotate-90.svg
-%%NLS%%share/locale/ab/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/be/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/el/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/he/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gscan2pdf.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/gscan2pdf.mo
+%%DATADIR%%/stock-selection-all-16.png
+share/locale/ab/LC_MESSAGES/gscan2pdf.mo
+share/locale/be/LC_MESSAGES/gscan2pdf.mo
+share/locale/bg/LC_MESSAGES/gscan2pdf.mo
+share/locale/ca/LC_MESSAGES/gscan2pdf.mo
+share/locale/cs/LC_MESSAGES/gscan2pdf.mo
+share/locale/da/LC_MESSAGES/gscan2pdf.mo
+share/locale/de/LC_MESSAGES/gscan2pdf.mo
+share/locale/el/LC_MESSAGES/gscan2pdf.mo
+share/locale/en_GB/LC_MESSAGES/gscan2pdf.mo
+share/locale/es/LC_MESSAGES/gscan2pdf.mo
+share/locale/fa/LC_MESSAGES/gscan2pdf.mo
+share/locale/fr/LC_MESSAGES/gscan2pdf.mo
+share/locale/gu/LC_MESSAGES/gscan2pdf.mo
+share/locale/he/LC_MESSAGES/gscan2pdf.mo
+share/locale/hr/LC_MESSAGES/gscan2pdf.mo
+share/locale/hu/LC_MESSAGES/gscan2pdf.mo
+share/locale/it/LC_MESSAGES/gscan2pdf.mo
+share/locale/ja/LC_MESSAGES/gscan2pdf.mo
+share/locale/ko/LC_MESSAGES/gscan2pdf.mo
+share/locale/nb/LC_MESSAGES/gscan2pdf.mo
+share/locale/nl/LC_MESSAGES/gscan2pdf.mo
+share/locale/oc/LC_MESSAGES/gscan2pdf.mo
+share/locale/pl/LC_MESSAGES/gscan2pdf.mo
+share/locale/pt/LC_MESSAGES/gscan2pdf.mo
+share/locale/pt_BR/LC_MESSAGES/gscan2pdf.mo
+share/locale/ru/LC_MESSAGES/gscan2pdf.mo
+share/locale/sk/LC_MESSAGES/gscan2pdf.mo
+share/locale/sl/LC_MESSAGES/gscan2pdf.mo
+share/locale/sv/LC_MESSAGES/gscan2pdf.mo
+share/locale/tr/LC_MESSAGES/gscan2pdf.mo
+share/locale/uk/LC_MESSAGES/gscan2pdf.mo
+share/locale/zh_CN/LC_MESSAGES/gscan2pdf.mo
+share/locale/zh_TW/LC_MESSAGES/gscan2pdf.mo
+share/pixmaps/gscan2pdf.svg
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/ab/LC_MESSAGES
+@dirrmtry share/locale/ab
+@dirrmtry share/appdata
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/gscan2pdf
 @dirrm %%SITE_PERL%%/Gscan2pdf/Scanner
 @dirrm %%SITE_PERL%%/Gscan2pdf/Frontend
+@dirrm %%SITE_PERL%%/Gscan2pdf/Dialog/Scan
+@dirrm %%SITE_PERL%%/Gscan2pdf/Dialog
 @dirrm %%SITE_PERL%%/Gscan2pdf
-@dirrmtry share/locale/ab/LC_MESSAGES
-@dirrmtry share/locale/ab
-@dirrmtry %%DATADIR%%