- Update to 1.3.3

4 files changed, 7 insertions, 53 deletions

diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 94c1ea782e19..9dc8dced204e 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gscan2pdf
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -37,6 +37,7 @@ RUN_DEPENDS:=	p5-Archive-Tar>0:${PORTSDIR}/archivers/p5-Archive-Tar \
 		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 \
+		p5-Data-UUID>=1.220:${PORTSDIR}/devel/p5-Data-UUID \
 		${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -63,5 +64,7 @@ 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>
diff --git a/graphics/gscan2pdf/distinfo b/graphics/gscan2pdf/distinfo
index 2cab08233821..255a20027b70 100644
--- a/graphics/gscan2pdf/distinfo
+++ b/graphics/gscan2pdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gscan2pdf-1.3.2.tar.xz) = 54ba7717e0c33a7aa266d1dd7e74f8806bee331228f0b1929c3cb08626b84346
-SIZE (gscan2pdf-1.3.2.tar.xz) = 354360
+SHA256 (gscan2pdf-1.3.3.tar.xz) = ca9eee74a5fea619c6ccd3508bb4c6548e2cfa169aa4689ed371d28e37d295f4
+SIZE (gscan2pdf-1.3.3.tar.xz) = 359416
diff --git a/graphics/gscan2pdf/files/patch-bin_gscan2pdf b/graphics/gscan2pdf/files/patch-bin_gscan2pdf
deleted file mode 100644
index 668898f36434..000000000000
--- a/graphics/gscan2pdf/files/patch-bin_gscan2pdf
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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';
diff --git a/graphics/gscan2pdf/pkg-plist b/graphics/gscan2pdf/pkg-plist
index 776b87fa9fb8..68225ce47307 100644
--- a/graphics/gscan2pdf/pkg-plist
+++ b/graphics/gscan2pdf/pkg-plist
@@ -2,6 +2,7 @@ bin/gscan2pdf
 bin/scanadf-perl
 bin/scanimage-perl
 %%SITE_PERL%%/Gscan2pdf/Canvas.pm
+%%SITE_PERL%%/Gscan2pdf/Config.pm
 %%SITE_PERL%%/Gscan2pdf/Cuneiform.pm
 %%SITE_PERL%%/Gscan2pdf/Dialog.pm
 %%SITE_PERL%%/Gscan2pdf/Dialog/Renumber.pm