Upgrade to 2.7b5

4 files changed, 196 insertions, 61 deletions

diff --git a/www/Mosaic/files/patch-aa b/www/Mosaic/files/patch-aa
index 31da312667f9..be98fd0675af 100644
--- a/www/Mosaic/files/patch-aa
+++ b/www/Mosaic/files/patch-aa
@@ -1,61 +1,122 @@
---- ./makefiles/Makefile.bsdi.org	Tue Mar 26 21:25:13 1996
-+++ ./makefiles/Makefile.bsdi	Tue Apr  9 22:59:08 1996
-@@ -36,11 +36,11 @@
- sysconfigflags = -DMOTIF1_2
- 
- #### System libraries.
--syslibs = -lipc
-+#syslibs = -lipc
- 
- #### X include file locations -- if your platform puts the X include
--xinc = -I/usr/X11/include
--xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lXext -lSM -lICE -lXpm -lX11
-+xinc = -I${X11BASE}/include
-+xlibs = ${MOTIFLIB} -L${X11BASE}/lib -lXmu -lXt -lXext -lSM -lICE -lXpm -lX11
- 
- 
- #### DTM AND HDF SUPPORT; READ CAREFULLY
-@@ -73,10 +73,10 @@
- #### For inline PNG support, the following should be defined:
- #### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95
- 
--pngdir = /xdev/mosaic/libpng/bsdi
-+pngdir = ${LOCALBASE}
- pnglibdir = $(pngdir)/lib
- pngincludedir = $(pngdir)/include
--pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a -lm
-+pnglibs = -L$(pnglibdir) -lpng -lz -lm
- pngflags =  -I$(pngincludedir) -DHAVE_PNG
- 
- #pngdir = /work2/mosaic-libs/libpng
-@@ -90,9 +90,9 @@
- #### For inline JPEG support, the following should be defined:
- #### The library used is Independent JPEG Group (IJG's) 5.0a.
- 
--jpegdir = /work2/mosaic-libs/libjpeg-6
--jpeglibs = $(jpegdir)/libjpeg.a
--jpegflags = -I$(jpegdir) -DHAVE_JPEG
-+jpegdir = ${LOCALBASE}
-+jpeglibs = -L$(jpegdir) -ljpeg
-+jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
- 
- 
- #### KERBEROS SUPPORT
-@@ -154,7 +154,7 @@
- # --------------------- Do Not Modify Below This Line ------------------------
- #
- 
--CFLAGS = -g $(sysconfigflags) $(prereleaseflags)
-+CFLAGS += $(sysconfigflags) $(prereleaseflags)
- 
- # Don't worry about these -- for development purposes only.
- PURIFY = purify
-@@ -185,7 +185,7 @@
- 
- src::
- 	@echo --- Building src
--	cd src; make CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
-+	cd src; make CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) -I.. -I../libXmx -I../libwww2 $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags)" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
- 
- src-purifyd::
- 	@echo --- Building Purify'd src
+*** makefiles/Makefile.bsdi.orig	Wed Jun 12 03:45:25 1996
+--- makefiles/Makefile.bsdi	Fri Aug  2 20:40:18 1996
+***************
+*** 36,46 ****
+  sysconfigflags = -DMOTIF1_2
+  
+  #### System libraries.
+! syslibs = -lipc
+  
+  #### X include file locations -- if your platform puts the X include
+! xinc = -I/usr/X11/include
+! xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lXext -lSM -lICE -lXpm -lX11
+  
+  
+  #### DTM AND HDF SUPPORT; READ CAREFULLY
+--- 36,46 ----
+  sysconfigflags = -DMOTIF1_2
+  
+  #### System libraries.
+! #syslibs = -lipc
+  
+  #### X include file locations -- if your platform puts the X include
+! xinc = -I${X11BASE}/include
+! xlibs = ${MOTIFLIB} -L${X11BASE}/lib -lXmu -lXt -lXext -lSM -lICE -lXpm -lX11
+  
+  
+  #### DTM AND HDF SUPPORT; READ CAREFULLY
+***************
+*** 73,82 ****
+  #### For inline PNG support, the following should be defined:
+  #### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95
+  
+! pngdir = /xdev/mosaic/libpng/bsdi
+  pnglibdir = $(pngdir)/lib
+  pngincludedir = $(pngdir)/include
+! pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a -lm
+  pngflags =  -I$(pngincludedir) -DHAVE_PNG
+  
+  #pngdir = /work2/mosaic-libs/libpng
+--- 73,82 ----
+  #### For inline PNG support, the following should be defined:
+  #### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95
+  
+! pngdir = ${LOCALBASE}
+  pnglibdir = $(pngdir)/lib
+  pngincludedir = $(pngdir)/include
+! pnglibs = -L$(pnglibdir) -lpng -lz -lm
+  pngflags =  -I$(pngincludedir) -DHAVE_PNG
+  
+  #pngdir = /work2/mosaic-libs/libpng
+***************
+*** 90,98 ****
+  #### For inline JPEG support, the following should be defined:
+  #### The library used is Independent JPEG Group (IJG's) 5.0a.
+  
+! jpegdir = /work2/mosaic-libs/libjpeg-6
+! jpeglibs = $(jpegdir)/libjpeg.a
+! jpegflags = -I$(jpegdir) -DHAVE_JPEG
+  
+  
+  #### KERBEROS SUPPORT
+--- 90,98 ----
+  #### For inline JPEG support, the following should be defined:
+  #### The library used is Independent JPEG Group (IJG's) 5.0a.
+  
+! jpegdir = ${LOCALBASE}
+! jpeglibs = -L$(jpegdir) -ljpeg
+! jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
+  
+  
+  #### KERBEROS SUPPORT
+***************
+*** 160,166 ****
+  ####      modifying the Makefiles, so you may comment it out without harm.
+  ########
+  ########
+! -include local-defines/$(DEV_ARCH)
+  
+  
+  
+--- 160,166 ----
+  ####      modifying the Makefiles, so you may comment it out without harm.
+  ########
+  ########
+! #-include local-defines/$(DEV_ARCH)
+  
+  
+  
+***************
+*** 168,174 ****
+  # --------------------- Do Not Modify Below This Line ------------------------
+  #
+  
+! CFLAGS = -g $(sysconfigflags) $(prereleaseflags)
+  
+  # Don't worry about these -- for development purposes only.
+  PURIFY = purify
+--- 168,174 ----
+  # --------------------- Do Not Modify Below This Line ------------------------
+  #
+  
+! CFLAGS += $(sysconfigflags) $(prereleaseflags)
+  
+  # Don't worry about these -- for development purposes only.
+  PURIFY = purify
+***************
+*** 199,205 ****
+  
+  src::
+  	@echo --- Building src
+! 	cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
+  
+  src-purifyd::
+  	@echo --- Building Purify'd src
+--- 199,205 ----
+  
+  src::
+  	@echo --- Building src
+! 	cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) -I.. -I../libXmx -I../libwww2 $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags)" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
+  
+  src-purifyd::
+  	@echo --- Building Purify'd src
diff --git a/www/Mosaic/files/patch-ae b/www/Mosaic/files/patch-ae
new file mode 100644
index 000000000000..b346f5a80f20
--- /dev/null
+++ b/www/Mosaic/files/patch-ae
@@ -0,0 +1,36 @@
+*** src/comment.h.bak	Fri Jun  7 00:01:43 1996
+--- src/comment.h	Sat Aug  3 13:58:11 1996
+***************
+*** 67,73 ****
+  #ifndef _COMMENT_H
+  #define _COMMENT_H
+  
+! char *comment_card_html_top= \
+  "<title>\n" \
+  "	Comment Card for Mosaic 2.6\n" \
+  "</title>\n" \
+--- 67,73 ----
+  #ifndef _COMMENT_H
+  #define _COMMENT_H
+  
+! static char *comment_card_html_top= \
+  "<title>\n" \
+  "	Comment Card for Mosaic 2.6\n" \
+  "</title>\n" \
+***************
+*** 103,109 ****
+  "				<p>\n" \
+  "\n";
+  
+! char *comment_card_html_bot= \
+  "				</p>\n" \
+  "			</li>\n" \
+  "			<br>\n" \
+--- 103,109 ----
+  "				<p>\n" \
+  "\n";
+  
+! static char *comment_card_html_bot= \
+  "				</p>\n" \
+  "			</li>\n" \
+  "			<br>\n" \
diff --git a/www/Mosaic/files/patch-ah b/www/Mosaic/files/patch-ah
new file mode 100644
index 000000000000..1edc44499624
--- /dev/null
+++ b/www/Mosaic/files/patch-ah
@@ -0,0 +1,19 @@
+*** src/readJPEG.c.bak	Thu Jun 27 02:57:16 1996
+--- src/readJPEG.c	Sat Aug  3 14:04:36 1996
+***************
+*** 127,133 ****
+  			fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors);
+  			fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red);
+  			fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]);
+! 			{char dummy[80]; fprintf(stderr,"RETURN\n"); gets(dummy);}
+  		}
+  #endif
+  
+--- 127,133 ----
+  			fprintf(stderr,"cinfo.actual_number_of_colors=%d\n",cinfo.actual_number_of_colors);
+  			fprintf(stderr,"colrs[0].red=%d colrs[99].red=%d\n",colrs[0].red,colrs[99].red);
+  			fprintf(stderr,"cinfo.colormap[0][0]=%d\n",cinfo.colormap[0][0]);
+! 			{char dummy[80]; fprintf(stderr,"RETURN\n"); fgets(dummy, sizeof(dummy), stdin);}
+  		}
+  #endif
+  
diff --git a/www/Mosaic/files/patch-ai b/www/Mosaic/files/patch-ai
new file mode 100644
index 000000000000..4940f66bde1e
--- /dev/null
+++ b/www/Mosaic/files/patch-ai
@@ -0,0 +1,19 @@
+*** src/readPNG.c.bak	Sun Jun 30 16:30:00 1996
+--- src/readPNG.c	Sat Aug  3 14:22:45 1996
+***************
+*** 159,165 ****
+      }
+  
+      /* SWP -- Hopefully to fix cores on bad PNG files */
+!     png_set_message_fn(png_ptr,png_get_msg_ptr(png_ptr),NULL,NULL); 
+  
+          /* initialize the structures */
+      png_info_init(info_ptr);
+--- 159,165 ----
+      }
+  
+      /* SWP -- Hopefully to fix cores on bad PNG files */
+!     png_set_error_fn(png_ptr,png_get_error_ptr(png_ptr),NULL,NULL);
+  
+          /* initialize the structures */
+      png_info_init(info_ptr);