14 files changed, 191 insertions, 9 deletions

diff --git a/math/snns/Makefile b/math/snns/Makefile
index 3bd02f5f66bc..05b5a999b515 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	snns
-# Date created:		2 Febuary 1997
-# Whom:			reg@shale.csir.co.za
-#
+# Created by: reg@shale.csir.co.za
 # $FreeBSD$
-#
 
 PORTNAME=	snns
 PORTVERSION=	4.3
@@ -21,6 +17,9 @@ USE_XORG=	x11 xext xt
 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 @@ post-install:
 	${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 --git a/math/snns/files/patch-tools__sources__analyze.c b/math/snns/files/patch-tools__sources__analyze.c
new file mode 100644
index 000000000000..32e1dbe81355
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__analyze.c
@@ -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 --git a/math/snns/files/patch-tools__sources__convert2snns.c b/math/snns/files/patch-tools__sources__convert2snns.c
new file mode 100644
index 000000000000..29bd0229e4d1
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__convert2snns.c
@@ -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 --git a/math/snns/files/patch-tools__sources__feedback-gennet.c b/math/snns/files/patch-tools__sources__feedback-gennet.c
new file mode 100644
index 000000000000..0248d39fc78f
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__feedback-gennet.c
@@ -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 --git a/math/snns/files/patch-tools__sources__ff_bignet.c b/math/snns/files/patch-tools__sources__ff_bignet.c
new file mode 100644
index 000000000000..2243e9d9340b
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__ff_bignet.c
@@ -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 --git a/math/snns/files/patch-tools__sources__mkhead.c b/math/snns/files/patch-tools__sources__mkhead.c
new file mode 100644
index 000000000000..cbfceae7a045
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__mkhead.c
@@ -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 --git a/math/snns/files/patch-tools__sources__mkout.c b/math/snns/files/patch-tools__sources__mkout.c
new file mode 100644
index 000000000000..2e846f4200e0
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__mkout.c
@@ -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 --git a/math/snns/files/patch-tools__sources__mkpat.c b/math/snns/files/patch-tools__sources__mkpat.c
new file mode 100644
index 000000000000..ff33540863d3
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__mkpat.c
@@ -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 --git a/math/snns/files/patch-tools__sources__pat_sel.c b/math/snns/files/patch-tools__sources__pat_sel.c
new file mode 100644
index 000000000000..437c96cdc042
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__pat_sel.c
@@ -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 --git a/math/snns/files/patch-tools__sources__pat_sel_simple.c b/math/snns/files/patch-tools__sources__pat_sel_simple.c
new file mode 100644
index 000000000000..36f5edcca719
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__pat_sel_simple.c
@@ -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 --git a/math/snns/files/patch-tools__sources__td_bignet.c b/math/snns/files/patch-tools__sources__td_bignet.c
new file mode 100644
index 000000000000..8d27d067a25a
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__td_bignet.c
@@ -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 --git a/math/snns/files/patch-xgui__sources__ui_main.c b/math/snns/files/patch-xgui__sources__ui_main.c
index 62bf3c29ae30..b7059b2bd5d4 100644
--- a/math/snns/files/patch-xgui__sources__ui_main.c
+++ b/math/snns/files/patch-xgui__sources__ui_main.c
@@ -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 --git a/math/snns/files/patch-xgui__sources__ui_main.h b/math/snns/files/patch-xgui__sources__ui_main.h
new file mode 100644
index 000000000000..f6281f4e1cad
--- /dev/null
+++ b/math/snns/files/patch-xgui__sources__ui_main.h
@@ -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 --git a/math/snns/files/patch-xgui__sources__ui_main.ph b/math/snns/files/patch-xgui__sources__ui_main.ph
new file mode 100644
index 000000000000..1d36065db25c
--- /dev/null
+++ b/math/snns/files/patch-xgui__sources__ui_main.ph
@@ -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