Update to fix build on -current

PR:		ports/45555
Submitted by:	Horance Chou <horance@freedom.ie.cycu.edu.tw>

4 files changed, 336 insertions, 10 deletions

diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 6a4691a32e64..3909dcb9c29d 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -15,8 +15,13 @@ MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs21
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		BLT24.2:${PORTSDIR}/x11-toolkits/blt
+.if defined(WITH_HDF5)
+LIB_DEPENDS+=	hdf5.0:${PORTSDIR}/graphics/hdf5
+.endif
 
+.if defined(WITH_JAVA)
 USE_JAVA=	1.3+
+.endif
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_LIBTOOL=	yes
@@ -27,6 +32,22 @@ CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 		--with-tclscriptdir=${PREFIX}/lib/tcl8.3 \
 		--with-tkscriptdir=${PREFIX}/lib/tk8.3 \
 		--enable-subdirs
+.if defined(WITH_JAVA)
+CONFIGURE_ARGS+=	--with-jdkdir=${JAVA_HOME}
+PLIST=		${PKGDIR}/pkg-plist.withjava
+.endif
+
+pre-everything::
+.if !defined(WITH_JAVA)
+	@${ECHO_MSG} "===>"
+	@${ECHO_MSG} "===> To enable java support , please define WITH_JAVA"
+	@${ECHO_MSG} "===>"
+.endif
+.if !defined(WITH_HDF5)
+	@${ECHO_MSG} "===>"
+	@${ECHO_MSG} "===> To enable HDF5 support, please define WITH_HDF5"
+	@${ECHO_MSG} "===>"
+.endif
 
 post-install:
 	${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
diff --git a/devel/swarm/files/patch-activity.h b/devel/swarm/files/patch-activity.h
new file mode 100644
index 000000000000..9dae7df9ad24
--- /dev/null
+++ b/devel/swarm/files/patch-activity.h
@@ -0,0 +1,18 @@
+--- src/activity/activity.h.orig	Thu Nov 21 12:13:38 2002
++++ src/activity/activity.h	Thu Nov 21 12:13:53 2002
+@@ -462,6 +462,7 @@
+ #ifndef DEFINED_timeval_t
+ #define DEFINED_timeval_t
+ 
++typedef unsigned long timeval_t;
+ //T: Values of this type are used as keys when inserting actions into a
+ //T: schedule at a particular time, or for querying the current time value
+ //T: of a swarm or schedule during its execution.  (The shorter name time_t
+@@ -478,7 +479,6 @@
+ //T: a containing schedule or swarm.  (.. Currently, all this extended time
+ //T: unit support is unsupported, though there is an example of scheduling
+ //T: at subunit times in a GridTurtle test program.)
+-typedef unsigned long timeval_t;
+ #endif
+ 
+ 
diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist
index a38ce40261c8..0700c7067185 100644
--- a/devel/swarm/pkg-plist
+++ b/devel/swarm/pkg-plist
@@ -1,5 +1,3 @@
-bin/javaswarm
-bin/javacswarm
 bin/libtool-swarm
 bin/m2h
 bin/make-h2x
@@ -241,12 +239,6 @@ lib/swarm/libdefobj.a
 lib/swarm/libdefobj.so
 lib/swarm/libdefobj.so.4
 lib/swarm/libmisc.a
-lib/swarm/libjavaswarm.a
-lib/swarm/libjavaswarm.so
-lib/swarm/libjavaswarm.so.1
-lib/swarm/libjavaswarmstubs.a
-lib/swarm/libjavaswarmstubs.so
-lib/swarm/libjavaswarmstubs.so.0
 lib/swarm/libmisc.so
 lib/swarm/libmisc.so.2
 lib/swarm/libobjc.a
@@ -277,7 +269,6 @@ lib/swarm/libtclobjc.so.1
 lib/swarm/libtkobjc.a
 lib/swarm/libtkobjc.so
 lib/swarm/libtkobjc.so.5
-share/swarm/swarm.jar
 @dirrm etc/swarm
 @dirrm include/swarm/activity
 @dirrm include/swarm/analysis
@@ -294,4 +285,3 @@ share/swarm/swarm.jar
 @dirrm include/swarm/tkobjc
 @dirrm include/swarm
 @dirrm lib/swarm
-@dirrm share/swarm
diff --git a/devel/swarm/pkg-plist.withjava b/devel/swarm/pkg-plist.withjava
new file mode 100644
index 000000000000..a38ce40261c8
--- /dev/null
+++ b/devel/swarm/pkg-plist.withjava
@@ -0,0 +1,297 @@
+bin/javaswarm
+bin/javacswarm
+bin/libtool-swarm
+bin/m2h
+bin/make-h2x
+etc/swarm/Makefile.appl
+etc/swarm/Makefile.common
+etc/swarm/Makefile.lib
+etc/swarm/Makefile.rules
+etc/swarm/config.swarm
+include/swarm/activity.h
+include/swarm/activity/Action.h
+include/swarm/activity/ActionGroup.h
+include/swarm/activity/CompoundAction.h
+include/swarm/activity/Schedule.h
+include/swarm/activity/SwarmProcess.h
+include/swarm/activity/XActivity.h
+include/swarm/activity/classes.h
+include/swarm/activity/types.h
+include/swarm/analysis.h
+include/swarm/analysis/ActiveGraph.h
+include/swarm/analysis/ActiveOutFile.h
+include/swarm/analysis/Averager.h
+include/swarm/analysis/EZBin.h
+include/swarm/analysis/EZDistribution.h
+include/swarm/analysis/EZGraph.h
+include/swarm/analysis/Entropy.h
+include/swarm/analysis/FunctionGraph.h
+include/swarm/collections.h
+include/swarm/collections/Array.h
+include/swarm/collections/Collection.h
+include/swarm/collections/InputStream.h
+include/swarm/collections/List.h
+include/swarm/collections/ListShuffler.h
+include/swarm/collections/List_GEN.h
+include/swarm/collections/List_linked.h
+include/swarm/collections/List_mlinks.h
+include/swarm/collections/Map.h
+include/swarm/collections/OrderedSet.h
+include/swarm/collections/OutputStream.h
+include/swarm/collections/Permutation.h
+include/swarm/collections/Set.h
+include/swarm/collections/Stream.h
+include/swarm/collections/StringObject.h
+include/swarm/collections/classes.h
+include/swarm/collections/collections.h
+include/swarm/collections/predicates.h
+include/swarm/collections/types.h
+include/swarm/defobj.h
+include/swarm/defobj/Archiver.h
+include/swarm/defobj/Arguments.h
+include/swarm/defobj/Create.h
+include/swarm/defobj/Customize.h
+include/swarm/defobj/DefClass.h
+include/swarm/defobj/DefObject.h
+include/swarm/defobj/FArguments.h
+include/swarm/defobj/FCall.h
+include/swarm/defobj/HDF5Archiver.h
+include/swarm/defobj/HDF5Object.h
+include/swarm/defobj/JavaCollection.h
+include/swarm/defobj/JavaCollectionIndex.h
+include/swarm/defobj/JavaProxy.h
+include/swarm/defobj/LispArchiver.h
+include/swarm/defobj/Program.h
+include/swarm/defobj/Symbol.h
+include/swarm/defobj/Zone.h
+include/swarm/defobj/classes.h
+include/swarm/defobj/defalloc.h
+include/swarm/defobj/deftype.h
+include/swarm/defobj/directory.h
+include/swarm/defobj/javavars.h
+include/swarm/defobj/types.h
+include/swarm/defobj/version.h
+include/swarm/externvar.h
+include/swarm/gui.h
+include/swarm/misc.h
+include/swarm/misc/argp.h
+include/swarm/misc/avl.h
+include/swarm/misc/getopt.h
+include/swarm/objc/NXConstStr.h
+include/swarm/objc/Object.h
+include/swarm/objc/Protocol.h
+include/swarm/objc/encoding.h
+include/swarm/objc/externvar.h
+include/swarm/objc/hash.h
+include/swarm/objc/mframe.h
+include/swarm/objc/objc-api.h
+include/swarm/objc/objc-list.h
+include/swarm/objc/objc.h
+include/swarm/objc/runtime.h
+include/swarm/objc/sarray.h
+include/swarm/objc/thr.h
+include/swarm/objc/typedstream.h
+include/swarm/objectbase.h
+include/swarm/objectbase/ActivityControl.h
+include/swarm/objectbase/CompleteProbeMap.h
+include/swarm/objectbase/CompleteVarMap.h
+include/swarm/objectbase/CustomProbeMap.h
+include/swarm/objectbase/DefaultProbeMap.h
+include/swarm/objectbase/EmptyProbeMap.h
+include/swarm/objectbase/MessageProbe.h
+include/swarm/objectbase/Probe.h
+include/swarm/objectbase/ProbeLibrary.h
+include/swarm/objectbase/ProbeMap.h
+include/swarm/objectbase/Swarm.h
+include/swarm/objectbase/SwarmObject.h
+include/swarm/objectbase/VarProbe.h
+include/swarm/objectbase/probing.h
+include/swarm/objectbase/swarm_rts_routines.h
+include/swarm/random.h
+include/swarm/random/ACGgen.h
+include/swarm/random/BernoulliDist.h
+include/swarm/random/C2LCGXgen.h
+include/swarm/random/C2MRG3gen.h
+include/swarm/random/C2TAUSgen.h
+include/swarm/random/C3MWCgen.h
+include/swarm/random/C4LCGXgen.h
+include/swarm/random/ExponentialDist.h
+include/swarm/random/GammaDist.h
+include/swarm/random/LCGgen.h
+include/swarm/random/LogNormalDist.h
+include/swarm/random/MRGgen.h
+include/swarm/random/MT19937gen.h
+include/swarm/random/MWCAgen.h
+include/swarm/random/MWCBgen.h
+include/swarm/random/NormalDist.h
+include/swarm/random/PMMLCGgen.h
+include/swarm/random/PSWBgen.h
+include/swarm/random/RWC2gen.h
+include/swarm/random/RWC8gen.h
+include/swarm/random/RandomBitDist.h
+include/swarm/random/SCGgen.h
+include/swarm/random/SWBgen.h
+include/swarm/random/TGFSRgen.h
+include/swarm/random/UniformDoubleDist.h
+include/swarm/random/UniformIntegerDist.h
+include/swarm/random/UniformUnsignedDist.h
+include/swarm/random/distributions.h
+include/swarm/random/generators.h
+include/swarm/random/randomdefs.h
+include/swarm/random/randomvars.h
+include/swarm/simtools.h
+include/swarm/simtools/AppendFile.h
+include/swarm/simtools/InFile.h
+include/swarm/simtools/NSelect.h
+include/swarm/simtools/ObjectLoader.h
+include/swarm/simtools/ObjectSaver.h
+include/swarm/simtools/OutFile.h
+include/swarm/simtools/QSort.h
+include/swarm/simtools/UName.h
+include/swarm/simtools/initSwarm.h
+include/swarm/simtoolsgui.h
+include/swarm/simtoolsgui/ActionCache.h
+include/swarm/simtoolsgui/ActionHolder.h
+include/swarm/simtoolsgui/ClassDisplayWidget.h
+include/swarm/simtoolsgui/CommonProbeDisplay.h
+include/swarm/simtoolsgui/CompleteProbeDisplay.h
+include/swarm/simtoolsgui/ControlPanel.h
+include/swarm/simtoolsgui/GUIComposite.h
+include/swarm/simtoolsgui/GUISwarm.h
+include/swarm/simtoolsgui/MessageProbeWidget.h
+include/swarm/simtoolsgui/MultiVarProbeDisplay.h
+include/swarm/simtoolsgui/MultiVarProbeWidget.h
+include/swarm/simtoolsgui/ProbeDisplay.h
+include/swarm/simtoolsgui/ProbeDisplayManager.h
+include/swarm/simtoolsgui/SimpleProbeDisplay.h
+include/swarm/simtoolsgui/SingleProbeDisplay.h
+include/swarm/simtoolsgui/VarProbeWidget.h
+include/swarm/space.h
+include/swarm/space/Ca2d.h
+include/swarm/space/ConwayLife2d.h
+include/swarm/space/DblBuffer2d.h
+include/swarm/space/Diffuse2d.h
+include/swarm/space/Discrete2d.h
+include/swarm/space/Grid2d.h
+include/swarm/space/Int2dFiler.h
+include/swarm/space/Object2dDisplay.h
+include/swarm/space/Value2dDisplay.h
+include/swarm/swarmconfig.h
+include/swarm/tclobjc/TclInterp.h
+include/swarm/tclobjc/TkInterp.h
+include/swarm/tclobjc/tclObjc.h
+include/swarm/tkobjc.h
+include/swarm/tkobjc/ArchivedGeometryWidget.h
+include/swarm/tkobjc/Button.h
+include/swarm/tkobjc/ButtonPanel.h
+include/swarm/tkobjc/Canvas.h
+include/swarm/tkobjc/CanvasAbstractItem.h
+include/swarm/tkobjc/CanvasItem.h
+include/swarm/tkobjc/CheckButton.h
+include/swarm/tkobjc/Circle.h
+include/swarm/tkobjc/ClassDisplayHideButton.h
+include/swarm/tkobjc/ClassDisplayLabel.h
+include/swarm/tkobjc/Colormap.h
+include/swarm/tkobjc/CompleteProbeDisplayLabel.h
+include/swarm/tkobjc/CompositeItem.h
+include/swarm/tkobjc/Entry.h
+include/swarm/tkobjc/Form.h
+include/swarm/tkobjc/Frame.h
+include/swarm/tkobjc/Graph.h
+include/swarm/tkobjc/Histogram.h
+include/swarm/tkobjc/InputWidget.h
+include/swarm/tkobjc/Label.h
+include/swarm/tkobjc/Line.h
+include/swarm/tkobjc/LinkItem.h
+include/swarm/tkobjc/MessageProbeEntry.h
+include/swarm/tkobjc/NodeItem.h
+include/swarm/tkobjc/OvalNodeItem.h
+include/swarm/tkobjc/Pixmap.h
+include/swarm/tkobjc/ProbeCanvas.h
+include/swarm/tkobjc/Raster.h
+include/swarm/tkobjc/Rectangle.h
+include/swarm/tkobjc/RectangleNodeItem.h
+include/swarm/tkobjc/ScheduleItem.h
+include/swarm/tkobjc/SimpleProbeDisplayHideButton.h
+include/swarm/tkobjc/SuperButton.h
+include/swarm/tkobjc/TextItem.h
+include/swarm/tkobjc/TkExtra.h
+include/swarm/tkobjc/VarProbeEntry.h
+include/swarm/tkobjc/VarProbeLabel.h
+include/swarm/tkobjc/Widget.h
+include/swarm/tkobjc/WindowGeometryRecord.h
+include/swarm/tkobjc/ZoomRaster.h
+include/swarm/tkobjc/common.h
+include/swarm/tkobjc/global.h
+include/swarm/tkobjc/internal.h
+include/swarm/tkobjc/win32dib.h
+@unexec install-info --delete %D/info/objc-features.info %D/info/dir
+info/objc-features.info
+@exec install-info %D/info/objc-features.info %D/info/dir
+lib/swarm/libactivity.a
+lib/swarm/libactivity.so
+lib/swarm/libactivity.so.5
+lib/swarm/libanalysis.a
+lib/swarm/libanalysis.so
+lib/swarm/libanalysis.so.4
+lib/swarm/libcollections.a
+lib/swarm/libcollections.so
+lib/swarm/libcollections.so.3
+lib/swarm/libdefobj.a
+lib/swarm/libdefobj.so
+lib/swarm/libdefobj.so.4
+lib/swarm/libmisc.a
+lib/swarm/libjavaswarm.a
+lib/swarm/libjavaswarm.so
+lib/swarm/libjavaswarm.so.1
+lib/swarm/libjavaswarmstubs.a
+lib/swarm/libjavaswarmstubs.so
+lib/swarm/libjavaswarmstubs.so.0
+lib/swarm/libmisc.so
+lib/swarm/libmisc.so.2
+lib/swarm/libobjc.a
+lib/swarm/libobjc.la
+lib/swarm/libobjc.so
+lib/swarm/libobjc.so.0
+lib/swarm/libobjectbase.a
+lib/swarm/libobjectbase.so
+lib/swarm/libobjectbase.so.4
+lib/swarm/librandom.a
+lib/swarm/librandom.so
+lib/swarm/librandom.so.1
+lib/swarm/libsimtools.a
+lib/swarm/libsimtools.so
+lib/swarm/libsimtools.so.4
+lib/swarm/libsimtoolsgui.a
+lib/swarm/libsimtoolsgui.so
+lib/swarm/libsimtoolsgui.so.5
+lib/swarm/libspace.a
+lib/swarm/libspace.so
+lib/swarm/libspace.so.2
+lib/swarm/libswarm.a
+lib/swarm/libswarm.so
+lib/swarm/libswarm.so.0
+lib/swarm/libtclobjc.a
+lib/swarm/libtclobjc.so
+lib/swarm/libtclobjc.so.1
+lib/swarm/libtkobjc.a
+lib/swarm/libtkobjc.so
+lib/swarm/libtkobjc.so.5
+share/swarm/swarm.jar
+@dirrm etc/swarm
+@dirrm include/swarm/activity
+@dirrm include/swarm/analysis
+@dirrm include/swarm/collections
+@dirrm include/swarm/defobj
+@dirrm include/swarm/misc
+@dirrm include/swarm/objc
+@dirrm include/swarm/objectbase
+@dirrm include/swarm/random
+@dirrm include/swarm/simtools
+@dirrm include/swarm/simtoolsgui
+@dirrm include/swarm/space
+@dirrm include/swarm/tclobjc
+@dirrm include/swarm/tkobjc
+@dirrm include/swarm
+@dirrm lib/swarm
+@dirrm share/swarm