*** misc/freetype-2.0.5/builds/compiler/visualc.mk	Wed Dec 13 17:44:33 2000
--- misc/build/freetype-2.0.5/builds/compiler/visualc.mk	Wed Jun 19 21:51:31 2002
***************
*** 63,69 ****
  #   ANSI compliance.
  #
  ifndef CFLAGS
!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX
  endif
  
  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
--- 63,69 ----
  #   ANSI compliance.
  #
  ifndef CFLAGS
!   CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
  endif
  
  # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
*** misc/freetype-2.0.5/builds/unix/configure	Fri Jun  8 16:17:27 2001
--- misc/build/freetype-2.0.5/builds/unix/configure	Wed Jun 19 21:51:31 2002
***************
*** 5590,5596 ****
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
      #        yet detect zsh echo's removal of \ escapes.
!     archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
--- 5590,5596 ----
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
      #        yet detect zsh echo's removal of \ escapes.
!     archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -flat_namespace -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
*** misc/freetype-2.0.5/builds/unix/ltmain.sh	Thu Jun  7 12:36:17 2001
--- misc/build/freetype-2.0.5/builds/unix/ltmain.sh	Wed Jun 19 21:51:31 2002
***************
*** 631,637 ****
      if test "$build_old_libs" = yes; then
        if test "$pic_mode" != yes; then
  	# Don't build PIC code
! 	command="$base_compile $srcfile"
        else
  	# All platforms use -DPIC, to notify preprocessed assembler code.
  	command="$base_compile $srcfile $pic_flag -DPIC"
--- 631,637 ----
      if test "$build_old_libs" = yes; then
        if test "$pic_mode" != yes; then
  	# Don't build PIC code
! 	command="$base_compile $srcfile -DPIC $pic_flag"
        else
  	# All platforms use -DPIC, to notify preprocessed assembler code.
  	command="$base_compile $srcfile $pic_flag -DPIC"
***************
*** 2251,2257 ****
  	  ;;
  
  	irix)
! 	  major=`expr $current - $age + 1`
  	  verstring="sgi$major.$revision"
  
  	  # Add in all the interfaces that we are compatible with.
--- 2251,2257 ----
  	  ;;
  
  	irix)
! 	  major=`expr $current - $age`
  	  verstring="sgi$major.$revision"
  
  	  # Add in all the interfaces that we are compatible with.
*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h	Mon Jan  1 11:25:21 2001
--- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h	Wed Jun 19 21:51:31 2002
***************
*** 1,7 ****
--- 1,9 ----
  FT_USE_MODULE(autohint_module_class)
  FT_USE_MODULE(cff_driver_class)
  FT_USE_MODULE(t1cid_driver_class)
+ /*
  FT_USE_MODULE(pcf_driver_class)
+ */
  FT_USE_MODULE(psaux_module_class)
  FT_USE_MODULE(psnames_module_class)
  FT_USE_MODULE(ft_raster1_renderer_class)
***************
*** 9,12 ****
--- 11,16 ----
  FT_USE_MODULE(ft_smooth_renderer_class)
  FT_USE_MODULE(tt_driver_class)
  FT_USE_MODULE(t1_driver_class)
+ /*
  FT_USE_MODULE(winfnt_driver_class)
+ */
*** misc/freetype-2.0.5/include/freetype/config/ftoption.h	Tue Aug 21 03:50:45 2001
--- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h	Wed Jun 19 21:51:31 2002
***************
*** 70,76 ****
--- 70,79 ----
    /*   All convenience functions are declared as such in their             */
    /*   documentation.                                                      */
    /*                                                                       */
+ /*
  #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
+ */
+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
  
  
    /*************************************************************************/
***************
*** 108,115 ****
    /*   use a vector `plotter' format that isn't supported when this        */
    /*   macro is undefined.                                                 */
    /*                                                                       */
  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
! 
  
    /*************************************************************************/
    /*                                                                       */
--- 111,120 ----
    /*   use a vector `plotter' format that isn't supported when this        */
    /*   macro is undefined.                                                 */
    /*                                                                       */
+ /*
  #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
! */
! #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
  
    /*************************************************************************/
    /*                                                                       */