svn commit: r330672 - in head/devel: boehm-gc boehm-gc-redirect boehm-gc-redirect/files boehm-gc-threaded boehm-gc-threaded/files boehm-gc/files

[Boris Samorodov]

18.10.2013 11:50, Herbert J. Skuhra пишет:
> to. 17. okt. 2013 kl. 22.53 +0200 skrev Boris Samorodov:
> 
>> Author: bsam
>> Date: Thu Oct 17 20:53:58 2013
>> New Revision: 330672
>> URL: http://svnweb.freebsd.org/changeset/ports/330672
>>
>> Log:
>>   . update to version 7.2d;
>>   . organize as master and slave ports;
>>   . while I'm here: support stage.
> 
> This breaks the build of www/w3m:
> 
> ===>  Building for w3m-0.5.3_2
> (echo '#define DEFUN(x,y,z) x y'; sed -ne '/^DEFUN/{p;n;/^[     ]/p;}'
> ../main.c ./menu.c) | cpp - |  awk '$1 ~ /^[_A-Za-z]/ {  for
> (i=2;i<=NF;i++) { print $i, $1}  }' > funcname.tab.tmp
> funcname.tab updated
> sort funcname.tab | /usr/bin/awk -f ./funcname1.awk > funcname1.h
> cc  -I. -I. -O2 -pipe -fno-strict-aliasing -I./libwc 
> -I/usr/include/openssl -I/usr/local/include -I/usr/local/include
> -DHAVE_CONFIG_H -DAUXBIN_DIR=\"/usr/local/libexec/w3m\" 
> -DCGIBIN_DIR=\"/usr/local/libexec/w3m/cgi-bin\"
> -DHELP_DIR=\"/usr/local/share/w3m\"  -DETC_DIR=\"/usr/local/etc\"
> -DCONF_DIR=\"/usr/local/etc/w3m\"  -DRC_DIR=\"~/.w3m\" 
> -DLOCALEDIR=\"/usr/local/share/locale\" -c main.c
> main.c: In function 'main':
> main.c:836: error: void value not ignored as it ought to be
> main.c: In function 'getChar':
> main.c:2264: warning: passing argument 1 of 'wtf_parse1' from
> incompatible pointer type
> *** [main.o] Error code 1
> 
> Stop in /usr/ports/www/w3m/work/w3m-0.5.3.
> *** [do-build] Error code 1
> 
> Stop in /usr/ports/www/w3m.
> *** [build] Error code 1
> 
> (Maintainer of w3m Cc'ed.)
> 

Please, try the attached patch (relative to the PORTSDIR).
The patch taken from:
http://sourceforge.net/p/w3m/patches/59/

-- 
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
-------------- next part --------------
Index: www/w3m/files/patch-main.c
===================================================================
--- www/w3m/files/patch-main.c	(revision 0)
+++ www/w3m/files/patch-main.c	(working copy)
@@ -0,0 +1,15 @@
+--- main.c
++++ main.c
+@@ -833,7 +833,12 @@ main(int argc, char **argv, char **envp)
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++    orig_GC_warn_proc = GC_get_warn_proc();
++    GC_set_warn_proc(wrap_GC_warn_proc);
++#else
+     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++#endif
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */