summaryrefslogtreecommitdiff
path: root/www/ashe
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2003-08-29 05:57:59 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2003-08-29 05:57:59 +0000
commitdc7595d75b31d88b2ee645a1ef949cbd004a71fa (patch)
tree6e2dd582cf421b98c81f207370998a2bfe357772 /www/ashe
parent- Fix build on -current (diff)
- Fix build with gcc-3.3.x (varargs -> stdarg)
PR: 56109 Submitted by: Michael Edenfield <kutulu@kutulu.org>
Notes
Notes: svn path=/head/; revision=87956
Diffstat (limited to 'www/ashe')
-rw-r--r--www/ashe/Makefile2
-rw-r--r--www/ashe/files/patch-ae42
2 files changed, 42 insertions, 2 deletions
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index c8e2731cae7c..e150610db1fe 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -26,8 +26,6 @@ MAN1= xhtml.1
post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad
- @${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g" \
- ${WRKSRC}/libhtmlw-2.7b3/HTML-PSformat.c
do-build:
.for dir in libhtmlw-2.7b3 libcci src
diff --git a/www/ashe/files/patch-ae b/www/ashe/files/patch-ae
new file mode 100644
index 000000000000..73ad3ca9b5de
--- /dev/null
+++ b/www/ashe/files/patch-ae
@@ -0,0 +1,42 @@
+--- libhtmlw-2.7b3/HTML-PSformat.c.orig Mon May 20 16:35:47 1996
++++ libhtmlw-2.7b3/HTML-PSformat.c Thu Aug 28 20:25:49 2003
+@@ -59,16 +59,16 @@
+ *
+ */
+
+-#include <varargs.h>
++#include <stdarg.h>
+
+ #include <string.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <math.h>
+ #ifdef __bsdi__
+-#include <sys/malloc.h>
++#include <sys/stdlib.h>
+ #else
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif
+ #include <time.h>
+ #include <sys/types.h>
+@@ -264,9 +264,7 @@
+ }
+ #else /* not BROKEN_SOLARIS_COMPILER_STDARG */
+ static int
+-PSprintf(format, va_alist)
+- char* format;
+- va_dcl
++PSprintf(char *format, ...)
+ {
+ int len;
+ char *s;
+@@ -286,7 +284,7 @@
+ }
+ PS_string = s;
+ }
+- va_start(args);
++ va_start(args, format);
+ 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.