Bring in changes for chimera-2.0a11. A repository copy from

ports/www/chimera was done before.

PR:		4248
Submitted by:	Bruce Gingery <bgingery@gtcs.com>

4 files changed, 97 insertions, 32 deletions

diff --git a/www/chimera2/files/patch-aa b/www/chimera2/files/patch-aa
index 6de08af..1ef0025 100644
--- a/www/chimera2/files/patch-aa
+++ b/www/chimera2/files/patch-aa
@@ -1,22 +1,50 @@
---- ./Common.tmpl.dist.org	Sat Apr  1 19:20:24 1995
-+++ ./Common.tmpl.dist	Tue Apr  4 07:51:01 1995
-@@ -80,7 +80,7 @@
- #define NEED_STRCASECMP 0
- 
- CEXTRA_DEFINES = -DHAVE_MKTIME -DHAVE_STDLIB_H -DHAVE_STRING_H \
--                 -DHAVE_UNISTD_H -DHAVE_MALLOC_H
-+                 -DHAVE_UNISTD_H
- 
- /*
-  * OSF1 needs -D_BSD
---- ./compat/Imakefile.org	Mon Mar 13 19:48:00 1995
-+++ ./compat/Imakefile	Wed Jun 11 12:42:13 1997
-@@ -31,7 +31,7 @@
- 
- DependTarget()
- #else
--all:
-+all::
- 
- depend::
- #endif
+*** Imakefile.orig	Sun Aug 17 23:18:18 1997
+--- Imakefile	Mon Nov 24 10:34:00 1997
+***************
+*** 4,10 ****
+  
+  #if HasGcc
+  #ifdef CDebugging
+! #define PassCDebugFlags "CDEBUGFLAGS=-g -Wall"
+  #else
+  #define PassCDebugFlags "CDEBUGFLAGS=-O -Wall"
+  #endif
+--- 4,10 ----
+  
+  #if HasGcc
+  #ifdef CDebugging
+! #define PassCDebugFlags "CDEBUGFLAGS=-g -Wall ${CFLAGS}"
+  #else
+  #define PassCDebugFlags "CDEBUGFLAGS=-O -Wall"
+  #endif
+***************
+*** 19,32 ****
+  SUBDIRS = port common image html plain proto mxw chimera
+  
+  MakeSubdirs($(SUBDIRS))
+! InstallSubdirs($(SUBDIRS))
+  DependSubdirs($(SUBDIRS))
+  CleanSubdirs($(SUBDIRS))
+  MakefileSubdirs($(SUBDIRS))
+! InstallManSubdirs($(SUBDIRS))
+  
+  myclean: clean
+  	$(RM) Common.tmpl Makefile Makefile.bak make.err make.out .depend
+! 	for i in $(SUBDIRS); do \
+  		$(RM) $$i/Makefile $$i/Makefile.bak $$i/.depend; \
+  	done
+--- 19,32 ----
+  SUBDIRS = port common image html plain proto mxw chimera
+  
+  MakeSubdirs($(SUBDIRS))
+! InstallSubdirs(main)
+  DependSubdirs($(SUBDIRS))
+  CleanSubdirs($(SUBDIRS))
+  MakefileSubdirs($(SUBDIRS))
+! InstallManSubdirs(main)
+  
+  myclean: clean
+  	$(RM) Common.tmpl Makefile Makefile.bak make.err make.out .depend
+! 	for i in $(SUBDIRS) $(SOSUBDIRS); do \
+  		$(RM) $$i/Makefile $$i/Makefile.bak $$i/.depend; \
+  	done
diff --git a/www/chimera2/files/patch-ad b/www/chimera2/files/patch-ad
index 7a67c9b..f24de4b 100644
--- a/www/chimera2/files/patch-ad
+++ b/www/chimera2/files/patch-ad
@@ -1,11 +1,33 @@
---- ./src/url.c.org	Sun Mar 26 01:26:06 1995
-+++ ./src/url.c	Fri Sep 22 23:53:00 1995
-@@ -173,7 +173,7 @@
-   }
+--- Common.tmpl.dist.orig	Mon Sep 29 01:32:46 1997
++++ Common.tmpl.dist	Tue Nov 25 09:13:24 1997
+@@ -35,22 +35,22 @@
+ */
  
-   len = strlen(protocol) + strlen(hostname) + strlen(filename) +
--        strlen(delim) + 11;
-+        strlen(anchor) + strlen(delim) + strlen(delim2) + strlen(delim3) + 11;
-   u = alloc_mem(len + 1);
-   if (up->port == 0)
-   {
+ /* Uncomment and modify if you have the JPEG 6 library */
+-/*
++
+ #define Use_JPEG
+ JPEGDIR = /usr/local
+ JPEGINCLUDE = -I$(JPEGDIR)/include
+-JPEGLIB = -L$(JPEGDIR)/lib -ljpeg$(IMGLEXT)
+-JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg$(IMGLEXT).a
+-*/
++JPEGLIB = -L$(JPEGDIR)/lib -ljpeg
++JPEGDEPLIB = $(JPEGDIR)/lib/libjpeg.a
++
+ 
+ /* Uncomment and modify if you have the PNG library */
+-/*
++
+ #define Use_PNG
+ PNGDIR = /usr/local
+ PNGINCLUDE = -I$(PNGDIR)/include
+-PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT)
+-PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
+-*/
++PNGLIB = -L$(PNGDIR)/lib -lpng -lz
++PNGDEPLIB = $(PNGDIR)/lib/libpng.a /usr/lib/libz.a
++
+ 
+ /*
+  * Uncomment if you need GNU rx.  Not actually used right now.
diff --git a/www/chimera2/files/patch-ae b/www/chimera2/files/patch-ae
new file mode 100644
index 0000000..882497c
--- /dev/null
+++ b/www/chimera2/files/patch-ae
@@ -0,0 +1,12 @@
+--- chimera/Imakefile.orig	Sun Aug 17 07:10:31 1997
++++ chimera/Imakefile	Tue Nov 25 09:23:32 1997
+@@ -19,7 +19,7 @@
+ 
+ NormalProgramTarget(chimera, $(OBJS), $(CHIMERA_DEPLIBS), MyNull, MyNull)
+ 
+-InstallProgram(chimera,$(CHIMERA_BINDIR))
+-InstallManPage(chimera,$(CHIMERA_MANDIR))
++InstallProgram(chimera,$(BINDIR))
++InstallManPage(chimera,$(MANDIR))
+ 
+ DependTarget()
diff --git a/www/chimera2/files/protopng.h b/www/chimera2/files/protopng.h
new file mode 100644
index 0000000..11c00cf
--- /dev/null
+++ b/www/chimera2/files/protopng.h
@@ -0,0 +1,3 @@
+/*  Eliminate a couple of errors from image/image.c for missing prototype */
+#include "image_format.h"
+void pngInit(void (*lineProc)(void *, int, int), void *closure, struct ifs_vector *ifsv);