ports/56109: www/ashe - fix build for gc-3.3 (varargs -> stdarg)

Michael Edenfield kutulu at kutulu.org
Fri Aug 29 00:40:18 UTC 2003


>Number:         56109
>Category:       ports
>Synopsis:       www/ashe - fix build for gc-3.3 (varargs -> stdarg)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 28 17:40:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Michael Edenfield
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD wombat.localnet 5.1-CURRENT FreeBSD 5.1-CURRENT #7: Sun Aug 24 21:35:57 EDT 2003 root at wombat.localnet:/usr/obj/usr/src/sys/ATHLON i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:


diff -urN ashe.orig/Makefile ashe/Makefile
--- ashe.orig/Makefile	Thu Feb 20 14:15:23 2003
+++ ashe/Makefile	Thu Aug 28 20:29:16 2003
@@ -26,8 +26,6 @@
 
 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 -urN ashe.orig/files/patch-ae ashe/files/patch-ae
--- ashe.orig/files/patch-ae	Wed Dec 31 19:00:00 1969
+++ ashe/files/patch-ae	Thu Aug 28 20:30:42 2003
@@ -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.

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list