diff -Nbcr clearsilver-0.9.13/Makefile clearsilver-0.9.14/Makefile
*** clearsilver-0.9.13/Makefile	Wed Sep 29 18:09:41 2004
--- clearsilver-0.9.14/Makefile	Tue Mar  8 09:58:35 2005
***************
*** 107,114 ****
  		mkdir -p $$mdir; \
  	done
  
! CS_DISTDIR = clearsilver-0.9.12
! CS_LABEL = CLEARSILVER-0_9_12
  CS_FILES = README README.python INSTALL LICENSE CS_LICENSE rules.mk.in Makefile util cs cgi python scripts mod_ecs imd java-jni perl ruby dso csharp acconfig.h autogen.sh config.guess config.sub configure.in cs_config.h.in mkinstalldirs install-sh ClearSilver.h ports contrib
  cs_dist:
  	@if cvs log Makefile | grep "${CS_LABEL}"; then \
--- 107,114 ----
  		mkdir -p $$mdir; \
  	done
  
! CS_DISTDIR = clearsilver-0.9.14
! CS_LABEL = CLEARSILVER-0_9_14
  CS_FILES = README README.python INSTALL LICENSE CS_LICENSE rules.mk.in Makefile util cs cgi python scripts mod_ecs imd java-jni perl ruby dso csharp acconfig.h autogen.sh config.guess config.sub configure.in cs_config.h.in mkinstalldirs install-sh ClearSilver.h ports contrib
  cs_dist:
  	@if cvs log Makefile | grep "${CS_LABEL}"; then \
diff -Nbcr clearsilver-0.9.13/cgi/Makefile clearsilver-0.9.14/cgi/Makefile
*** clearsilver-0.9.13/cgi/Makefile	Thu Jul 24 22:46:11 2003
--- clearsilver-0.9.14/cgi/Makefile	Tue Jan 11 13:55:41 2005
***************
*** 16,22 ****
  STATIC_CSO = $(STATIC_EXE:%.cgi=%.cso)
  
  DLIBS += -lneo_cgi -lneo_cs -lneo_utl # -lefence
- LIBS += -L$(LIB_DIR) $(DLIBS)
  
  TARGETS = $(CGI_LIB) $(STATIC_EXE) $(STATIC_CSO)
  
--- 16,21 ----
***************
*** 27,36 ****
  	$(RANLIB) $@
  
  $(STATIC_EXE): $(STATIC_OBJ) $(DEP_LIBS)
! 	$(LD) $@ $(STATIC_OBJ) $(LIBS)
  
  $(STATIC_CSO): $(STATIC_OBJ) $(DEP_LIBS)
! 	$(LDSHARED) -o $@ $(STATIC_OBJ) $(LIBS)
  
  install: all
  	$(NEOTONIC_ROOT)mkinstalldirs $(DESTDIR)$(cs_includedir)/cgi
--- 26,35 ----
  	$(RANLIB) $@
  
  $(STATIC_EXE): $(STATIC_OBJ) $(DEP_LIBS)
! 	$(LD) $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS)
  
  $(STATIC_CSO): $(STATIC_OBJ) $(DEP_LIBS)
! 	$(LDSHARED) -o $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS)
  
  install: all
  	$(NEOTONIC_ROOT)mkinstalldirs $(DESTDIR)$(cs_includedir)/cgi
diff -Nbcr clearsilver-0.9.13/cgi/cgi.c clearsilver-0.9.14/cgi/cgi.c
*** clearsilver-0.9.13/cgi/cgi.c	Wed Nov 24 14:55:25 2004
--- clearsilver-0.9.14/cgi/cgi.c	Wed Dec 29 09:24:40 2004
***************
*** 670,675 ****
--- 670,684 ----
      if (err != STATUS_OK) return nerr_pass (err);
    }
  
+   {
+     char *d = hdf_get_value(cgi->hdf, "Query.debug_pause", NULL);
+     char *d_p = hdf_get_value(cgi->hdf, "Config.DebugPassword", NULL);
+ 
+     if (d && d_p && !strcmp(d, d_p)) {
+       sleep(20);
+     }
+   }
+ 
  #ifdef ENABLE_REMOTE_DEBUG
    {
      char *display;
diff -Nbcr clearsilver-0.9.13/cgi/cgi.h clearsilver-0.9.14/cgi/cgi.h
*** clearsilver-0.9.13/cgi/cgi.h	Wed Nov 24 14:55:25 2004
--- clearsilver-0.9.14/cgi/cgi.h	Wed Nov 24 15:27:33 2004
***************
*** 453,459 ****
  NEOERR *cgi_html_strip_strfunc(unsigned char *str, unsigned char **ret);
  NEOERR *cgi_html_escape_strfunc(unsigned char *str, unsigned char **ret);
  NEOERR *cgi_js_escape (unsigned char *buf, unsigned char **esc);
! void cgi_html_ws_strip_level(STRING *str, int level);
  NEOERR *cgi_register_strfuncs(CSPARSE *cs);
  
  /* internal use only */
--- 453,459 ----
  NEOERR *cgi_html_strip_strfunc(unsigned char *str, unsigned char **ret);
  NEOERR *cgi_html_escape_strfunc(unsigned char *str, unsigned char **ret);
  NEOERR *cgi_js_escape (unsigned char *buf, unsigned char **esc);
! void cgi_html_ws_strip(STRING *str, int level);
  NEOERR *cgi_register_strfuncs(CSPARSE *cs);
  
  /* internal use only */
diff -Nbcr clearsilver-0.9.13/imd/imd.c clearsilver-0.9.14/imd/imd.c
*** clearsilver-0.9.13/imd/imd.c	Wed Jul 28 15:17:54 2004
--- clearsilver-0.9.14/imd/imd.c	Tue Mar  8 09:52:04 2005
***************
*** 377,383 ****
--- 377,387 ----
  	    dstW = (int) ( ((float)dstH/(float)srcH) * srcW );
  	  }
  
+ #ifdef GD2_VERS
+ 	  dest_im = gdImageCreateTrueColor(dstW,dstH);
+ #else
  	  dest_im = gdImageCreate(dstW,dstH);
+ #endif
  
  	  /* fprintf(stderr,"scaling to (%d,%d)\n",dstW,dstH); */
  
diff -Nbcr clearsilver-0.9.13/java-jni/j_neo_util.c clearsilver-0.9.14/java-jni/j_neo_util.c
*** clearsilver-0.9.13/java-jni/j_neo_util.c	Wed Sep 29 17:23:16 2004
--- clearsilver-0.9.14/java-jni/j_neo_util.c	Wed Nov 24 15:22:12 2004
***************
*** 20,26 ****
  
    if (newExcCls == 0) {
      // unable to find proper class!
!     return;
    }
  
    string_init (&str);
--- 20,26 ----
  
    if (newExcCls == 0) {
      // unable to find proper class!
!     return 0;
    }
  
    string_init (&str);
diff -Nbcr clearsilver-0.9.13/perl/Makefile.PL clearsilver-0.9.14/perl/Makefile.PL
*** clearsilver-0.9.13/perl/Makefile.PL	Fri Apr  4 16:03:54 2003
--- clearsilver-0.9.14/perl/Makefile.PL	Tue Mar  8 09:37:50 2005
***************
*** 8,14 ****
      ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
        (ABSTRACT_FROM => 'ClearSilver.pm', # retrieve abstract from module
         AUTHOR     => 'A. U. Thor <a.u.thor@a.galaxy.far.far.away>') : ()),
!     'LIBS'		=> ['-L../libs -lneo_cs -lneo_utl'], 
      'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
  	# Insert -I. if you add *.h files later:
      'INC'		=> '-I../',
--- 8,14 ----
      ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
        (ABSTRACT_FROM => 'ClearSilver.pm', # retrieve abstract from module
         AUTHOR     => 'A. U. Thor <a.u.thor@a.galaxy.far.far.away>') : ()),
!     'LIBS'		=> ['-L../libs -lneo_cgi -lneo_cs -lneo_utl'], 
      'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
  	# Insert -I. if you add *.h files later:
      'INC'		=> '-I../',
diff -Nbcr clearsilver-0.9.13/ruby/ext/hdf/extconf.rb clearsilver-0.9.14/ruby/ext/hdf/extconf.rb
*** clearsilver-0.9.13/ruby/ext/hdf/extconf.rb	Mon Jul  7 23:10:29 2003
--- clearsilver-0.9.14/ruby/ext/hdf/extconf.rb	Mon Jan 10 18:17:48 2005
***************
*** 5,10 ****
  # dir_config("hdf","../../..","../../../libs")
  dir_config("hdf")
  
! if have_header("ClearSilver.h") && have_library("neo_utl","hdf_init") && have_library("neo_cs","cs_init")
    create_makefile("hdf")
  end
--- 5,12 ----
  # dir_config("hdf","../../..","../../../libs")
  dir_config("hdf")
  
! have_library("z", "deflate")
! 
! if have_header("ClearSilver.h") && have_library("neo_utl","hdf_init") && have_library("neo_cs","cs_init") && have_library("neo_cgi","cgi_register_strfuncs")
    create_makefile("hdf")
  end
diff -Nbcr clearsilver-0.9.13/util/neo_hash.c clearsilver-0.9.14/util/neo_hash.c
*** clearsilver-0.9.13/util/neo_hash.c	Wed Jul 28 15:17:42 2004
--- clearsilver-0.9.14/util/neo_hash.c	Wed Dec 29 09:38:07 2004
***************
*** 280,282 ****
--- 280,293 ----
  {
    return ne_crc((char *)a, strlen((const char *)a));
  }
+ 
+ int ne_hash_int_comp(const void *a, const void *b)
+ {
+   if (a == b) return 1;
+   return 0;
+ }
+ 
+ UINT32 ne_hash_int_hash(const void *a)
+ {
+   return (UINT32)(a);
+ }
diff -Nbcr clearsilver-0.9.13/util/neo_hash.h clearsilver-0.9.14/util/neo_hash.h
*** clearsilver-0.9.13/util/neo_hash.h	Wed Jul 28 15:17:42 2004
--- clearsilver-0.9.14/util/neo_hash.h	Wed Dec 29 09:38:07 2004
***************
*** 49,54 ****
--- 49,57 ----
  int ne_hash_str_comp(const void *a, const void *b);
  UINT32 ne_hash_str_hash(const void *a);
  
+ int ne_hash_int_comp(const void *a, const void *b);
+ UINT32 ne_hash_int_hash(const void *a);
+ 
  __END_DECLS
  
  #endif /* __NEO_HASH_H_ */