Update to 4.2.

8 files changed, 95 insertions, 17 deletions

diff --git a/math/snns/Makefile b/math/snns/Makefile
index f999c9f04ddb..f196bcb4cbf8 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,31 +1,27 @@
 # New ports collection makefile for:	snns
-# Version required:	4.1
+# Version required:	4.2
 # Date created:		2 Febuary 1997
 # Whom:			reg@shale.csir.co.za
 #
 # $FreeBSD$
 #
 
-DISTNAME=	SNNSv4.1
-PKGNAME=	snns-4.1
+DISTNAME=	SNNSv4.2
+PKGNAME=	snns-4.2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/
 
-MAINTAINER=	reg@shale.csir.co.za
+MAINTAINER=	reg@FreeBSD.org
 
 USE_XLIB=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}/snns --enable-global
 
 post-configure:
-	@(cd ${WRKSRC} && ./configure < options.FreeBSD)
 	@(${SED} -e "s#%prefix%#${PREFIX}#g" < ${FILESDIR}/snns > ${WRKSRC}/snns)
 
-do-build:
-	@(cd ${WRKSRC} && ./build all)
-
-do-install:
-	${MKDIR} ${PREFIX}/snns/bin ${PREFIX}/snns/examples
-	${INSTALL_PROGRAM} ${WRKSRC}/xgui/bin/other/xgui ${PREFIX}/snns/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/bin/other/* ${PREFIX}/snns/bin
+post-install:
+	${MKDIR} ${PREFIX}/snns/examples;
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/snns/examples
 	${INSTALL_DATA} ${WRKSRC}/Readme ${PREFIX}/snns
 	${INSTALL_DATA} ${WRKSRC}/Readme.license ${PREFIX}/snns
diff --git a/math/snns/distinfo b/math/snns/distinfo
index 5da072b91ab4..4690c909f5e2 100644
--- a/math/snns/distinfo
+++ b/math/snns/distinfo
@@ -1 +1 @@
-MD5 (SNNSv4.1.tar.gz) = 6385faf45eec7bfba67d7024c31d1ac0
+MD5 (SNNSv4.2.tar.gz) = 4609dfd61714bfbb0842d4e8e905e584
diff --git a/math/snns/files/patch-ab b/math/snns/files/patch-ab
new file mode 100644
index 000000000000..80342b770e1b
--- /dev/null
+++ b/math/snns/files/patch-ab
@@ -0,0 +1,20 @@
+--- kernel/sources/Makefile.orig	Thu Sep  3 06:38:00 1998
++++ kernel/sources/Makefile	Sat Dec  4 12:52:06 1999
+@@ -27,7 +27,7 @@
+ # Define final C-preprocessor options for the kernel
+ # Additional definitions like -I... and -D... go here
+ CPPFLAGS           = -I../.. \
+-                     $(ENZOFLAGS)
++                     $(ENZOFLAGS) -DHAVE_VALUES_H
+ 
+ # Here you may change the default C-compiler flags as set in
+ # ../../Makefile.def (not recommended)
+@@ -100,7 +100,7 @@
+ all: $(LIBKERNEL) $(LIBFUNCS)
+ 
+ $(KERNELBINDIR):
+-	-mkdir $(KERNELBINDIR)
++	-mkdir -p $(KERNELBINDIR)
+ 
+ install: all $(KERNELBINDIR)
+ 	@echo "nothing to install"
diff --git a/math/snns/files/patch-ac b/math/snns/files/patch-ac
new file mode 100644
index 000000000000..9642768b93b8
--- /dev/null
+++ b/math/snns/files/patch-ac
@@ -0,0 +1,15 @@
+--- man/Makefile.orig	Sat Dec  4 12:52:20 1999
++++ man/Makefile	Sat Dec  4 12:52:35 1999
+@@ -45,10 +45,10 @@
+ 	@echo "nothing to make"
+ 
+ $(MANDIR):
+-	-mkdir $(MANDIR)
++	-mkdir -p $(MANDIR)
+ 
+ $(MAN1DIR): $(MANDIR)
+-	-mkdir $(MAN1DIR)
++	-mkdir -p $(MAN1DIR)
+ 
+ install-one: $(MAN1DIR)
+ 	for mantarget in $(MAN1FILES) ; do \
diff --git a/math/snns/files/patch-ad b/math/snns/files/patch-ad
new file mode 100644
index 000000000000..db89b0867794
--- /dev/null
+++ b/math/snns/files/patch-ad
@@ -0,0 +1,11 @@
+--- tools/sources/Makefile.orig	Sat Dec  4 12:53:02 1999
++++ tools/sources/Makefile	Sat Dec  4 12:53:17 1999
+@@ -110,7 +110,7 @@
+ tools:       $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG)
+ 
+ $(TOOLSBINDIR):
+-	-mkdir $(TOOLSBINDIR)
++	-mkdir -p $(TOOLSBINDIR)
+ 
+ install: tools $(TOOLSBINDIR)
+ 	for tooltarget in $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG) ; do \
diff --git a/math/snns/files/patch-ae b/math/snns/files/patch-ae
new file mode 100644
index 000000000000..544f0bbc9c1a
--- /dev/null
+++ b/math/snns/files/patch-ae
@@ -0,0 +1,11 @@
+--- xgui/sources/Makefile.orig	Sat Dec  4 12:53:34 1999
++++ xgui/sources/Makefile	Sat Dec  4 12:53:53 1999
+@@ -147,7 +147,7 @@
+ all: $(PROGRAM)
+ 
+ $(XGUIBINDIR):
+-	-mkdir $(XGUIBINDIR)
++	-mkdir -p $(XGUIBINDIR)
+ 
+ install: all $(XGUIBINDIR)
+ 	$(INSTALL_PROGRAM) $(PROGRAM) $(XGUIBINDIR)
diff --git a/math/snns/files/patch-af b/math/snns/files/patch-af
new file mode 100644
index 000000000000..62bf3c29ae30
--- /dev/null
+++ b/math/snns/files/patch-af
@@ -0,0 +1,13 @@
+--- 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
+@@ -329,8 +329,10 @@
+ 
+   UPDATE   : 1.4.1990
+ ******************************************************************************/
++#include <floatingpoint.h>
+ void main (int argc, char **argv)
+ {
++    fpsetmask(0);
+     ui_toplevel = XtAppInitialize(&ui_appContext, "Popup", NULL, ZERO,
+ 				  (int *) &argc, argv, fallback_resources, 
+ 				  NULL, ZERO);
diff --git a/math/snns/pkg-plist b/math/snns/pkg-plist
index 541538602cba..cd959677dfb5 100644
--- a/math/snns/pkg-plist
+++ b/math/snns/pkg-plist
@@ -1,23 +1,25 @@
 bin/snns
 snns/Readme
 snns/Readme.license
-snns/default.cfg
-snns/help.hdoc
 snns/bin/analyze
 snns/bin/batchman
-snns/bin/bignet
 snns/bin/convert2snns
 snns/bin/feedback-gennet
+snns/bin/ff_bignet
 snns/bin/isnns
+snns/bin/linknets
 snns/bin/mkhead
 snns/bin/mkout
 snns/bin/mkpat
 snns/bin/netlearn
 snns/bin/netperf
 snns/bin/pat_sel
+snns/bin/pat_sel_simple
 snns/bin/snns2c
 snns/bin/snnsbat
+snns/bin/td_bignet
 snns/bin/xgui
+snns/default.cfg
 snns/examples/README.all
 snns/examples/art1_letters.README
 snns/examples/art1_letters.cfg
@@ -99,18 +101,21 @@ snns/examples/letters.pat
 snns/examples/letters.res
 snns/examples/letters3D.cfg
 snns/examples/letters3D.net
-snns/examples/letters_test.net
+snns/examples/letters_auto.pat
 snns/examples/letters_untrained.net
+snns/examples/letters_with_classes.pat
 snns/examples/nettalk.README
 snns/examples/nettalk.cfg
 snns/examples/nettalk.net
 snns/examples/nettalk.pat
+snns/examples/nettalk_thr.net
 snns/examples/patmat.README
 snns/examples/patmat.cfg
 snns/examples/patmat.chk
 snns/examples/patmat.net
 snns/examples/patmat.pat
 snns/examples/patmat_untrained.net
+snns/examples/rpropMAP.net
 snns/examples/snnsbat1.cfb
 snns/examples/snnsbat2.cfb
 snns/examples/som_cube.README
@@ -123,6 +128,12 @@ snns/examples/spirals.pat
 snns/examples/spirals_dda.README
 snns/examples/spirals_dda.cfg
 snns/examples/spirals_dda.net
+snns/examples/sprach_test.pat
+snns/examples/sprach_train.pat
+snns/examples/testMAP.pat
+snns/examples/trainMAP.pat
+snns/examples/trainValidMAP.pat
+snns/examples/validMAP.pat
 snns/examples/watch.README
 snns/examples/watch.cfg
 snns/examples/watch.net
@@ -143,6 +154,7 @@ snns/examples/xor_rec.net
 snns/examples/xor_rec1.pat
 snns/examples/xor_rec2.pat
 snns/examples/xor_untrained.net
+snns/help.hdoc
 @dirrm snns/bin
 @dirrm snns/examples
 @dirrm snns