[commit] r2325 - in trunk/user/imagemagick: . src/PerlMagick src/magick src/utilities

dslinux_sonny_jim at dslinux.in-berlin.de dslinux_sonny_jim at dslinux.in-berlin.de
Mon Jul 28 21:37:51 CEST 2008 

Author: dslinux_sonny_jim
Date: Mon Jul 28 21:37:50 2008
New Revision: 2325

Log:
Fix typo in makefile

Modified:
   trunk/user/imagemagick/Makefile
   trunk/user/imagemagick/src/PerlMagick/Magick.pm
   trunk/user/imagemagick/src/PerlMagick/Makefile.PL
   trunk/user/imagemagick/src/magick/magick-config.h
   trunk/user/imagemagick/src/magick/version.h
   trunk/user/imagemagick/src/utilities/ImageMagick.1
   trunk/user/imagemagick/src/utilities/animate.1
   trunk/user/imagemagick/src/utilities/compare.1
   trunk/user/imagemagick/src/utilities/composite.1
   trunk/user/imagemagick/src/utilities/conjure.1
   trunk/user/imagemagick/src/utilities/convert.1
   trunk/user/imagemagick/src/utilities/display.1
   trunk/user/imagemagick/src/utilities/identify.1
   trunk/user/imagemagick/src/utilities/import.1
   trunk/user/imagemagick/src/utilities/mogrify.1
   trunk/user/imagemagick/src/utilities/montage.1
   trunk/user/imagemagick/src/utilities/stream.1

Modified: trunk/user/imagemagick/Makefile
==============================================================================
--- trunk/user/imagemagick/Makefile	(original)
+++ trunk/user/imagemagick/Makefile	Mon Jul 28 21:37:50 2008
@@ -34,6 +34,6 @@
 	@for i in $(BIN);\
 	do \
 		echo "installing $$i";\
-		arm-linux-elf-flthdr -s 8192 $(i)
+		arm-linux-elf-flthdr -s 8192 src/utilities/$$i;\
 		$(ROMFSINST) src/utilities/$$i /usr/bin/;\
 	done

Modified: trunk/user/imagemagick/src/PerlMagick/Magick.pm
==============================================================================
--- trunk/user/imagemagick/src/PerlMagick/Magick.pm	(original)
+++ trunk/user/imagemagick/src/PerlMagick/Magick.pm	Mon Jul 28 21:37:50 2008
@@ -108,7 +108,7 @@
 
 A Web page has been set up for this extension. See:
 
-	 file:///usr/share/doc/ImageMagick-6.4.2/www/perl-magick.html
+	 file:///nonexistent/share/doc/ImageMagick-6.4.2/www/perl-magick.html
 	 http://www.imagemagick.org/script/perl-magick.php
 
 =head1 AUTHOR

Modified: trunk/user/imagemagick/src/PerlMagick/Makefile.PL
==============================================================================
--- trunk/user/imagemagick/src/PerlMagick/Makefile.PL	(original)
+++ trunk/user/imagemagick/src/PerlMagick/Makefile.PL	Mon Jul 28 21:37:50 2008
@@ -27,7 +27,7 @@
 # Compute test specification
 my $delegate_tests='t/*.t';
 my $delegate;
-foreach $delegate (qw/bzlib fontconfig freetype gs gvc jpeg jp2 lcms openexr png tiff x11 xml wmf zlib/) {
+foreach $delegate (qw/jpeg png zlib/) {
   if ( -d "t/$delegate" ) {
     if ($delegate =~ /x11/) {
       if ( defined $ENV{'DISPLAY'} ) {
@@ -56,28 +56,28 @@
    'VERSION'   => '6.4.2',
 
    # Preprocessor defines
-   'DEFINE'	=> ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING' 
+   'DEFINE'	=> ' -DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING' 
 
    # Header search specfication and preprocessor flags
-   'INC'	=> '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
+   'INC'	=> '-I../ -I.. ',
 
    # C pre-processor flags (e.g. -I & -D options)
-   # 'CPPFLAGS'    => "$Config{'cppflags'} -I/usr/include/freetype2 -I/usr/include/libxml2",
+   # 'CPPFLAGS'    => "$Config{'cppflags'} ",
 
    # C compiler flags (e.g. -O -g)
-   'CCFLAGS'     => "$Config{'ccflags'} -fopenmp -O3 -g -Wall -W -pthread",
+   'CCFLAGS'     => "$Config{'ccflags'} -O2 -g -fomit-frame-pointer -fno-common -fno-builtin -Wall -mswp-byte-writes -DCONFIG_NDS_ROM8BIT -mcpu=arm946e-s -mfpu=fpe3 -DEMBED -D__PIC__ -fpic -msingle-pic-base -Dlinux -D__linux__ -Dunix -D__uClinux__ -Wall -W",
 
    # Linker flags for building an executable
-   'LDFLAGS'    =>  "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'ldflags'} -Wl,--as-needed -lfreetype",
+   'LDFLAGS'    =>  "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'ldflags'} -Wl,-elf2flt -D__PIC__ -fpic -msingle-pic-base -mswp-byte-writes",
 
    # Linker flags for building a dynamically loadable module
-   'LDDLFLAGS'  => "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'lddlflags'} -Wl,--as-needed -lfreetype",
+   'LDDLFLAGS'  => "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'lddlflags'} -Wl,-elf2flt -D__PIC__ -fpic -msingle-pic-base -mswp-byte-writes",
 
    # Install PerlMagick binary into ImageMagick bin directory
-   'INSTALLBIN'	=> '/usr/bin',
+   'INSTALLBIN'	=> '/nonexistent/bin',
 
    # Library specification
-   'LIBS'	=> [ '-L/usr/lib -L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand' ],
+   'LIBS'	=> [ '-L/nonexistent/lib -L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand' ],
 
    # Perl binary name (if a Perl binary is built)
    'MAP_TARGET'	=> 'PerlMagick',
@@ -86,10 +86,10 @@
    # 'OPTIMIZE'	=> '',
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC'	=> ' -fopenmp',
+   'PERLMAINCC'	=> 'ucfront-gcc arm-linux-elf-gcc  ',
 
    # Set Perl installation prefix to ImageMagick installation prefix
-#   'PREFIX'	=> '/usr',
+#   'PREFIX'	=> '/nonexistent',
 
    # Include delegate directories in tests
    test		=> { TESTS	=>	$delegate_tests},
@@ -111,7 +111,7 @@
      # tries to insert our library path first. Also, use the same compiler used
      # to build perlmain.c to link so that a C++ compiler may be used if
      # necessary.
-     $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD   = \$(PERLMAINCC) -L/usr/lib: ;
+     $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD   = \$(PERLMAINCC) -L/nonexistent/lib: ;
      $inherited;
  }
 

Modified: trunk/user/imagemagick/src/magick/magick-config.h
==============================================================================
--- trunk/user/imagemagick/src/magick/magick-config.h	(original)
+++ trunk/user/imagemagick/src/magick/magick-config.h	Mon Jul 28 21:37:50 2008
@@ -6,14 +6,10 @@
 /* config/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES 
-#define MAGICKCORE_BUILD_MODULES  1 
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
-#ifndef MAGICKCORE_BZLIB_DELEGATE 
-#define MAGICKCORE_BZLIB_DELEGATE  1 
-#endif
+/* #undef BZLIB_DELEGATE */
 
 /* Define if you have CAIRO library */
 /* #undef CAIRO_DELEGATE */
@@ -22,11 +18,13 @@
 /* #undef CIPHER_SUPPORT */
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
-/* #undef CLOSEDIR_VOID */
+#ifndef MAGICKCORE_CLOSEDIR_VOID 
+#define MAGICKCORE_CLOSEDIR_VOID  1 
+#endif
 
 /* Location of coder modules */
 #ifndef MAGICKCORE_CODER_PATH 
-#define MAGICKCORE_CODER_PATH  "/usr/lib/ImageMagick-6.4.2/modules-Q16/coders/" 
+#define MAGICKCORE_CODER_PATH  "/nonexistent/lib/ImageMagick-6.4.2/modules-Q16/coders/" 
 #endif
 
 /* Subdirectory of lib where coder modules are installed */
@@ -36,7 +34,7 @@
 
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH 
-#define MAGICKCORE_CONFIGURE_PATH  "/usr/lib/ImageMagick-6.4.2/config/" 
+#define MAGICKCORE_CONFIGURE_PATH  "/nonexistent/lib/ImageMagick-6.4.2/config/" 
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.
@@ -50,7 +48,7 @@
 
 /* Directory where ImageMagick documents live. */
 #ifndef MAGICKCORE_DOCUMENTATION_PATH 
-#define MAGICKCORE_DOCUMENTATION_PATH  "/usr/share/doc/ImageMagick-6.4.2/" 
+#define MAGICKCORE_DOCUMENTATION_PATH  "/nonexistent/share/doc/ImageMagick-6.4.2/" 
 #endif
 
 /* Define if you have Display Postscript */
@@ -58,19 +56,21 @@
 
 /* Build self-contained, embeddable, zero-configuration ImageMagick
    (experimental) */
-/* #undef EMBEDDABLE_SUPPORT */
+#ifndef MAGICKCORE_EMBEDDABLE_SUPPORT 
+#define MAGICKCORE_EMBEDDABLE_SUPPORT  1 
+#endif
 
 /* exclude deprecated methods in MagickCore API */
 /* #undef EXCLUDE_DEPRECATED */
 
 /* Directory where executables are installed. */
 #ifndef MAGICKCORE_EXECUTABLE_PATH 
-#define MAGICKCORE_EXECUTABLE_PATH  "/usr/bin/" 
+#define MAGICKCORE_EXECUTABLE_PATH  "/nonexistent/bin/" 
 #endif
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH 
-#define MAGICKCORE_FILTER_PATH  "/usr/lib/ImageMagick-6.4.2/modules-Q16/filters/" 
+#define MAGICKCORE_FILTER_PATH  "/nonexistent/lib/ImageMagick-6.4.2/modules-Q16/filters/" 
 #endif
 
 /* Subdirectory of lib where filter modules are installed */
@@ -79,67 +79,43 @@
 #endif
 
 /* Define if you have FONTCONFIG library */
-#ifndef MAGICKCORE_FONTCONFIG_DELEGATE 
-#define MAGICKCORE_FONTCONFIG_DELEGATE  1 
-#endif
+/* #undef FONTCONFIG_DELEGATE */
 
 /* Define if you have FlashPIX library */
 /* #undef FPX_DELEGATE */
 
 /* Define if you have FreeType (TrueType font) library */
-#ifndef MAGICKCORE_FREETYPE_DELEGATE 
-#define MAGICKCORE_FREETYPE_DELEGATE  1 
-#endif
+/* #undef FREETYPE_DELEGATE */
 
 /* Define if you have Ghostscript library or framework */
-#ifndef MAGICKCORE_GS_DELEGATE 
-#define MAGICKCORE_GS_DELEGATE  1 
-#endif
+/* #undef GS_DELEGATE */
 
 /* Define if you have GVC library */
-#ifndef MAGICKCORE_GVC_DELEGATE 
-#define MAGICKCORE_GVC_DELEGATE  1 
-#endif
+/* #undef GVC_DELEGATE */
 
 /* Define to 1 if you have the `argz_add' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_ADD 
-#define MAGICKCORE_HAVE_ARGZ_ADD  1 
-#endif
+/* #undef HAVE_ARGZ_ADD */
 
 /* Define to 1 if you have the `argz_append' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_APPEND 
-#define MAGICKCORE_HAVE_ARGZ_APPEND  1 
-#endif
+/* #undef HAVE_ARGZ_APPEND */
 
 /* Define to 1 if you have the `argz_count' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_COUNT 
-#define MAGICKCORE_HAVE_ARGZ_COUNT  1 
-#endif
+/* #undef HAVE_ARGZ_COUNT */
 
 /* Define to 1 if you have the `argz_create_sep' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_CREATE_SEP 
-#define MAGICKCORE_HAVE_ARGZ_CREATE_SEP  1 
-#endif
+/* #undef HAVE_ARGZ_CREATE_SEP */
 
 /* Define to 1 if you have the <argz.h> header file. */
-#ifndef MAGICKCORE_HAVE_ARGZ_H 
-#define MAGICKCORE_HAVE_ARGZ_H  1 
-#endif
+/* #undef HAVE_ARGZ_H */
 
 /* Define to 1 if you have the `argz_insert' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_INSERT 
-#define MAGICKCORE_HAVE_ARGZ_INSERT  1 
-#endif
+/* #undef HAVE_ARGZ_INSERT */
 
 /* Define to 1 if you have the `argz_next' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_NEXT 
-#define MAGICKCORE_HAVE_ARGZ_NEXT  1 
-#endif
+/* #undef HAVE_ARGZ_NEXT */
 
 /* Define to 1 if you have the `argz_stringify' function. */
-#ifndef MAGICKCORE_HAVE_ARGZ_STRINGIFY 
-#define MAGICKCORE_HAVE_ARGZ_STRINGIFY  1 
-#endif
+/* #undef HAVE_ARGZ_STRINGIFY */
 
 /* Define to 1 if you have the <arm/limits.h> header file. */
 /* #undef HAVE_ARM_LIMITS_H */
@@ -160,7 +136,9 @@
 #endif
 
 /* Define to 1 if you have the `clock_gettime' function. */
-/* #undef HAVE_CLOCK_GETTIME */
+#ifndef MAGICKCORE_HAVE_CLOCK_GETTIME 
+#define MAGICKCORE_HAVE_CLOCK_GETTIME  1 
+#endif
 
 /* Define to 1 if you have the `closedir' function. */
 #ifndef MAGICKCORE_HAVE_CLOSEDIR 
@@ -208,9 +186,7 @@
 /* #undef HAVE_DLD_H */
 
 /* Define to 1 if you have the `dlerror' function. */
-#ifndef MAGICKCORE_HAVE_DLERROR 
-#define MAGICKCORE_HAVE_DLERROR  1 
-#endif
+/* #undef HAVE_DLERROR */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #ifndef MAGICKCORE_HAVE_DLFCN_H 
@@ -232,9 +208,7 @@
 #endif
 
 /* Define to 1 if the system has the type `error_t'. */
-#ifndef MAGICKCORE_HAVE_ERROR_T 
-#define MAGICKCORE_HAVE_ERROR_T  1 
-#endif
+/* #undef HAVE_ERROR_T */
 
 /* Define to 1 if you have the `execvp' function. */
 #ifndef MAGICKCORE_HAVE_EXECVP 
@@ -260,9 +234,7 @@
 #endif
 
 /* Define to 1 if you have the <ft2build.h> header file. */
-#ifndef MAGICKCORE_HAVE_FT2BUILD_H 
-#define MAGICKCORE_HAVE_FT2BUILD_H  1 
-#endif
+/* #undef HAVE_FT2BUILD_H */
 
 /* Define to 1 if you have the `ftime' function. */
 #ifndef MAGICKCORE_HAVE_FTIME 
@@ -308,22 +280,16 @@
 #endif
 
 /* Define if you have the <lcms.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS_H 
-#define MAGICKCORE_HAVE_LCMS_H  1 
-#endif
+/* #undef HAVE_LCMS_H */
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
 
 /* Define if you have the libdl library or equivalent. */
-#ifndef MAGICKCORE_HAVE_LIBDL 
-#define MAGICKCORE_HAVE_LIBDL  1 
-#endif
+/* #undef HAVE_LIBDL */
 
 /* Define if libdlloader will be built on this platform */
-#ifndef MAGICKCORE_HAVE_LIBDLLOADER 
-#define MAGICKCORE_HAVE_LIBDLLOADER  1 
-#endif
+/* #undef HAVE_LIBDLLOADER */
 
 /* Define to 1 if you have the `gcov' library (-lgcov). */
 /* #undef HAVE_LIBGCOV */
@@ -340,15 +306,11 @@
 
 /* Define to 1 if the type `long double' works and has more range or precision
    than `double'. */
-#ifndef MAGICKCORE_HAVE_LONG_DOUBLE 
-#define MAGICKCORE_HAVE_LONG_DOUBLE  1 
-#endif
+/* #undef HAVE_LONG_DOUBLE */
 
 /* Define to 1 if the type `long double' works and has more range or precision
    than `double'. */
-#ifndef MAGICKCORE_HAVE_LONG_DOUBLE_WIDER 
-#define MAGICKCORE_HAVE_LONG_DOUBLE_WIDER  1 
-#endif
+/* #undef HAVE_LONG_DOUBLE_WIDER */
 
 /* Define to 1 if you have the `lstat' function. */
 #ifndef MAGICKCORE_HAVE_LSTAT 
@@ -361,9 +323,7 @@
 #endif
 
 /* Define this if a modern libltdl is already installed */
-#ifndef MAGICKCORE_HAVE_LTDL 
-#define MAGICKCORE_HAVE_LTDL  1 
-#endif
+/* #undef HAVE_LTDL */
 
 /* Define to 1 if you have the <machine/param.h> header file. */
 /* #undef HAVE_MACHINE_PARAM_H */
@@ -387,14 +347,10 @@
 #endif
 
 /* Define to 1 if you have a working `mmap' system call. */
-#ifndef MAGICKCORE_HAVE_MMAP 
-#define MAGICKCORE_HAVE_MMAP  1 
-#endif
+/* #undef HAVE_MMAP */
 
 /* Define to 1 if you have a working `mmap' system call. */
-#ifndef MAGICKCORE_HAVE_MMAP_FILEIO 
-#define MAGICKCORE_HAVE_MMAP_FILEIO  1 
-#endif
+/* #undef HAVE_MMAP_FILEIO */
 
 /* Define to 1 if you have the `munmap' function. */
 #ifndef MAGICKCORE_HAVE_MUNMAP 
@@ -430,9 +386,7 @@
 #endif
 
 /* Define to 1 if you have the `posix_fallocate' function. */
-#ifndef MAGICKCORE_HAVE_POSIX_FALLOCATE 
-#define MAGICKCORE_HAVE_POSIX_FALLOCATE  1 
-#endif
+/* #undef HAVE_POSIX_FALLOCATE */
 
 /* Define to 1 if you have the `pow' function. */
 /* #undef HAVE_POW */
@@ -503,14 +457,10 @@
 #endif
 
 /* X11 server supports shape extension */
-#ifndef MAGICKCORE_HAVE_SHAPE 
-#define MAGICKCORE_HAVE_SHAPE  1 
-#endif
+/* #undef HAVE_SHAPE */
 
 /* X11 server supports shared memory extension */
-#ifndef MAGICKCORE_HAVE_SHARED_MEMORY 
-#define MAGICKCORE_HAVE_SHARED_MEMORY  1 
-#endif
+/* #undef HAVE_SHARED_MEMORY */
 
 /* Define if you have the shl_load function. */
 /* #undef HAVE_SHL_LOAD */
@@ -599,10 +549,14 @@
 #endif
 
 /* Define to 1 if you have the `strlcat' function. */
-/* #undef HAVE_STRLCAT */
+#ifndef MAGICKCORE_HAVE_STRLCAT 
+#define MAGICKCORE_HAVE_STRLCAT  1 
+#endif
 
 /* Define to 1 if you have the `strlcpy' function. */
-/* #undef HAVE_STRLCPY */
+#ifndef MAGICKCORE_HAVE_STRLCPY 
+#define MAGICKCORE_HAVE_STRLCPY  1 
+#endif
 
 /* Define to 1 if you have the `strncasecmp' function. */
 #ifndef MAGICKCORE_HAVE_STRNCASECMP 
@@ -714,44 +668,28 @@
 #endif
 
 /* Define to 1 if you have the <tiffconf.h> header file. */
-#ifndef MAGICKCORE_HAVE_TIFFCONF_H 
-#define MAGICKCORE_HAVE_TIFFCONF_H  1 
-#endif
+/* #undef HAVE_TIFFCONF_H */
 
 /* Define to 1 if you have the `TIFFGetConfiguredCODECs' function. */
-#ifndef MAGICKCORE_HAVE_TIFFGETCONFIGUREDCODECS 
-#define MAGICKCORE_HAVE_TIFFGETCONFIGUREDCODECS  1 
-#endif
+/* #undef HAVE_TIFFGETCONFIGUREDCODECS */
 
 /* Define to 1 if you have the `TIFFMergeFieldInfo' function. */
-#ifndef MAGICKCORE_HAVE_TIFFMERGEFIELDINFO 
-#define MAGICKCORE_HAVE_TIFFMERGEFIELDINFO  1 
-#endif
+/* #undef HAVE_TIFFMERGEFIELDINFO */
 
 /* Define to 1 if you have the `TIFFReadEXIFDirectory' function. */
-#ifndef MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY 
-#define MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY  1 
-#endif
+/* #undef HAVE_TIFFREADEXIFDIRECTORY */
 
 /* Define to 1 if you have the `TIFFSetErrorHandlerExt' function. */
-#ifndef MAGICKCORE_HAVE_TIFFSETERRORHANDLEREXT 
-#define MAGICKCORE_HAVE_TIFFSETERRORHANDLEREXT  1 
-#endif
+/* #undef HAVE_TIFFSETERRORHANDLEREXT */
 
 /* Define to 1 if you have the `TIFFSetTagExtender' function. */
-#ifndef MAGICKCORE_HAVE_TIFFSETTAGEXTENDER 
-#define MAGICKCORE_HAVE_TIFFSETTAGEXTENDER  1 
-#endif
+/* #undef HAVE_TIFFSETTAGEXTENDER */
 
 /* Define to 1 if you have the `TIFFSetWarningHandlerExt' function. */
-#ifndef MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT 
-#define MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT  1 
-#endif
+/* #undef HAVE_TIFFSETWARNINGHANDLEREXT */
 
 /* Define to 1 if you have the `TIFFSwabArrayOfTriples' function. */
-#ifndef MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES 
-#define MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES  1 
-#endif
+/* #undef HAVE_TIFFSWABARRAYOFTRIPLES */
 
 /* Define to 1 if you have the `times' function. */
 #ifndef MAGICKCORE_HAVE_TIMES 
@@ -789,9 +727,7 @@
 #endif
 
 /* This value is set to 1 to indicate that the system argz facility works */
-#ifndef MAGICKCORE_HAVE_WORKING_ARGZ 
-#define MAGICKCORE_HAVE_WORKING_ARGZ  1 
-#endif
+/* #undef HAVE_WORKING_ARGZ */
 
 /* Define to 1 if the system has the type `_Bool'. */
 #ifndef MAGICKCORE_HAVE__BOOL 
@@ -830,9 +766,7 @@
 /* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
-#ifndef MAGICKCORE_JP2_DELEGATE 
-#define MAGICKCORE_JP2_DELEGATE  1 
-#endif
+/* #undef JP2_DELEGATE */
 
 /* Define if you have JPEG library */
 #ifndef MAGICKCORE_JPEG_DELEGATE 
@@ -840,13 +774,11 @@
 #endif
 
 /* Define if you have LCMS library */
-#ifndef MAGICKCORE_LCMS_DELEGATE 
-#define MAGICKCORE_LCMS_DELEGATE  1 
-#endif
+/* #undef LCMS_DELEGATE */
 
 /* Directory where architecture-dependent files live. */
 #ifndef MAGICKCORE_LIBRARY_PATH 
-#define MAGICKCORE_LIBRARY_PATH  "/usr/lib/ImageMagick-6.4.2/" 
+#define MAGICKCORE_LIBRARY_PATH  "/nonexistent/lib/ImageMagick-6.4.2/" 
 #endif
 
 /* Subdirectory of lib where ImageMagick architecture dependent files are
@@ -859,21 +791,19 @@
 /* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
-#ifndef MAGICKCORE_LTDL_DELEGATE 
-#define MAGICKCORE_LTDL_DELEGATE  1 
-#endif
+/* #undef LTDL_DELEGATE */
 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
-/* #undef LTDL_DLOPEN_DEPLIBS */
+#ifndef MAGICKCORE_LTDL_DLOPEN_DEPLIBS 
+#define MAGICKCORE_LTDL_DLOPEN_DEPLIBS  1 
+#endif
 
 /* Define if dlopen(NULL) is able to resolve symbols from the main program. */
-#ifndef MAGICKCORE_LTDL_DLOPEN_SELF_WORKS 
-#define MAGICKCORE_LTDL_DLOPEN_SELF_WORKS  1 
-#endif
+/* #undef LTDL_DLOPEN_SELF_WORKS */
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH 
-#define MAGICKCORE_LT_DLSEARCH_PATH  "/lib:/usr/lib:/usr/lib/atlas:/usr/lib64/atlas:/usr/local/lib:/usr/lib/mysql:/usr/lib64/mysql:/usr/lib64/octave-3.0.1:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5:/usr/lib/xulrunner-1.9:/usr/lib64/xulrunner-1.9" 
+#define MAGICKCORE_LT_DLSEARCH_PATH  "/lib:/usr/lib" 
 #endif
 
 /* Define to the extension used for runtime loadable modules, say, ".so". */
@@ -883,9 +813,7 @@
 
 /* Define to the name of the environment variable that determines the run-time
    module search path. */
-#ifndef MAGICKCORE_LT_MODULE_PATH_VAR 
-#define MAGICKCORE_LT_MODULE_PATH_VAR  "LD_LIBRARY_PATH" 
-#endif
+/* #undef LT_MODULE_PATH_VAR */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
@@ -909,9 +837,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-#ifndef MAGICKCORE_OPENEXR_DELEGATE 
-#define MAGICKCORE_OPENEXR_DELEGATE  1 
-#endif
+/* #undef OPENEXR_DELEGATE */
 
 /* Name of package */
 #ifndef MAGICKCORE_PACKAGE 
@@ -985,7 +911,7 @@
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHARE_CONFIGURE_PATH 
-#define MAGICKCORE_SHARE_CONFIGURE_PATH  "/usr/share/ImageMagick-6.4.2/config/" 
+#define MAGICKCORE_SHARE_CONFIGURE_PATH  "/nonexistent/share/ImageMagick-6.4.2/config/" 
 #endif
 
 /* Subdirectory of lib where architecture-independent configuration files
@@ -996,12 +922,12 @@
 
 /* Directory where architecture-independent files live. */
 #ifndef MAGICKCORE_SHARE_PATH 
-#define MAGICKCORE_SHARE_PATH  "/usr/share/ImageMagick-6.4.2/" 
+#define MAGICKCORE_SHARE_PATH  "/nonexistent/share/ImageMagick-6.4.2/" 
 #endif
 
 /* The size of `off_t', as computed by sizeof. */
 #ifndef MAGICKCORE_SIZEOF_OFF_T 
-#define MAGICKCORE_SIZEOF_OFF_T  8 
+#define MAGICKCORE_SIZEOF_OFF_T  4 
 #endif
 
 /* The size of `signed int', as computed by sizeof. */
@@ -1011,7 +937,7 @@
 
 /* The size of `signed long', as computed by sizeof. */
 #ifndef MAGICKCORE_SIZEOF_SIGNED_LONG 
-#define MAGICKCORE_SIZEOF_SIGNED_LONG  8 
+#define MAGICKCORE_SIZEOF_SIGNED_LONG  4 
 #endif
 
 /* The size of `signed long long', as computed by sizeof. */
@@ -1026,7 +952,7 @@
 
 /* The size of `size_t', as computed by sizeof. */
 #ifndef MAGICKCORE_SIZEOF_SIZE_T 
-#define MAGICKCORE_SIZEOF_SIZE_T  8 
+#define MAGICKCORE_SIZEOF_SIZE_T  4 
 #endif
 
 /* The size of `unsigned int', as computed by sizeof. */
@@ -1036,12 +962,12 @@
 
 /* The size of `unsigned int*', as computed by sizeof. */
 #ifndef MAGICKCORE_SIZEOF_UNSIGNED_INTP 
-#define MAGICKCORE_SIZEOF_UNSIGNED_INTP  8 
+#define MAGICKCORE_SIZEOF_UNSIGNED_INTP  4 
 #endif
 
 /* The size of `unsigned long', as computed by sizeof. */
 #ifndef MAGICKCORE_SIZEOF_UNSIGNED_LONG 
-#define MAGICKCORE_SIZEOF_UNSIGNED_LONG  8 
+#define MAGICKCORE_SIZEOF_UNSIGNED_LONG  4 
 #endif
 
 /* The size of `unsigned long long', as computed by sizeof. */
@@ -1063,9 +989,7 @@
 #endif
 
 /* Define if you have TIFF library */
-#ifndef MAGICKCORE_TIFF_DELEGATE 
-#define MAGICKCORE_TIFF_DELEGATE  1 
-#endif
+/* #undef TIFF_DELEGATE */
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #ifndef MAGICKCORE_TIME_WITH_SYS_TIME 
@@ -1087,9 +1011,7 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have wmflite library */
-#ifndef MAGICKCORE_WMFLITE_DELEGATE 
-#define MAGICKCORE_WMFLITE_DELEGATE  1 
-#endif
+/* #undef WMFLITE_DELEGATE */
 
 /* Define if you have wmf library */
 /* #undef WMF_DELEGATE */
@@ -1108,17 +1030,15 @@
 #endif
 
 /* Define if you have X11 library */
-#ifndef MAGICKCORE_X11_DELEGATE 
-#define MAGICKCORE_X11_DELEGATE  1 
-#endif
+/* #undef X11_DELEGATE */
 
 /* Define if you have XML library */
-#ifndef MAGICKCORE_XML_DELEGATE 
-#define MAGICKCORE_XML_DELEGATE  1 
-#endif
+/* #undef XML_DELEGATE */
 
 /* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
+#ifndef MAGICKCORE_X_DISPLAY_MISSING 
+#define MAGICKCORE_X_DISPLAY_MISSING  1 
+#endif
 
 /* Define if you have zlib compression library */
 #ifndef MAGICKCORE_ZLIB_DELEGATE 
@@ -1126,9 +1046,7 @@
 #endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
-#ifndef MAGICKCORE__FILE_OFFSET_BITS 
-#define MAGICKCORE__FILE_OFFSET_BITS  64 
-#endif
+/* #undef _FILE_OFFSET_BITS */
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 /* #undef _LARGEFILE_SOURCE */
@@ -1174,7 +1092,9 @@
 
 
 /* Define so that glibc/gnulib argp.h does not typedef error_t. */
-/* #undef __error_t_defined */
+#ifndef MAGICKCORE___error_t_defined 
+#define MAGICKCORE___error_t_defined  1 
+#endif
 
 /* Define to appropriate substitue if compiler does not have __func__ */
 /* #undef __func__ */
@@ -1183,7 +1103,9 @@
 /* #undef const */
 
 /* Define to a type to use for `error_t' if it is not otherwise available. */
-/* #undef error_t */
+#ifndef _magickcore_error_t 
+#define _magickcore_error_t  int 
+#endif
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */

Modified: trunk/user/imagemagick/src/magick/version.h
==============================================================================
--- trunk/user/imagemagick/src/magick/version.h	(original)
+++ trunk/user/imagemagick/src/magick/version.h	Mon Jul 28 21:37:50 2008
@@ -46,7 +46,7 @@
 #define MagickQuantumDepth  "Q?"
 #define MagickQuantumRange  "?"
 #endif
-#define MagickReleaseDate  "07/14/08"
+#define MagickReleaseDate  "07/28/08"
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
 #define MagickHDRISupport ""
 #else
@@ -61,7 +61,7 @@
 #define MagickVersion MagickPackageName " " MagickLibVersionText " " \
   MagickReleaseDate " " MagickQuantumDepth " " MagickSupport \
   "http://www.imagemagick.org"
-#define MagickHomeURL  "file:///usr/share/doc/ImageMagick-6.4.2/index.html"
+#define MagickHomeURL  "file:///nonexistent/share/doc/ImageMagick-6.4.2/index.html"
 
 extern MagickExport char
   *GetMagickHomeURL(void);

Modified: trunk/user/imagemagick/src/utilities/ImageMagick.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/ImageMagick.1	(original)
+++ trunk/user/imagemagick/src/utilities/ImageMagick.1	Mon Jul 28 21:37:50 2008
@@ -61,9 +61,9 @@
 
 interprets and executes scripts written in the Magick Scripting Language (MSL).
 .PP
-For more information about the ImageMagick, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/index.html or http://www.imagemagick.org/.
 .SH SEE-ALSO
 convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/animate.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/animate.1	(original)
+++ trunk/user/imagemagick/src/utilities/animate.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools.  Use it to animate an image or image sequence on any X server.
 
-For more information about the animate command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/animate.html or http://www.imagemagick.org/script/animate.php.
 .SH DESCRIPTION
 Image Settings:
   -authenticate value  decrypt image with this password
@@ -92,4 +92,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/compare.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/compare.1	(original)
+++ trunk/user/imagemagick/src/utilities/compare.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction.
 
-For more information about the compare command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/compare.html or http://www.imagemagick.org/script/compare.php.
 .SH DESCRIPTION
 Image Settings:
   -authenticate value  decrypt image with this password
@@ -58,4 +58,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/composite.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/composite.1	(original)
+++ trunk/user/imagemagick/src/utilities/composite.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another.
 
-For more information about the composite command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/composite.html or http://www.imagemagick.org/script/composite.php.
 .SH DESCRIPTION
 Image Settings:
   -affine matrix       affine transform matrix
@@ -100,4 +100,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/conjure.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/conjure.1	(original)
+++ trunk/user/imagemagick/src/utilities/conjure.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
 
-For more information about the conjure command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
 .SH DESCRIPTION
 Image Settings:
   -monitor             monitor progress
@@ -31,4 +31,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/convert.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/convert.1	(original)
+++ trunk/user/imagemagick/src/utilities/convert.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
 
-For more information about the convert command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/convert.html or http://www.imagemagick.org/script/convert.php.
 .SH DESCRIPTION
 Image Settings:
   -adjoin              join images into a single multi-image file
@@ -245,4 +245,4 @@
 ImageMagick(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/display.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/display.1	(original)
+++ trunk/user/imagemagick/src/utilities/display.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools.  Use it to display an image or image sequence on any X server.
 
-For more information about the display command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/display.html or http://www.imagemagick.org/script/display.php.
 .SH DESCRIPTION
 Image Settings:
   -antialias           remove pixel-aliasing
@@ -122,4 +122,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/identify.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/identify.1	(original)
+++ trunk/user/imagemagick/src/utilities/identify.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools.  It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image, the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
 
-For more information about the identify command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/identify.html or http://www.imagemagick.org/script/identify.php.
 .SH DESCRIPTION
 Image Settings:
   -antialias           remove pixel-aliasing
@@ -55,4 +55,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/import.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/import.1	(original)
+++ trunk/user/imagemagick/src/utilities/import.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBimport\fP program is a member of the ImageMagick(1) suite of tools.  Use it to capture some or all of an X server screen and save the image to a file.
 
-For more information about the import command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/import.html or http://www.imagemagick.org/script/import.php.
 .SH DESCRIPTION
 Image Settings:
   -adjoin              join images into a single multi-image file
@@ -92,4 +92,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/mogrify.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/mogrify.1	(original)
+++ trunk/user/imagemagick/src/utilities/mogrify.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools.  Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
 
-For more information about the mogrify command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
 .SH DESCRIPTION
 Image Settings:
   -adjoin              join images into a single multi-image file
@@ -225,4 +225,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/montage.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/montage.1	(original)
+++ trunk/user/imagemagick/src/utilities/montage.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools.  Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
 
-For more information about the montage command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/montage.html or http://www.imagemagick.org/script/montage.php.
 .SH DESCRIPTION
 Image Settings:
   -adjoin              join images into a single multi-image file
@@ -117,4 +117,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

Modified: trunk/user/imagemagick/src/utilities/stream.1
==============================================================================
--- trunk/user/imagemagick/src/utilities/stream.1	(original)
+++ trunk/user/imagemagick/src/utilities/stream.1	Mon Jul 28 21:37:50 2008
@@ -7,7 +7,7 @@
 .SH OVERVIEW
 \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.  It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
 
-For more information about the stream command, point your browser to file:///usr/share/doc/ImageMagick-6.4.2/www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///nonexistent/share/doc/ImageMagick-6.4.2/www/stream.html or http://www.imagemagick.org/script/stream.php.
 .SH DESCRIPTION
 Image Settings:
   -authenticate value  decrypt image with this password
@@ -53,4 +53,4 @@
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2008 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///nonexistent/share/doc/ImageMagick-6.4.2/www/license.php or http://www.imagemagick.org/script/license.php\fP

More information about the dslinux-commit mailing list