5 files changed, 18 insertions, 41 deletions

diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index d1a12ed4d695..db4dd470882a 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -7,24 +7,26 @@
 #
 
 PORTNAME=	gaul
-PORTVERSION=	0.1846
-PORTREVISION=	1
+PORTVERSION=	0.1847.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-devel-${PORTVERSION}-0
+DISTNAME=	${PORTNAME}-devel-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Genetic Algorithm Utility Library
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
-USE_GNOME=	gnometarget
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lcurses"
-
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/devel/gaul/distinfo b/devel/gaul/distinfo
index 793b7426875e..3639d14c9f3b 100644
--- a/devel/gaul/distinfo
+++ b/devel/gaul/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaul-devel-0.1846-0.tar.gz) = 1cce2bf4546ee4739f85076ab26ca983
-SIZE (gaul-devel-0.1846-0.tar.gz) = 497588
+MD5 (gaul-devel-0.1847-0.tar.gz) = 95e6e943801fa6cad6fe65d715c5f6ac
+SIZE (gaul-devel-0.1847-0.tar.gz) = 489746
diff --git a/devel/gaul/files/patch-gaul_util.h b/devel/gaul/files/patch-gaul_util.h
deleted file mode 100644
index 514ba91e9d5f..000000000000
--- a/devel/gaul/files/patch-gaul_util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/gaul/gaul_util.h.orig	Fri Oct 31 10:06:41 2003
-+++ util/gaul/gaul_util.h	Fri Oct 31 10:06:52 2003
-@@ -103,7 +103,7 @@
- /*
-  * Define boolean type sensibly.
-  */
--#if HAVE_STDBOOL_H != 1
-+#if HAVE_STDBOOL_H == 1
- # include <stdbool.h>
- #else
- 
diff --git a/devel/gaul/files/patch-util::str_util.c b/devel/gaul/files/patch-util::str_util.c
deleted file mode 100644
index f841ceea18af..000000000000
--- a/devel/gaul/files/patch-util::str_util.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/str_util.c.orig	Wed Jul 16 23:56:06 2003
-+++ util/str_util.c	Sat Feb  7 22:19:51 2004
-@@ -1103,7 +1103,11 @@
- /*
-  * Determine required size for destination buffer.
-  */
-+  #if defined(__amd64__)
-+  va_copy(orig_ap, ap);
-+  #else
-   orig_ap = ap;
-+  #endif
-   len = strlen(str);
- 
-   while ( (sp = va_arg(ap, char *))!=NULL ) len += strlen(sp);
diff --git a/devel/gaul/pkg-plist b/devel/gaul/pkg-plist
index 1dd914941f03..a7874488d46e 100644
--- a/devel/gaul/pkg-plist
+++ b/devel/gaul/pkg-plist
@@ -1,7 +1,7 @@
-bin/diagnostics
 bin/fitting
 bin/fitting_sd
 bin/fitting_simplex
+bin/gaul_diagnostics
 bin/goldberg1
 bin/goldberg2
 bin/mixed
@@ -24,16 +24,18 @@ bin/struggle5_forked
 bin/struggle5_mp
 bin/struggle_dc
 bin/struggle_forked
+bin/struggle_mp
+bin/struggle_mpi
 bin/struggle_randomsearch
 bin/struggle_ss
 bin/struggle_systematicsearch
+bin/struggle_threaded
 bin/test_ga
 bin/test_sd
 bin/test_simplex
 bin/wildfire
 bin/wildfire_forked
 bin/wildfire_loadbalancing
-include/gaul.h
 include/gaul/avltree.h
 include/gaul/compatibility.h
 include/gaul/ga_bitstring.h
@@ -59,14 +61,11 @@ include/gaul/linkedlist.h
 include/gaul/log_util.h
 include/gaul/memory_chunks.h
 include/gaul/memory_util.h
-include/gaul/mpi_util.h
 include/gaul/nn_util.h
 include/gaul/random_util.h
-include/gaul/str_match.h
-include/gaul/str_util.h
 include/gaul/table_util.h
 include/gaul/timer_util.h
-@dirrm include/gaul
+include/gaul.h
 lib/libgaul.a
 lib/libgaul.so
 lib/libgaul.so.0
@@ -76,3 +75,4 @@ lib/libgaul_util.so.0
 lib/libnn_util.a
 lib/libnn_util.so
 lib/libnn_util.so.0
+@dirrm include/gaul