1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
$NetBSD: patch-aa,v 1.3 2002/07/31 14:34:02 dmcmahill Exp $
--- bins.orig Sun Jun 9 15:54:12 2002
+++ bins Wed Jul 31 10:27:02 2002
@@ -219,5 +219,5 @@
# The following parameters cannot be set in config files for now :
- globalConfigDir => "/etc/bins", # System wide
+ globalConfigDir => "@pkgsysconfdir@/bins", # System wide
# configuration directory.
userConfigDir => "~/.bins", # User configuration directory
@@ -238,11 +238,12 @@
);
-# normally, you don't have to touch that...
-my $localEncoding = `locale charmap`;
-# ANSI is unspeakably primitive, keep LATIN1 instead
-if ($localEncoding && ($localEncoding ne "ANSI_X3.4-1968")) {
- $defaultConfig{defaultEncoding} = $localEncoding;
- beVerboseN("Forcing encoding to $localEncoding", 2);
-}
+# XXX no "locale" command in NetBSD
+# # normally, you don't have to touch that...
+# my $localEncoding = `locale charmap`;
+# # ANSI is unspeakably primitive, keep LATIN1 instead
+# if ($localEncoding && ($localEncoding ne "ANSI_X3.4-1968")) {
+# $defaultConfig{defaultEncoding} = $localEncoding;
+# beVerboseN("Forcing encoding to $localEncoding", 2);
+# }
my $local2htmlConverter;
if ($defaultConfig{defaultEncoding} ne $defaultConfig{htmlEncoding}){
@@ -2369,6 +2370,7 @@
warn "$x" if "$x";
+ my($srcformat) = $preview->Get("magick");
if (!$configHash->{scaleIfSameSize}
- and grep (/^$preview->Get("magick")$/, @webFormats ) ) {
+ and grep (/^$srcformat$/, @webFormats ) ) {
my ($width, $height) = $preview->Get("width", "height");
if ($width == $newWidth && $height == $newHeight) {
|
