ports/175015: math/snns: Fix build with clang

KATO Tsuguru tkato432 at yahoo.com
Sat Jan 5 18:10:02 UTC 2013


>Number:         175015
>Category:       ports
>Synopsis:       math/snns: Fix build with clang
>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:   Sat Jan 05 18:10:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add MAKE_JOBS_UNSAFE

New file:
files/patch-tools__sources__analyze.c
files/patch-tools__sources__convert2snns.c
files/patch-tools__sources__feedback-gennet.c
files/patch-tools__sources__ff_bignet.c
files/patch-tools__sources__mkhead.c
files/patch-tools__sources__mkout.c
files/patch-tools__sources__mkpat.c
files/patch-tools__sources__pat_sel.c
files/patch-tools__sources__pat_sel_simple.c
files/patch-tools__sources__td_bignet.c
files/patch-xgui__sources__ui_main.h
files/patch-xgui__sources__ui_main.ph

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/math/snns/Makefile math/snns/Makefile
--- /usr/ports/math/snns/Makefile	2012-11-08 04:32:37.000000000 +0900
+++ math/snns/Makefile	2013-01-02 03:42:55.000000000 +0900
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	snns
-# Date created:		2 Febuary 1997
-# Whom:			reg at shale.csir.co.za
-#
+# Created by: reg at shale.csir.co.za
 # $FreeBSD: head/math/snns/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	snns
 PORTVERSION=	4.3
@@ -21,6 +17,9 @@
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}/lib/snns --enable-global \
 		--build=${CONFIGURE_TARGET}
+MAKE_JOBS_UNSAFE=	yes
+
+.include <bsd.port.options.mk>
 
 post-extract:
 .for file in config.guess config.sub
@@ -48,7 +47,7 @@
 	${INSTALL_DATA} ${WRKSRC}/Readme.license ${PREFIX}/lib/snns
 	${INSTALL_DATA} ${WRKSRC}/default.cfg ${PREFIX}/lib/snns
 	${INSTALL_DATA} ${WRKSRC}/help.hdoc ${PREFIX}/lib/snns
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
diff -urN /usr/ports/math/snns/files/patch-tools__sources__analyze.c math/snns/files/patch-tools__sources__analyze.c
--- /usr/ports/math/snns/files/patch-tools__sources__analyze.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__analyze.c	2012-10-24 04:58:36.000000000 +0900
@@ -0,0 +1,10 @@
+--- tools/sources/analyze.c.orig	2008-04-21 16:56:06.000000000 +0900
++++ tools/sources/analyze.c	2012-10-24 04:58:13.000000000 +0900
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ /*****************************************************************************/
+ /* constants                                                                 */
diff -urN /usr/ports/math/snns/files/patch-tools__sources__convert2snns.c math/snns/files/patch-tools__sources__convert2snns.c
--- /usr/ports/math/snns/files/patch-tools__sources__convert2snns.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__convert2snns.c	2012-10-24 04:47:57.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/convert2snns.c.orig	2008-04-21 16:56:07.000000000 +0900
++++ tools/sources/convert2snns.c	2012-10-24 04:45:56.000000000 +0900
+@@ -390,7 +390,7 @@
+   UPDATE   : june 15 1993
+ ******************************************************************************/
+ 
+-void main(int argc,char **argv)
++int main(int argc,char **argv)
+ {
+ FILE *fp;
+ 
diff -urN /usr/ports/math/snns/files/patch-tools__sources__feedback-gennet.c math/snns/files/patch-tools__sources__feedback-gennet.c
--- /usr/ports/math/snns/files/patch-tools__sources__feedback-gennet.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__feedback-gennet.c	2012-10-24 04:55:13.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/feedback-gennet.c.orig	2008-04-21 16:56:07.000000000 +0900
++++ tools/sources/feedback-gennet.c	2012-10-24 04:47:13.000000000 +0900
+@@ -48,7 +48,7 @@
+  return 0.0;
+ }
+ 
+-void main ()
++int main(int argc, char **argv)
+ {
+  int i,j;
+  int nin,nhid,nout,nconnections;
diff -urN /usr/ports/math/snns/files/patch-tools__sources__ff_bignet.c math/snns/files/patch-tools__sources__ff_bignet.c
--- /usr/ports/math/snns/files/patch-tools__sources__ff_bignet.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__ff_bignet.c	2012-10-24 04:48:44.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/ff_bignet.c.orig	2008-04-21 16:56:07.000000000 +0900
++++ tools/sources/ff_bignet.c	2012-10-24 04:46:15.000000000 +0900
+@@ -1009,7 +1009,7 @@
+   UPDATE   : 
+ ******************************************************************************/
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     char *file_name;
+     int err;
diff -urN /usr/ports/math/snns/files/patch-tools__sources__mkhead.c math/snns/files/patch-tools__sources__mkhead.c
--- /usr/ports/math/snns/files/patch-tools__sources__mkhead.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__mkhead.c	2012-10-24 04:37:38.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/mkhead.c.orig	2008-04-21 16:56:08.000000000 +0900
++++ tools/sources/mkhead.c	2012-10-24 04:36:51.000000000 +0900
+@@ -25,7 +25,7 @@
+ #include <time.h>
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ 
+ {
+    time_t t;
diff -urN /usr/ports/math/snns/files/patch-tools__sources__mkout.c math/snns/files/patch-tools__sources__mkout.c
--- /usr/ports/math/snns/files/patch-tools__sources__mkout.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__mkout.c	2012-10-24 04:39:28.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/mkout.c.orig	2008-04-21 16:56:08.000000000 +0900
++++ tools/sources/mkout.c	2012-10-24 04:38:57.000000000 +0900
+@@ -26,7 +26,7 @@
+ 
+ #define RAWNUM 8
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ 
+ {
+    int i, units, active;
diff -urN /usr/ports/math/snns/files/patch-tools__sources__mkpat.c math/snns/files/patch-tools__sources__mkpat.c
--- /usr/ports/math/snns/files/patch-tools__sources__mkpat.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__mkpat.c	2012-10-24 04:40:53.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/mkpat.c.orig	2008-04-21 16:56:08.000000000 +0900
++++ tools/sources/mkpat.c	2012-10-24 04:40:37.000000000 +0900
+@@ -25,7 +25,7 @@
+ 
+ #define RAWNUM 8
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ 
+ {
+    int i;
diff -urN /usr/ports/math/snns/files/patch-tools__sources__pat_sel.c math/snns/files/patch-tools__sources__pat_sel.c
--- /usr/ports/math/snns/files/patch-tools__sources__pat_sel.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__pat_sel.c	2012-10-24 04:44:03.000000000 +0900
@@ -0,0 +1,20 @@
+--- tools/sources/pat_sel.c.orig	2008-04-21 16:56:08.000000000 +0900
++++ tools/sources/pat_sel.c	2012-10-24 04:43:51.000000000 +0900
+@@ -58,7 +58,7 @@
+ 
+   UPDATE   : 
+ ******************************************************************************/
+-void main (int argc, char *argv[])
++int main (int argc, char *argv[])
+ { 
+ 
+     int   pat_set, tot_pat_num;
+@@ -88,7 +88,7 @@
+     if(krui_loadNewPatterns(argv[2],&pat_set) != 0 /*KRERR_NO_ERROR*/){
+ 	fprintf(stderr, "error: can't read file %s\n", argv[2]) ;
+ 	fclose (in_no_file) ;
+-	return ;
++	return 0;
+     }
+     tot_pat_num = krui_getNoOfPatterns();
+ 
diff -urN /usr/ports/math/snns/files/patch-tools__sources__pat_sel_simple.c math/snns/files/patch-tools__sources__pat_sel_simple.c
--- /usr/ports/math/snns/files/patch-tools__sources__pat_sel_simple.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__pat_sel_simple.c	2012-10-24 04:34:54.000000000 +0900
@@ -0,0 +1,53 @@
+--- tools/sources/pat_sel_simple.c.orig	2008-04-21 16:56:08.000000000 +0900
++++ tools/sources/pat_sel_simple.c	2012-10-24 04:33:30.000000000 +0900
+@@ -168,7 +168,7 @@
+ /* main program                                                               */
+ /******************************************************************************/
+ 	  
+-void main (int argc, char *argv[])
++int main (int argc, char *argv[])
+ { 
+   float  *output_pattern    ;
+   float  *input_pattern     ;
+@@ -188,28 +188,28 @@
+   {  
+     fprintf (stderr, "usage: %s <no_file> <in_pat_file> <out_pat_file>\n",
+              argv[0]); 
+-    return ;
++    return 0;
+   }
+ 
+   
+   if ((in_no_file   = fopen(argv[1], "r")) == (FILE *) NULL) 
+   { 
+     fprintf(stderr, "error: can't read file %s\n", argv[1]) ;
+-    return ;
++    return 0;
+   }
+   
+   if ((in_pat_file  = fopen(argv[2], "r")) == (FILE *) NULL)
+   { 
+     fprintf(stderr, "error: can't read file %s\n", argv[2]) ;
+     fclose (in_no_file) ;
+-    return ;
++    return 0;
+   }
+ 
+   if ((out_pat_file = fopen(argv[3], "r")) != (FILE *) NULL)
+   {
+     fclose(out_pat_file) ;
+     fprintf (stderr, "overwrite %s (y/n) ? ", argv[3]) ;
+-    if (getc(stdin) != 'y') return ; 
++    if (getc(stdin) != 'y') return 0; 
+   }
+ 
+   if ((out_pat_file = fopen(argv[3], "w")) == (FILE *) NULL)
+@@ -217,7 +217,7 @@
+     fprintf(stderr, "error: can't create file %s\n", argv[3]) ;
+     fclose (in_no_file)  ;
+     fclose (in_pat_file) ;
+-    return ;
++    return 0;
+   }
+ 
+   
diff -urN /usr/ports/math/snns/files/patch-tools__sources__td_bignet.c math/snns/files/patch-tools__sources__td_bignet.c
--- /usr/ports/math/snns/files/patch-tools__sources__td_bignet.c	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-tools__sources__td_bignet.c	2012-10-24 04:48:55.000000000 +0900
@@ -0,0 +1,11 @@
+--- tools/sources/td_bignet.c.orig	2008-04-21 16:56:09.000000000 +0900
++++ tools/sources/td_bignet.c	2012-10-24 04:46:24.000000000 +0900
+@@ -1052,7 +1052,7 @@
+ 
+   UPDATE   : 
+ ******************************************************************************/
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     char *file_name;
+     int err;
diff -urN /usr/ports/math/snns/files/patch-xgui__sources__ui_main.c math/snns/files/patch-xgui__sources__ui_main.c
--- /usr/ports/math/snns/files/patch-xgui__sources__ui_main.c	2012-11-08 04:32:37.000000000 +0900
+++ math/snns/files/patch-xgui__sources__ui_main.c	2012-10-24 04:52:14.000000000 +0900
@@ -1,11 +1,12 @@
---- xgui/sources/ui_main.c.orig	Sat Dec  4 13:08:46 1999
-+++ xgui/sources/ui_main.c	Sat Dec  4 13:08:04 1999
+--- xgui/sources/ui_main.c.orig	2008-04-21 16:56:25.000000000 +0900
++++ xgui/sources/ui_main.c	2012-10-24 04:51:45.000000000 +0900
 @@ -329,8 +329,10 @@
  
    UPDATE   : 1.4.1990
  ******************************************************************************/
+-void main (int argc, char **argv)
 +#include <floatingpoint.h>
- void main (int argc, char **argv)
++int main (int argc, char **argv)
  {
 +    fpsetmask(0);
      ui_toplevel = XtAppInitialize(&ui_appContext, "Popup", NULL, ZERO,
diff -urN /usr/ports/math/snns/files/patch-xgui__sources__ui_main.h math/snns/files/patch-xgui__sources__ui_main.h
--- /usr/ports/math/snns/files/patch-xgui__sources__ui_main.h	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-xgui__sources__ui_main.h	2012-10-24 04:50:57.000000000 +0900
@@ -0,0 +1,11 @@
+--- xgui/sources/ui_main.h.orig	2008-04-21 16:56:25.000000000 +0900
++++ xgui/sources/ui_main.h	2012-10-24 04:50:27.000000000 +0900
+@@ -23,7 +23,7 @@
+ #define _UI_MAIN_DEFINED_
+ 
+ 
+-extern void main (int, char **);
++extern int main (int, char **);
+ 
+ #ifndef MAXPATHLEN
+ #define MAXPATHLEN  512
diff -urN /usr/ports/math/snns/files/patch-xgui__sources__ui_main.ph math/snns/files/patch-xgui__sources__ui_main.ph
--- /usr/ports/math/snns/files/patch-xgui__sources__ui_main.ph	1970-01-01 09:00:00.000000000 +0900
+++ math/snns/files/patch-xgui__sources__ui_main.ph	2012-10-24 04:54:07.000000000 +0900
@@ -0,0 +1,11 @@
+--- xgui/sources/ui_main.ph.orig	2008-04-21 16:56:25.000000000 +0900
++++ xgui/sources/ui_main.ph	2012-10-24 04:53:47.000000000 +0900
+@@ -26,7 +26,7 @@
+ /* begin global definition section */
+ 
+ 
+-void main (int, char **);
++int main (int, char **);
+ 
+ 
+ #ifndef MAXPATHLEN
>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list