- Fix build on 5.x and unbreak

PR:		ports/59848
Submitted by:	Ports Fury

4 files changed, 52 insertions, 18 deletions

diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 10ed16e..4ab164c 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -19,10 +19,4 @@ USE_IMAKE=	yes
 
 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 --git a/www/chimera/files/patch-aa b/www/chimera/files/patch-Common.tmpl.dist
index 6de08af..d465aa0 100644
--- a/www/chimera/files/patch-aa
+++ b/www/chimera/files/patch-Common.tmpl.dist
@@ -9,14 +9,3 @@
  
  /*
   * 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 --git a/www/chimera/files/patch-compat::Imakefile b/www/chimera/files/patch-compat::Imakefile
new file mode 100644
index 0000000..8e9be8d
--- /dev/null
+++ b/www/chimera/files/patch-compat::Imakefile
@@ -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 --git a/www/chimera/files/patch-libhtmlw::HTML-PSformat.c b/www/chimera/files/patch-libhtmlw::HTML-PSformat.c
new file mode 100644
index 0000000..154d1bf
--- /dev/null
+++ b/www/chimera/files/patch-libhtmlw::HTML-PSformat.c
@@ -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.