Date: Sun, 5 Jul 2015 03:30:41 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391341 - in head/graphics/gscan2pdf: . files Message-ID: <201507050330.t653Ufix018595@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Sun Jul 5 03:30:41 2015 New Revision: 391341 URL: https://svnweb.freebsd.org/changeset/ports/391341 Log: - Fix a runtime dependency - Fix a runtime error due a Linux dependent code snippet Reported by: Torfinn Ingolfsen <tingox@gmail.com> Tested by: Torfinn Ingolfsen <tingox@gmail.com> MFH: 2015Q3 Added: head/graphics/gscan2pdf/files/ head/graphics/gscan2pdf/files/patch-bin_gscan2pdf (contents, props changed) Modified: head/graphics/gscan2pdf/Makefile Modified: head/graphics/gscan2pdf/Makefile ============================================================================== --- head/graphics/gscan2pdf/Makefile Sun Jul 5 00:45:08 2015 (r391340) +++ head/graphics/gscan2pdf/Makefile Sun Jul 5 03:30:41 2015 (r391341) @@ -3,6 +3,7 @@ PORTNAME= gscan2pdf PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -36,6 +37,7 @@ RUN_DEPENDS:= p5-Archive-Tar>0:${PORTSDI 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 @@ -62,7 +64,5 @@ 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> Added: head/graphics/gscan2pdf/files/patch-bin_gscan2pdf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gscan2pdf/files/patch-bin_gscan2pdf Sun Jul 5 03:30:41 2015 (r391341) @@ -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';
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507050330.t653Ufix018595>