- Update to 2.1.2

- Don't append BUILD_DEPENDS to RUN_DEPENDS
- Switch to GTK3

3 files changed, 24 insertions, 11 deletions

diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index ea6d3a6e11c9..f7e9deca501b 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gscan2pdf
-PORTVERSION=	1.8.11
+PORTVERSION=	2.1.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -13,7 +13,6 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	p5-Config-General>=2.40:devel/p5-Config-General \
 		p5-Glib2>=1.210:devel/p5-Glib2 \
-		p5-Goo-Canvas>0:devel/p5-Goo-Canvas \
 		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
 		p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
 		p5-Readonly>0:devel/p5-Readonly \
@@ -24,26 +23,38 @@ BUILD_DEPENDS=	p5-Config-General>=2.40:devel/p5-Config-General \
 		p5-Try-Tiny>0:lang/p5-Try-Tiny \
 		bash:shells/bash \
 		p5-PDF-API2>0.57:textproc/p5-PDF-API2 \
-		p5-Gtk2>=1.090:x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-Simple-List>0:x11-toolkits/p5-Gtk2-Ex-Simple-List \
-		p5-Gtk2-ImageView>0:x11-toolkits/p5-Gtk2-ImageView
+		p5-Gtk3>=0.028:x11-toolkits/p5-Gtk3 \
+		p5-Gtk3-SimpleList>=0.17:x11-toolkits/p5-Gtk3-SimpleList \
+		p5-Goo-Canvas2>=0.06:devel/p5-Goo-Canvas2
 RUN_DEPENDS:=	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \
 		xdg-open:devel/xdg-utils \
 		cjb2:graphics/djvulibre \
 		scanimage:graphics/sane-backends \
 		scanadf:graphics/sane-frontends \
 		unpaper:graphics/unpaper \
+		ImageMagick>0:graphics/ImageMagick \
 		p5-HTML-Parser>0:www/p5-HTML-Parser \
-		p5-Gtk2-Ex-PodViewer>0.17:x11-toolkits/p5-Gtk2-Ex-PodViewer \
 		p5-Filesys-Df>0.92:sysutils/p5-Filesys-Df \
 		p5-Data-UUID>=1.220:devel/p5-Data-UUID \
 		p5-Date-Calc>=6.4:devel/p5-Date-Calc \
-		${BUILD_DEPENDS}
+		p5-Config-General>=2.40:devel/p5-Config-General \
+		p5-Glib2>=1.210:devel/p5-Glib2 \
+		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
+		p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
+		p5-Readonly>0:devel/p5-Readonly \
+		p5-Image-Sane>=0.14:graphics/p5-Image-Sane \
+		p5-Set-IntSpan>=1.10:math/p5-Set-IntSpan \
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-Try-Tiny>0:lang/p5-Try-Tiny \
+		p5-PDF-API2>0.57:textproc/p5-PDF-API2 \
+		p5-Gtk3>=0.028:x11-toolkits/p5-Gtk3 \
+		p5-Gtk3-SimpleList>=0.17:x11-toolkits/p5-Gtk3-SimpleList \
+		p5-Goo-Canvas2>=0.06:devel/p5-Goo-Canvas2
 
 NO_ARCH=	yes
 
 USES=		gettext gmake perl5 tar:xz
-USE_GNOME=	gtk20 librsvg2
+USE_GNOME=	gtk30 librsvg2
 USE_PERL5=	configure
 
 OPTIONS_MULTI=		OCR
diff --git a/graphics/gscan2pdf/distinfo b/graphics/gscan2pdf/distinfo
index 41259e5d858d..0264aaf0937f 100644
--- a/graphics/gscan2pdf/distinfo
+++ b/graphics/gscan2pdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518352774
-SHA256 (gscan2pdf-1.8.11.tar.xz) = d4a167ebe36390422472f91a4580f262a543e48f303ff930331a2e7e56491ab7
-SIZE (gscan2pdf-1.8.11.tar.xz) = 409212
+TIMESTAMP = 1527565348
+SHA256 (gscan2pdf-2.1.2.tar.xz) = f434cecb9094a4bed76f3e1df15306d6a26ab316ba23e06f204dcd0a0b14e124
+SIZE (gscan2pdf-2.1.2.tar.xz) = 422656
diff --git a/graphics/gscan2pdf/pkg-plist b/graphics/gscan2pdf/pkg-plist
index ada74104c364..3cb86c642a20 100644
--- a/graphics/gscan2pdf/pkg-plist
+++ b/graphics/gscan2pdf/pkg-plist
@@ -11,6 +11,7 @@ bin/gscan2pdf
 %%SITE_PERL%%/Gscan2pdf/EntryCompletion.pm
 %%SITE_PERL%%/Gscan2pdf/Frontend/CLI.pm
 %%SITE_PERL%%/Gscan2pdf/Frontend/Image_Sane.pm
+%%SITE_PERL%%/Gscan2pdf/ImageView.pm
 %%SITE_PERL%%/Gscan2pdf/NetPBM.pm
 %%SITE_PERL%%/Gscan2pdf/Ocropus.pm
 %%SITE_PERL%%/Gscan2pdf/Page.pm
@@ -32,6 +33,7 @@ share/applications/gscan2pdf.desktop
 %%DATADIR%%/stock-rotate-270.svg
 %%DATADIR%%/stock-rotate-90.svg
 %%DATADIR%%/stock-selection-all-16.png
+share/help/C/gscan2pdf/documentation.html
 share/locale/ab/LC_MESSAGES/gscan2pdf.mo
 share/locale/be/LC_MESSAGES/gscan2pdf.mo
 share/locale/bg/LC_MESSAGES/gscan2pdf.mo