Import of FreeBSD's XMosaic port, with NetBSD changes to follow

9 files changed, 254 insertions, 0 deletions

diff --git a/www/Mosaic/patches/patch-aa b/www/Mosaic/patches/patch-aa
new file mode 100644
index 00000000000..be98fd0675a
--- /dev/null
+++ b/www/Mosaic/patches/patch-aa
@@ -0,0 +1,122 @@
+*** 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/patches/patch-ab b/www/Mosaic/patches/patch-ab
new file mode 100644
index 00000000000..e479c743015
--- /dev/null
+++ b/www/Mosaic/patches/patch-ab
@@ -0,0 +1,12 @@
+*** libwww2/HTTCP.c.orig	Mon Aug  7 17:12:22 1995
+--- libwww2/HTTCP.c	Mon Aug  7 17:12:28 1995
+***************
+*** 65,71 ****
+  extern int errno;
+  #endif /* errno */
+  
+- extern char *sys_errlist[];		/* see man perror on cernvax */
+  extern int sys_nerr;
+  
+  /*	Report Internet Error
+--- 65,70 ----
diff --git a/www/Mosaic/patches/patch-ac b/www/Mosaic/patches/patch-ac
new file mode 100644
index 00000000000..9e24bda8008
--- /dev/null
+++ b/www/Mosaic/patches/patch-ac
@@ -0,0 +1,12 @@
+*** src/gui-dialogs.c.orig	Mon Aug  7 18:23:34 1995
+--- src/gui-dialogs.c	Mon Aug  7 18:23:46 1995
+***************
+*** 75,81 ****
+  /*swp -- for ~ expansion*/
+  #include <pwd.h>
+  extern int sys_nerr;
+- extern char *sys_errlist[];
+  extern int errno;
+  #define __MAX_HOME_LEN__ 256
+  int pathEval(char *dest, char *src);
+--- 75,80 ----
diff --git a/www/Mosaic/patches/patch-ad b/www/Mosaic/patches/patch-ad
new file mode 100644
index 00000000000..4a86740c75b
--- /dev/null
+++ b/www/Mosaic/patches/patch-ad
@@ -0,0 +1,11 @@
+--- ./src/xresources.h.org	Tue Apr  9 21:41:26 1996
++++ ./src/xresources.h	Tue Apr  9 21:43:12 1996
+@@ -94,7 +94,7 @@
+   { "confirmExit", "ConfirmExit", XtRBoolean, sizeof (Boolean),
+       offset (confirm_exit), XtRString, "True" },
+   /* THIS USED TO BE mailCommand BUT IS NOW sendmailCommand. */
+-#ifdef __bsdi__
++#if defined(__bsdi__) || defined(__FreeBSD__)
+   { "sendmailCommand", "SendmailCommand", XtRString, sizeof (char *),
+       offset (sendmail_command), XtRString, "/usr/sbin/sendmail -t" },
+ #else
diff --git a/www/Mosaic/patches/patch-ae b/www/Mosaic/patches/patch-ae
new file mode 100644
index 00000000000..b346f5a80f2
--- /dev/null
+++ b/www/Mosaic/patches/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/patches/patch-af b/www/Mosaic/patches/patch-af
new file mode 100644
index 00000000000..61525d1177a
--- /dev/null
+++ b/www/Mosaic/patches/patch-af
@@ -0,0 +1,12 @@
+*** libnut/system.c.bak	Sat Oct 14 09:32:53 1995
+--- libnut/system.c	Tue Dec  5 06:37:44 1995
+***************
+*** 70,76 ****
+  
+  
+  extern int sys_nerr;
+- extern char *sys_errlist[];
+  extern int errno;
+  
+  
+--- 70,75 ----
diff --git a/www/Mosaic/patches/patch-ag b/www/Mosaic/patches/patch-ag
new file mode 100644
index 00000000000..b2a9496b23f
--- /dev/null
+++ b/www/Mosaic/patches/patch-ag
@@ -0,0 +1,11 @@
+--- ./src/gui.c.org	Tue Apr  9 21:47:32 1996
++++ ./src/gui.c	Tue Apr  9 22:01:26 1996
+@@ -3623,7 +3623,7 @@
+     return 0;
+   else 
+     {
+-{char ans[10]; printf("Press RETURN\n"); gets(ans);}
++{char ans[10]; printf("Press RETURN\n"); fgets(ans, sizeof(ans), stdin);}
+       /* All other errors are 'fatal'. */
+       XGetErrorText (dsp, event->error_code, buf, 128);
+       fprintf (stderr, "X Error: %s\n", buf);
diff --git a/www/Mosaic/patches/patch-ah b/www/Mosaic/patches/patch-ah
new file mode 100644
index 00000000000..1edc4449962
--- /dev/null
+++ b/www/Mosaic/patches/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/patches/patch-ai b/www/Mosaic/patches/patch-ai
new file mode 100644
index 00000000000..4940f66bde1
--- /dev/null
+++ b/www/Mosaic/patches/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);