diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2007-10-05 05:32:09 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2007-10-05 05:32:09 +0000 |
| commit | d1ece52b0cc66c59ba2549b9beba8d9176e9ef27 (patch) | |
| tree | 9472ee7f88ec0e8150b65f555efc0b917b710f50 /graphics/ImageMagick/files | |
| parent | 83da1daa95d187866b511dfa9dbdc0d2cd234f64 (diff) | |
Notes
Diffstat (limited to 'graphics/ImageMagick/files')
| -rw-r--r-- | graphics/ImageMagick/files/patch-module-path | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/graphics/ImageMagick/files/patch-module-path b/graphics/ImageMagick/files/patch-module-path new file mode 100644 index 000000000000..65082dc41a7e --- /dev/null +++ b/graphics/ImageMagick/files/patch-module-path @@ -0,0 +1,31 @@ +Modify module-searching to only check the compiled-in location, +if the environment variables don't provide an override. The stock +code checks the compiled-in location if a particular module can't +be found at the environment-specified directory, which may lead +to wrong binaries being loaded, etc. + + -mi + +--- magick/module.c Sat Sep 8 16:44:05 2007 ++++ magick/module.c Thu Oct 4 23:30:26 2007 +@@ -589,4 +589,6 @@ + "Searching for coder module file \"%s\" ...",filename); + module_path=GetEnvironmentValue("MAGICK_CODER_MODULE_PATH"); ++ if (module_path == NULL) ++ module_path = MagickCoderModulesPath; + break; + } +@@ -596,4 +598,6 @@ + "Searching for filter module file \"%s\" ...",filename); + module_path=GetEnvironmentValue("MAGICK_CODER_FILTER_PATH"); ++ if (module_path == NULL) ++ module_path = MagickFilterModulesPath; + break; + } +@@ -624,5 +628,5 @@ + module_path=DestroyString(module_path); + } +-#if defined(UseInstalledMagick) ++#if defined(UseInstalledMagick) && 0 + #if defined(MagickCoderModulesPath) + { |