ports/59848: Update port: www/chimera

[KATO Tsuguru]

>Number:         59848
>Category:       ports
>Synopsis:       Update port: www/chimera
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 30 09:30:30 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Fix build on -current

New file:
files/patch-Common.tmpl.dist
files/patch-compat::Imakefile
files/patch-libhtmlw::HTML-PSformat.c

Remove file:
files/patch-aa

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/www/chimera/Makefile www/chimera/Makefile
--- /usr/ports/www/chimera/Makefile	Mon Oct 27 11:06:00 2003
+++ www/chimera/Makefile	Sun Nov 30 11:14:40 2003
@@ -19,10 +19,4 @@
 
 MAN1=		chimera.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/www/chimera/files/patch-Common.tmpl.dist www/chimera/files/patch-Common.tmpl.dist
--- /usr/ports/www/chimera/files/patch-Common.tmpl.dist	Thu Jan  1 09:00:00 1970
+++ www/chimera/files/patch-Common.tmpl.dist	Sun Nov 30 11:05:22 2003
@@ -0,0 +1,11 @@
+--- ./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
diff -urN /usr/ports/www/chimera/files/patch-aa www/chimera/files/patch-aa
--- /usr/ports/www/chimera/files/patch-aa	Thu Jun 12 04:45:31 1997
+++ www/chimera/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- ./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
diff -urN /usr/ports/www/chimera/files/patch-compat::Imakefile www/chimera/files/patch-compat::Imakefile
--- /usr/ports/www/chimera/files/patch-compat::Imakefile	Thu Jan  1 09:00:00 1970
+++ www/chimera/files/patch-compat::Imakefile	Sun Nov 30 11:05:31 2003
@@ -0,0 +1,11 @@
+--- ./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
diff -urN /usr/ports/www/chimera/files/patch-libhtmlw::HTML-PSformat.c www/chimera/files/patch-libhtmlw::HTML-PSformat.c
--- /usr/ports/www/chimera/files/patch-libhtmlw::HTML-PSformat.c	Thu Jan  1 09:00:00 1970
+++ www/chimera/files/patch-libhtmlw::HTML-PSformat.c	Sun Nov 30 11:04:11 2003
@@ -0,0 +1,40 @@
+--- libhtmlw/HTML-PSformat.c.orig	Sun May  4 17:08:32 1997
++++ libhtmlw/HTML-PSformat.c	Sun Nov 30 11:03:28 2003
+@@ -41,7 +41,11 @@
+  *              permission of John Bradley.
+  */
+ 
++#if 0
+ #include <varargs.h>
++#else
++#include <stdarg.h>
++#endif
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+@@ -204,9 +208,13 @@
+ }
+ #else /* not BROKEN_SOLARIS_COMPILER_STDARG */
+ static int
++#if 0
+ PSprintf (format, va_alist)
+ char *format;
+ va_dcl
++#else
++PSprintf (char *format, ...)
++#endif
+ {
+   int len;
+   char *s;
+@@ -222,7 +230,11 @@
+     }
+     PS_string = s;
+   }
++#if 0
+   va_start (args);
++#else
++  va_start (args, format);
++#endif
+   len = vsprintf (PS_string + PS_len, format, args);
+   /* this is a hack to make it work on systems were vsprintf(s,...)
+    * returns s, instead of the len.
>Release-Note:
>Audit-Trail:
>Unformatted: