5 files changed, 146 insertions, 32 deletions

diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile
index 8f682c4fb503..fc65478c5769 100644
--- a/devel/open-beagle/Makefile
+++ b/devel/open-beagle/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	open-beagle
-PORTVERSION=	2.2.0
+PORTVERSION=	3.0.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	beagle
 DISTNAME=	beagle-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sf@slappy.org
 COMMENT=	An Evolutionary Computation Framework
 
 CONFLICTS=	beagle-[0-9]*
@@ -21,7 +21,14 @@ USE_GCC=	3.3+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-optimization
 USE_LDCONFIG=	yes
+USE_GMAKE=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile on 4.x
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/open-beagle/distinfo b/devel/open-beagle/distinfo
index 6867139f899e..98c5204d6c29 100644
--- a/devel/open-beagle/distinfo
+++ b/devel/open-beagle/distinfo
@@ -1,3 +1,3 @@
-MD5 (beagle-2.2.0.tar.gz) = 7d7a26b33943144ed345a94f978848ce
-SHA256 (beagle-2.2.0.tar.gz) = 9790556fe353c77e496ba2cd59f77f56f1c08f33cb4a49ad64beb01a67c059d3
-SIZE (beagle-2.2.0.tar.gz) = 4049878
+MD5 (beagle-3.0.1.tar.gz) = 22d1cce24e8a699b457ed196c2a30b51
+SHA256 (beagle-3.0.1.tar.gz) = a0f5dd1f1041cbf44858e89795790ef1d2634564a93a410885fb566d341e5814
+SIZE (beagle-3.0.1.tar.gz) = 4838478
diff --git a/devel/open-beagle/files/patch-PACC-Util-SignalHandler.cpp b/devel/open-beagle/files/patch-PACC-Util-SignalHandler.cpp
new file mode 100644
index 000000000000..22f6c60c072e
--- /dev/null
+++ b/devel/open-beagle/files/patch-PACC-Util-SignalHandler.cpp
@@ -0,0 +1,20 @@
+--- PACC/Util/SignalHandler.cpp.orig	Wed Oct  5 06:38:27 2005
++++ PACC/Util/SignalHandler.cpp	Mon Sep 11 16:09:17 2006
+@@ -89,7 +89,7 @@
+ 	//the signal is not defined under Windows, do nothing
+ 	if(inSignalNumber < 1) return;
+ 	if(smOldSigIgn[inSignalNumber] != NULL) return;
+-	smOldSigIgn[inSignalNumber] = (void*)signal(inSignalNumber, SIG_IGN);
++	smOldSigIgn[inSignalNumber] = (void*)signal(inSignalNumber, (void (*)(int))SIG_IGN);
+ }
+ 
+ /*!
+@@ -126,7 +126,7 @@
+ 		signal(inSignalNumber, (__sighandler_t)smOldSigIgn[inSignalNumber]);
+ #endif
+ 	}
+-	else signal(inSignalNumber, SIG_DFL);
++	else signal(inSignalNumber, (void (*)(int))SIG_DFL);
+ 	smOldSigIgn[inSignalNumber] = NULL;
+ }
+ 
diff --git a/devel/open-beagle/files/patch-config:ltmain.sh b/devel/open-beagle/files/patch-config:ltmain.sh
index 85276b497eaf..e69de29bb2d1 100644
--- a/devel/open-beagle/files/patch-config:ltmain.sh
+++ b/devel/open-beagle/files/patch-config:ltmain.sh
@@ -1,15 +0,0 @@
---- config/ltmain.sh.orig	Wed Jun  9 14:13:42 2004
-+++ config/ltmain.sh	Wed Jun  9 14:13:51 2004
-@@ -4330,10 +4330,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/open-beagle/pkg-plist b/devel/open-beagle/pkg-plist
index b8a8ed155f09..01c636d8b7e7 100644
--- a/devel/open-beagle/pkg-plist
+++ b/devel/open-beagle/pkg-plist
@@ -1,13 +1,55 @@
+include/Math.hpp
+include/Math/Matrix.hpp
+include/Math/Vector.hpp
+include/SVG.hpp
+include/SVG/Canvas.hpp
+include/SVG/Frame.hpp
+include/SVG/Group.hpp
+include/SVG/Path.hpp
+include/SVG/Primitives.hpp
+include/SVG/Styles.hpp
+include/SVG/Transforms.hpp
+include/SVG/Types.hpp
+include/Socket.hpp
+include/Socket/Address.hpp
+include/Socket/Cafe.hpp
+include/Socket/ConnectedUDP.hpp
+include/Socket/Exception.hpp
+include/Socket/Port.hpp
+include/Socket/TCP.hpp
+include/Socket/TCPServer.hpp
+include/Socket/UDP.hpp
+include/Socket/UDPServer.hpp
+include/Threading.hpp
 include/Threading/Condition.hpp
 include/Threading/Exception.hpp
 include/Threading/Mutex.hpp
 include/Threading/Semaphore.hpp
+include/Threading/Task.hpp
 include/Threading/Thread.hpp
-include/Threading/Threading.hpp
+include/Threading/ThreadPool.hpp
+include/Util.hpp
+include/Util/Assert.hpp
+include/Util/Date.hpp
+include/Util/MTRand.hpp
+include/Util/RandomPermutation.hpp
+include/Util/Randomizer.hpp
+include/Util/SignalHandler.hpp
+include/Util/StringFunc.hpp
+include/Util/Timer.hpp
+include/Util/Tokenizer.hpp
+include/XML.hpp
+include/XML/Attribute.hpp
+include/XML/Document.hpp
+include/XML/Finder.hpp
+include/XML/Iterator.hpp
+include/XML/Node.hpp
+include/XML/Streamer.hpp
 include/beagle/AbstractAllocT.hpp
 include/beagle/AbstractContainerAllocT.hpp
 include/beagle/Allocator.hpp
 include/beagle/AllocatorT.hpp
+include/beagle/ArrayT.hpp
 include/beagle/AssertException.hpp
 include/beagle/BadCastException.hpp
 include/beagle/Beagle.hpp
@@ -19,6 +61,8 @@ include/beagle/Coev.hpp
 include/beagle/Coev/EvaluationOp.hpp
 include/beagle/Coev/GPEvaluationOp.hpp
 include/beagle/Coev/TermBroadcastOp.hpp
+include/beagle/Component.hpp
+include/beagle/ComponentMap.hpp
 include/beagle/ConfigurationDumper.hpp
 include/beagle/Container.hpp
 include/beagle/ContainerAllocator.hpp
@@ -31,6 +75,7 @@ include/beagle/Deme.hpp
 include/beagle/DemeAlloc.hpp
 include/beagle/DemeAllocT.hpp
 include/beagle/Double.hpp
+include/beagle/EvaluationMultipleOp.hpp
 include/beagle/EvaluationOp.hpp
 include/beagle/Evolver.hpp
 include/beagle/Exception.hpp
@@ -44,36 +89,49 @@ include/beagle/GA.hpp
 include/beagle/GA/BitString.hpp
 include/beagle/GA/CrossoverBlendESVecOp.hpp
 include/beagle/GA/CrossoverBlendFltVecOp.hpp
+include/beagle/GA/CrossoverIndicesIntVecOp.hpp
 include/beagle/GA/CrossoverOnePointBitStrOp.hpp
 include/beagle/GA/CrossoverOnePointESVecOp.hpp
 include/beagle/GA/CrossoverOnePointFltVecOp.hpp
+include/beagle/GA/CrossoverOnePointIntVecOp.hpp
 include/beagle/GA/CrossoverOnePointOpT.hpp
 include/beagle/GA/CrossoverSBXFltVecOp.hpp
 include/beagle/GA/CrossoverTwoPointsBitStrOp.hpp
 include/beagle/GA/CrossoverTwoPointsESVecOp.hpp
 include/beagle/GA/CrossoverTwoPointsFltVecOp.hpp
+include/beagle/GA/CrossoverTwoPointsIntVecOp.hpp
 include/beagle/GA/CrossoverTwoPointsOpT.hpp
 include/beagle/GA/CrossoverUniformBitStrOp.hpp
 include/beagle/GA/CrossoverUniformESVecOp.hpp
 include/beagle/GA/CrossoverUniformFltVecOp.hpp
+include/beagle/GA/CrossoverUniformIntVecOp.hpp
 include/beagle/GA/CrossoverUniformOpT.hpp
 include/beagle/GA/ESVector.hpp
 include/beagle/GA/EvolverBitString.hpp
 include/beagle/GA/EvolverES.hpp
 include/beagle/GA/EvolverFloatVector.hpp
+include/beagle/GA/EvolverIntegerVector.hpp
 include/beagle/GA/FloatVector.hpp
 include/beagle/GA/InitBitStrOp.hpp
 include/beagle/GA/InitESVecOp.hpp
 include/beagle/GA/InitFltVecOp.hpp
+include/beagle/GA/InitIndicesIntVecOp.hpp
+include/beagle/GA/InitIntVecOp.hpp
+include/beagle/GA/IntegerVector.hpp
 include/beagle/GA/MuWCommaLambdaCMAFltVecOp.hpp
 include/beagle/GA/MutationCMAFltVecOp.hpp
 include/beagle/GA/MutationESVecOp.hpp
 include/beagle/GA/MutationFlipBitStrOp.hpp
 include/beagle/GA/MutationGaussianFltVecOp.hpp
+include/beagle/GA/MutationShuffleIntVecOp.hpp
+include/beagle/GA/MutationUniformIntVecOp.hpp
 include/beagle/GP.hpp
+include/beagle/GP/ADF.hpp
+include/beagle/GP/AbsT.hpp
 include/beagle/GP/AddT.hpp
-include/beagle/GP/AdfT.hpp
 include/beagle/GP/And.hpp
+include/beagle/GP/Argument.hpp
+include/beagle/GP/ArgumentT.hpp
 include/beagle/GP/Context.hpp
 include/beagle/GP/Cos.hpp
 include/beagle/GP/CrossoverConstrainedOp.hpp
@@ -85,8 +143,10 @@ include/beagle/GP/EphemeralDouble.hpp
 include/beagle/GP/EphemeralT.hpp
 include/beagle/GP/EvaluationOp.hpp
 include/beagle/GP/Evolver.hpp
+include/beagle/GP/ExecutionException.hpp
 include/beagle/GP/Exp.hpp
 include/beagle/GP/FitnessKoza.hpp
+include/beagle/GP/IfThenElseT.hpp
 include/beagle/GP/Individual.hpp
 include/beagle/GP/InitFullConstrainedOp.hpp
 include/beagle/GP/InitFullOp.hpp
@@ -94,8 +154,18 @@ include/beagle/GP/InitGrowConstrainedOp.hpp
 include/beagle/GP/InitGrowOp.hpp
 include/beagle/GP/InitHalfConstrainedOp.hpp
 include/beagle/GP/InitHalfOp.hpp
+include/beagle/GP/InitializationOp.hpp
+include/beagle/GP/Invoker.hpp
 include/beagle/GP/Log.hpp
+include/beagle/GP/MaxNodesExecutionException.hpp
+include/beagle/GP/MaxTimeExecutionException.hpp
+include/beagle/GP/Module.hpp
+include/beagle/GP/ModuleCompressOp.hpp
+include/beagle/GP/ModuleExpandOp.hpp
+include/beagle/GP/ModuleVectorComponent.hpp
 include/beagle/GP/MultiplyT.hpp
+include/beagle/GP/MutationEphemeralDoubleOp.hpp
+include/beagle/GP/MutationEphemeralOpT.hpp
 include/beagle/GP/MutationShrinkConstrainedOp.hpp
 include/beagle/GP/MutationShrinkOp.hpp
 include/beagle/GP/MutationStandardConstrainedOp.hpp
@@ -110,9 +180,11 @@ include/beagle/GP/Not.hpp
 include/beagle/GP/Or.hpp
 include/beagle/GP/Primitive.hpp
 include/beagle/GP/PrimitiveInline.hpp
+include/beagle/GP/PrimitiveMap.hpp
 include/beagle/GP/PrimitiveSet.hpp
 include/beagle/GP/PrimitiveSuperSet.hpp
 include/beagle/GP/PrimitiveUsageStatsOp.hpp
+include/beagle/GP/ResourcesExceededExecutionException.hpp
 include/beagle/GP/Sin.hpp
 include/beagle/GP/StatsCalcFitnessKozaOp.hpp
 include/beagle/GP/StatsCalcFitnessSimpleOp.hpp
@@ -121,6 +193,7 @@ include/beagle/GP/System.hpp
 include/beagle/GP/TermMaxHitsOp.hpp
 include/beagle/GP/TokenT.hpp
 include/beagle/GP/Tree.hpp
+include/beagle/GP/ValidateOp.hpp
 include/beagle/GP/Vivarium.hpp
 include/beagle/GP/Xor.hpp
 include/beagle/GenerationalOp.hpp
@@ -132,10 +205,12 @@ include/beagle/IfThenElseOp.hpp
 include/beagle/Individual.hpp
 include/beagle/IndividualAlloc.hpp
 include/beagle/IndividualAllocT.hpp
+include/beagle/IndividualBag.hpp
+include/beagle/IndividualSizeFrequencyStatsOp.hpp
 include/beagle/InitializationOp.hpp
 include/beagle/Int.hpp
-include/beagle/IntegerVector.hpp
 include/beagle/InternalException.hpp
+include/beagle/InvalidateFitnessOp.hpp
 include/beagle/IsEqualMapPairPredicate.hpp
 include/beagle/IsEqualPointerPredicate.hpp
 include/beagle/IsLessMapPairPredicate.hpp
@@ -155,6 +230,7 @@ include/beagle/MuPlusLambdaOp.hpp
 include/beagle/MutationOp.hpp
 include/beagle/NPGA2Op.hpp
 include/beagle/NSGA2Op.hpp
+include/beagle/NamedObject.hpp
 include/beagle/Object.hpp
 include/beagle/ObjectException.hpp
 include/beagle/Operator.hpp
@@ -166,10 +242,10 @@ include/beagle/Pointer.hpp
 include/beagle/PointerT.hpp
 include/beagle/RandomShuffleDemeOp.hpp
 include/beagle/Randomizer.hpp
-include/beagle/RandomizerMersenne.hpp
 include/beagle/Register.hpp
 include/beagle/RegisterReadOp.hpp
 include/beagle/ReplacementStrategyOp.hpp
+include/beagle/RouletteT.hpp
 include/beagle/RunTimeException.hpp
 include/beagle/SelectParsimonyTournOp.hpp
 include/beagle/SelectRandomOp.hpp
@@ -190,7 +266,6 @@ include/beagle/TermMaxFitnessOp.hpp
 include/beagle/TermMaxGenOp.hpp
 include/beagle/TermMinFitnessOp.hpp
 include/beagle/TerminationOp.hpp
-include/beagle/Tokenizer.hpp
 include/beagle/UChar.hpp
 include/beagle/UInt.hpp
 include/beagle/ULong.hpp
@@ -201,30 +276,57 @@ include/beagle/Vivarium.hpp
 include/beagle/VivariumAlloc.hpp
 include/beagle/VivariumAllocT.hpp
 include/beagle/WrapperT.hpp
-include/beagle/XMLNode.hpp
-include/beagle/XMLParser.hpp
-include/beagle/XMLStreamer.hpp
 include/beagle/castObjectT.hpp
 include/beagle/config.hpp
 include/beagle/macros.hpp
 include/gzstream.h
-lib/libThreading-%%PORTVERSION%%.so
-lib/libThreading.a
-lib/libThreading.so
 lib/libbeagle-%%PORTVERSION%%.so
 lib/libbeagle-Coev-%%PORTVERSION%%.so
 lib/libbeagle-Coev.a
+lib/libbeagle-Coev.la
 lib/libbeagle-Coev.so
 lib/libbeagle-GA-%%PORTVERSION%%.so
 lib/libbeagle-GA.a
+lib/libbeagle-GA.la
 lib/libbeagle-GA.so
 lib/libbeagle-GP-%%PORTVERSION%%.so
 lib/libbeagle-GP.a
+lib/libbeagle-GP.la
 lib/libbeagle-GP.so
 lib/libbeagle.a
+lib/libbeagle.la
 lib/libbeagle.so
+lib/libpacc-math-1.2.1.so
+lib/libpacc-math.a
+lib/libpacc-math.la
+lib/libpacc-math.so
+lib/libpacc-socket-1.2.1.so
+lib/libpacc-socket.a
+lib/libpacc-socket.la
+lib/libpacc-socket.so
+lib/libpacc-svg-1.2.1.so
+lib/libpacc-svg.a
+lib/libpacc-svg.la
+lib/libpacc-svg.so
+lib/libpacc-threading-1.2.1.so
+lib/libpacc-threading.a
+lib/libpacc-threading.la
+lib/libpacc-threading.so
+lib/libpacc-util-1.2.1.so
+lib/libpacc-util.a
+lib/libpacc-util.la
+lib/libpacc-util.so
+lib/libpacc-xml-1.2.1.so
+lib/libpacc-xml.a
+lib/libpacc-xml.la
+lib/libpacc-xml.so
 @dirrm include/beagle/GP
 @dirrm include/beagle/GA
 @dirrm include/beagle/Coev
 @dirrm include/beagle
+@dirrm include/XML
+@dirrm include/Util
 @dirrm include/Threading
+@dirrm include/Socket
+@dirrm include/SVG
+@dirrm include/Math