Date: Mon, 3 Mar 2014 21:17:24 -0800 From: Kevin Oberman <rkoberman@gmail.com> To: "Alex V. Petrov" <alexvpetrov@gmail.com> Cc: "freebsd-ports@freebsd.org" <freebsd-ports@freebsd.org> Subject: Re: graphics/imageindex - 1.1_5 Message-ID: <CAN6yY1uyGFD1b%2B%2BQk-JzKKZAMDOSec48KQBKvnWB0uzZxbJPtw@mail.gmail.com> In-Reply-To: <14371898.77cs3rCjJx@alex.super> References: <4238376.5ExdFi7rnP@alex.super> <CAN6yY1sK19J=0NW-2QTCjjp9n2D-DhTgY-bARTfr1=rBgfQEAg@mail.gmail.com> <CAN6yY1tp98zx=Ai5sReu_NuBWcFUu7rr_W_VQ==i7CBVZ0CsQg@mail.gmail.com> <14371898.77cs3rCjJx@alex.super>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Mon, Mar 3, 2014 at 9:14 PM, Alex V. Petrov <alexvpetrov@gmail.com>wrote:
> В письме от 3 марта 2014 20:44:41 пользователь Kevin Oberman написал:
>
>
>
> > cd /usr/ports/graphics/imageindex
>
> > make extract
>
> > mkdir files
>
> > Copy the following into files
>
> > =========================================================================
>
> skiped
>
> > =========================================================================
>
> > Install the port as you normally would.
>
>
>
> # make
>
> ===> Patching for imageindex-1.1_5
>
> ===> Applying FreeBSD patches for imageindex-1.1_5
>
> 7 out of 9 hunks failed--saving rejects to imageindex.rej
>
> => Patch patch-imageindex failed to apply cleanly.
>
> *** Error code 1
>
>
>
> You can send a patch as an attachment?
>
>
>
> --
>
> -----
>
> Alex V. Petrov
>
>
>
Sorry. I should have done exactly that. Here it is.
--
R. Kevin Oberman, Network Engineer, Retired
E-mail: rkoberman@gmail.com
[-- Attachment #2 --]
--- imageindex.orig 2007-04-04 12:55:51.000000000 -0700
+++ imageindex 2014-03-03 20:18:57.000000000 -0800
@@ -325,7 +325,8 @@
use File::Copy;
use English;
use Carp;
-require 'flush.pl';
+#require 'flush.pl';
+use IO::Handle;
# to shut up -w
use vars qw($opt_recurse);
@@ -523,7 +524,7 @@
# Extract info
print "Extracting image info";
-flush (STDOUT);
+STDOUT->flush();
foreach my $file (@files) {
@@ -1708,7 +1709,7 @@
# at the user so that the video regexp might be adjusted
if ($retval == -1) {
print "\nwarning: $pathname identified by extension as video file but mplayer doesn't recognize it\n";
- flush (STDOUT);
+ STDOUT->flush();
}
} else {
&extract_image_info ($filename);
@@ -1731,15 +1732,15 @@
my ($arate, $anch, $length, $is_video);
print ".";
- flush (STDOUT);
+ STDOUT->flush();
if ($mplayer_prog eq '' || ($do_video_files == 0)) {
if (($do_video_files != 0) && $mplayer_prog eq '') {
print "\nwarning: Trying to process video files but cannot find mplayer in \$path!\n";
- flush (STDOUT);
+ STDOUT->flush();
}
print "\nSkipping $pathname";
- flush (STDOUT);
+ STDOUT->flush();
return 0;
} else {
$object_counter++;
@@ -1893,14 +1894,14 @@
my $i;
print ".";
- flush (STDOUT);
+ STDOUT->flush();
$retval = $image->Read($pathname);
if ($retval ne "") {
print "\nSkipping $pathname";
- flush (STDOUT);
+ STDOUT->flush();
return;
} else {
$object_counter++;
@@ -2298,7 +2299,7 @@
if (defined($lastdate)) {
print "<META NAME=\"$enddatemetatag\" CONTENT=\"$lastdate\">\n";
}
- if (!defined ($opt_includeall) && defined (@opt_exclude) && scalar (@opt_exclude)) {
+ if (!defined ($opt_includeall) && @opt_exclude && scalar (@opt_exclude)) {
my $tmp = join (',', @opt_exclude);
my $etmp;
@@ -2311,7 +2312,7 @@
}
printf ("<META NAME=\"$numimagesmetatag\" CONTENT=\"%d\">\n", $image_counter);
- if (defined (@opt_skipmont) && scalar (@opt_skipmont)) {
+ if (@opt_skipmontv && scalar (@opt_skipmont)) {
my $tmp = join (',', @opt_skipmont);
printf ("<META NAME=\"$skipmetatag\" CONTENT=\"%s\">\n", $tmp);
}
@@ -2475,7 +2476,7 @@
# then process. Check to see if any of the -skipmont options were given as
# strings of filenames concatenated with ',' characters. If so, support it.
#
- if (defined (@opt_skipmont)) {
+ if (@opt_skipmont) {
foreach (@opt_skipmont) {
(@tokens) = split (/,/, $_);
foreach $token (@tokens) {
@@ -2499,7 +2500,7 @@
# then process. Check to see if any of the -exclude options were given as
# strings of filenames concatenated with ',' characters. If so, support it.
#
- if (defined (@opt_exclude)) {
+ if (@opt_exclude) {
# -includeall takes priority over -exclude on the commandline if they are
# used together (wierd, but ...)
#
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAN6yY1uyGFD1b%2B%2BQk-JzKKZAMDOSec48KQBKvnWB0uzZxbJPtw>