Index: branches/2015Q3/graphics/gscan2pdf/Makefile
===================================================================
--- branches/2015Q3/graphics/gscan2pdf/Makefile	(revision 391365)
+++ branches/2015Q3/graphics/gscan2pdf/Makefile	(revision 391366)
@@ -1,68 +1,68 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gscan2pdf
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Produce PDF from scanned documents
 
 LICENSE=	GPLv3
 
 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-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 \
 		cjb2:${PORTSDIR}/graphics/djvulibre \
 		scanimage:${PORTSDIR}/graphics/sane-backends \
 		scanadf:${PORTSDIR}/graphics/sane-frontends \
 		unpaper:${PORTSDIR}/graphics/unpaper \
 		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Gtk2-Ex-PodViewer>0.17:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-PodViewer \
+		p5-Filesys-Df>0.92:${PORTSDIR}/sysutils/p5-Filesys-Df \
 		${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 
 USES=		gettext gmake perl5
 USE_GNOME=	gtk20 librsvg2
 USE_PERL5=	configure
 
 OPTIONS_MULTI=		OCR
 OPTIONS_MULTI_OCR=	CUNEIFORM GOCR OCROPUS TESSERACT
 OPTIONS_DEFAULT=	GOCR
 
 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|$$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>
Index: branches/2015Q3/graphics/gscan2pdf/files/patch-bin_gscan2pdf
===================================================================
--- branches/2015Q3/graphics/gscan2pdf/files/patch-bin_gscan2pdf	(nonexistent)
+++ branches/2015Q3/graphics/gscan2pdf/files/patch-bin_gscan2pdf	(revision 391366)
@@ -0,0 +1,50 @@
+--- bin/gscan2pdf.orig	2015-06-16 20:04:47 UTC
++++ bin/gscan2pdf
+@@ -78,7 +78,6 @@ use Fcntl qw(:flock)
+ use Log::Log4perl;
+ use Try::Tiny;
+ use Data::Dumper;
+-use Linux::Distribution qw(distribution_name distribution_version);
+ use Filesys::Df;
+ use English qw( -no_match_vars )
+   ;    # for $PERL_VERSION, $PROGRAM_NAME, $EVAL_ERROR, $ERRNO
+@@ -122,7 +121,7 @@ my $VERSION   = '1.3.1';
+ my $border = 1;
+ 
+ # Set up domain for gettext (internationalisation)
+-# Expects /usr/share/locale/LANGUAGE/LC_MESSAGES/$prog_name.mo
++# Expects /usr/local/share/locale/LANGUAGE/LC_MESSAGES/$prog_name.mo
+ # or whatever is set by $d->dir([NEWDIR]);
+ my $d      = Locale::gettext->domain($prog_name);
+ my $d_sane = Locale::gettext->domain('sane-backends');
+@@ -147,19 +146,6 @@ read_config_file($rc);
+ 
+ set_up_test_mode();
+ 
+-if ( my $distro = distribution_name() ) {
+-    my $version = distribution_version();
+-    if ( defined $version ) {
+-        $version = ", version $version";
+-    }
+-    else {
+-        $version = $EMPTY;
+-    }
+-    $logger->info("You are running $distro$version");
+-}
+-else {
+-    $logger->info('Distribution unknown');
+-}
+ $logger->info("Perl version $PERL_VERSION");
+ $logger->info("Glib-Perl version $Glib::VERSION");
+ $logger->info( 'Built for Glib ' . join $DOT, Glib->GET_VERSION_INFO );
+@@ -200,8 +186,8 @@ Gscan2pdf::Document->set_paper_sizes( $S
+ # Create icons for rotate buttons
+ my $iconfactory;
+ my $iconpath;
+-if ( -d '/usr/share/gscan2pdf' ) {
+-    $iconpath = '/usr/share/gscan2pdf';
++if ( -d '/usr/local/share/gscan2pdf' ) {
++    $iconpath = '/usr/local/share/gscan2pdf';
+ }
+ else {
+     $iconpath = 'icons';

Property changes on: branches/2015Q3/graphics/gscan2pdf/files/patch-bin_gscan2pdf
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 391365)
+++ branches/2015Q3	(revision 391366)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r391341