Upgrade, 2.7b2 -> 2.7b4. Also make it conform to Motif standard here.

1 files changed, 61 insertions, 270 deletions

diff --git a/www/Mosaic/files/patch-aa b/www/Mosaic/files/patch-aa
index 18064d719ac5..31da312667f9 100644
--- a/www/Mosaic/files/patch-aa
+++ b/www/Mosaic/files/patch-aa
@@ -1,270 +1,61 @@
-*** Makefile.orig	Thu Oct 19 01:12:16 1995
---- Makefile	Tue Dec  5 07:19:09 1995
-***************
-*** 10,22 ****
-  
-  prereleaseflags = -DPRERELEASE
-  
-! RANLIB = /bin/true
-  #### On non-SGI's, this should be ranlib.
-  RANLIB = ranlib
-  
-  CC = cc
-  #### On Sun's, this should be gcc (ANSI required).
-! CC = gcc
-  
-  #### Linker Flags -- Primarily for linking static on linux-elf.
-  #ldflags = -static
---- 10,22 ----
-  
-  prereleaseflags = -DPRERELEASE
-  
-! #RANLIB = /bin/true
-  #### On non-SGI's, this should be ranlib.
-  RANLIB = ranlib
-  
-  CC = cc
-  #### On Sun's, this should be gcc (ANSI required).
-! #CC = gcc
-  
-  #### Linker Flags -- Primarily for linking static on linux-elf.
-  #ldflags = -static
-***************
-*** 24,30 ****
-  
-  #### For a few files in the source, some compilers may need to be kicked
-  #### in K&R mode.  E.g., on SGI's, -cckr does this.
-! knrflag = -cckr
-  #### On most systems, no flag is needed.
-  knrflag =
-  
---- 24,30 ----
-  
-  #### For a few files in the source, some compilers may need to be kicked
-  #### in K&R mode.  E.g., on SGI's, -cckr does this.
-! #knrflag = -cckr
-  #### On most systems, no flag is needed.
-  knrflag =
-  
-***************
-*** 40,49 ****
-  #### For Convex whatever, do -DCONVEX
-  #### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2
-  #### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2
-! sysconfigflags = 
-  
-  #### System libraries.
-! syslibs = -lPW -lsun -lmalloc
-  #### For AIX 3.2
-  # syslibs = -lPW -lbsd
-  #### For most other Motif platforms:
---- 40,49 ----
-  #### For Convex whatever, do -DCONVEX
-  #### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2
-  #### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2
-! sysconfigflags = -DMOTIF1_2
-  
-  #### System libraries.
-! #syslibs = -lPW -lsun -lmalloc
-  #### For AIX 3.2
-  # syslibs = -lPW -lbsd
-  #### For most other Motif platforms:
-***************
-*** 73,84 ****
-  # xinc = -I/usr/include/X11
-  #### BSD/386
-  # xinc = -I/usr/X11/include
-! xinc = -I/xdev/mosaic/X11R5/include
-  
-  #### X library locations.
-  # xlibs = -lXm_s -lXmu -lXt_s -lX11_s
-  #### For Sun's (at least running stock X/Motif as installed on our machines):
-! xlibs = /xdev/mosaic/X11R5/lib/libXm.a /xdev/mosaic/X11R5/lib/libXmu.a /xdev/mosaic/X11R5/lib/libXt.a /xdev/mosaic/X11R5/lib/libXext.a /xdev/mosaic/X11R5/lib/libX11.a -lm
-  #### For HP-UX 8.00:
-  # xlibs = -L/usr/lib/Motif1.1 -lXm -L/usr/lib/X11R4 -lXmu -lXt -lX11
-  #### For HP-UX 9.01: The X11R5 libraries are here on our systems
---- 73,85 ----
-  # xinc = -I/usr/include/X11
-  #### BSD/386
-  # xinc = -I/usr/X11/include
-! #xinc = -I/xdev/mosaic/X11R5/include
-! xinc = -I/usr/X11R6/include
-  
-  #### X library locations.
-  # xlibs = -lXm_s -lXmu -lXt_s -lX11_s
-  #### For Sun's (at least running stock X/Motif as installed on our machines):
-! #xlibs = /xdev/mosaic/X11R5/lib/libXm.a /xdev/mosaic/X11R5/lib/libXmu.a /xdev/mosaic/X11R5/lib/libXt.a /xdev/mosaic/X11R5/lib/libXext.a /xdev/mosaic/X11R5/lib/libX11.a -lm
-  #### For HP-UX 8.00:
-  # xlibs = -L/usr/lib/Motif1.1 -lXm -L/usr/lib/X11R4 -lXmu -lXt -lX11
-  #### For HP-UX 9.01: The X11R5 libraries are here on our systems
-***************
-*** 97,102 ****
---- 98,109 ----
-  # xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11
-  #### For Motorola SVR4:
-  # xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
-+ #### For FreeBSD 2.x:
-+ .if !exists(/usr/X11R6/lib/libXm.a)
-+ xlibs = -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11 -lm
-+ .else
-+ xlibs = -L/usr/X11R6/lib /usr/X11R6/lib/libXm.a -lXmu -lXt -lXext -lX11 -lm
-+ .endif
-  
-  
-  #### DTM AND HDF SUPPORT; READ CAREFULLY
-***************
-*** 116,138 ****
-  #### If your platform is not one of the above, then either do not compile
-  #### with HDF/DTM support or try hacking libdtm/makefile.
-  
-! dtmmachtype = sun
-! dtmdirs = libdtm libnet
-! dtmlibs = ../libnet/libnet.a ../libdtm/libdtm.a
-! dtmflags = -DHAVE_DTM -I.. -I../libnet
-! hdfdir = /hdf2/install/sun
-! hdflibs = $(hdfdir)/lib/libnetcdf.a $(hdfdir)/lib/libdf.a
-! hdfflags = -DHAVE_HDF -DHDF -I$(hdfdir)/include
-  
-  
-  #### PNG SUPPORT
-  #### 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/sun
-  pnglibdir = $(pngdir)/lib
-  pngincludedir = $(pngdir)/include
-! pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a -lm
-  pngflags =  -I$(pngincludedir) -DHAVE_PNG
-  
-  
---- 123,148 ----
-  #### If your platform is not one of the above, then either do not compile
-  #### with HDF/DTM support or try hacking libdtm/makefile.
-  
-! #dtmmachtype = sun
-! #dtmdirs = libdtm libnet
-! #dtmlibs = ../libnet/libnet.a ../libdtm/libdtm.a
-! #dtmflags = -DHAVE_DTM -I.. -I../libnet
-! #hdfdir = /hdf2/install/sun
-! #hdflibs = $(hdfdir)/lib/libnetcdf.a $(hdfdir)/lib/libdf.a
-! #hdfflags = -DHAVE_HDF -DHDF -I$(hdfdir)/include
-  
-  
-  #### PNG SUPPORT
-  #### 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/sun
-! pngdir = /usr/local
-  pnglibdir = $(pngdir)/lib
-  pngincludedir = $(pngdir)/include
-! #pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a -lm
-! #pngflags =  -I$(pngincludedir) -DHAVE_PNG
-! pnglibs = -L$(pnglibdir) -lpng -lz -lm
-  pngflags =  -I$(pngincludedir) -DHAVE_PNG
-  
-  
-***************
-*** 140,147 ****
-  #### For inline JPEG support, the following should be defined:
-  #### The library used is Independent JPEG Group (IJG's) 5.0a.
-  
-! jpegdir = /xdev/mosaic/libjpeg/sun
-! jpeglibs = $(jpegdir)/lib/libjpeg.a
-  jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
-  
-  
---- 150,159 ----
-  #### For inline JPEG support, the following should be defined:
-  #### The library used is Independent JPEG Group (IJG's) 5.0a.
-  
-! #jpegdir = /xdev/mosaic/libjpeg/sun
-! jpegdir = /usr/local
-! #jpeglibs = $(jpegdir)/lib/libjpeg.a
-! jpeglibs = -L$(jpegdir)/lib -ljpeg
-  jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
-  
-  
-***************
-*** 154,167 ****
-  #### define the KRB-ENCRYPT flag.
-  
-  ##krb4dir   = /usr/athena
-! krb4dir   = /xdev/mosaic/libkrb4/sun
-! krb4libs  = $(krb4dir)/lib/libkrb.a $(krb4dir)/lib/libdes.a
-! krb4flags = -DKRB4 -I$(krb4dir)/include
-  
-  ##krb5dir   = /krb5
-! krb5dir   = /xdev/mosaic/libkrb5/sun
-! krb5libs  = $(krb5dir)/lib/libkrb5.a $(krb5dir)/lib/libcrypto.a $(krb5dir)/util/et/libcom_err.a
-! krb5flags = -DKRB5 -I$(krb5dir)/include -I$(krb5dir)/include/krb5
-  
-  #Do not comment out.
-  krbflags  = $(krb4flags) $(krb5flags)
---- 166,179 ----
-  #### define the KRB-ENCRYPT flag.
-  
-  ##krb4dir   = /usr/athena
-! #krb4dir   = /xdev/mosaic/libkrb4/sun
-! #krb4libs  = $(krb4dir)/lib/libkrb.a $(krb4dir)/lib/libdes.a
-! #krb4flags = -DKRB4 -I$(krb4dir)/include
-  
-  ##krb5dir   = /krb5
-! #krb5dir   = /xdev/mosaic/libkrb5/sun
-! #krb5libs  = $(krb5dir)/lib/libkrb5.a $(krb5dir)/lib/libcrypto.a $(krb5dir)/util/et/libcom_err.a
-! #krb5flags = -DKRB5 -I$(krb5dir)/include -I$(krb5dir)/include/krb5
-  
-  #Do not comment out.
-  krbflags  = $(krb4flags) $(krb5flags)
-***************
-*** 183,192 ****
-  
-  #### -lm is required for freeWAIS 0.5, as ceil() is used.
-  
-! waisroot = /xdev/mosaic/freeWAIS/sun4
-! waisflags = -DDIRECT_WAIS -I$(waisroot)/include
-! waislibdir = $(waisroot)/bin
-! waislibs = $(waislibdir)/inv.a $(waislibdir)/wais.a $(waislibdir)/libftw.a -lm
-  
-  
-  #### Customization flags:
---- 195,204 ----
-  
-  #### -lm is required for freeWAIS 0.5, as ceil() is used.
-  
-! #waisroot = /xdev/mosaic/freeWAIS/sun4
-! #waisflags = -DDIRECT_WAIS -I$(waisroot)/include
-! #waislibdir = $(waisroot)/bin
-! #waislibs = $(waislibdir)/inv.a $(waislibdir)/wais.a $(waislibdir)/libftw.a -lm
-  
-  
-  #### Customization flags:
-***************
-*** 203,209 ****
-  # ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------
-  
-  
-! CFLAGS = -g $(sysconfigflags) $(prereleaseflags)
-  
-  # Don't worry about these -- for development purposes only.
-  PURIFY = purify
---- 215,221 ----
-  # ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------
-  
-  
-! CFLAGS += $(sysconfigflags) $(prereleaseflags)
-  
-  # Don't worry about these -- for development purposes only.
-  PURIFY = purify
-***************
-*** 215,220 ****
---- 227,235 ----
-  	@echo \*\*\* Welcome to Purify'd NCSA Mosaic.
-  quantifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-quantifyd
-  	@echo \*\*\* Welcome to Quantify'd NCSA Mosaic.
-+ 
-+ install:
-+ 	$(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) -o $(BINOWN) src/Mosaic ${PREFIX}/bin/Mosaic
-  
-  libXmx::
-  	@echo --- Building libXmx
+--- ./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