Update to version 1.4.1.

Submitted by:	maintainer

3 files changed, 30 insertions, 29 deletions

diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index f70927a11e40..ebf3a66f6fde 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	swarm
-# Version required:			1.3.1
-# Date created:				26 June 1998
-# Whom:					Horance C.H Chou <horance@freedom.ie.cycu.edu.tw>
+# Version required:	1.4.1
+# Date created:		26 June 1998
+# Whom:			Horance C.H Chou <horance@freedom.ie.cycu.edu.tw>
 #
-# $Id: Makefile,v 1.28 1999/01/23 07:05:23 vanilla Exp $
+# $Id: Makefile,v 1.1.1.1 1999/04/03 02:02:29 steve Exp $
 #
 
-DISTNAME=	swarm-1.3.1
-#PKGNAME=	swarm-1.3.1
+DISTNAME=	swarm-1.4.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.santafe.edu/pub/swarm/
 
@@ -16,15 +15,15 @@ MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 LIB_DEPENDS=	ffi.2:${PORTSDIR}/devel/libffi \
 		png.3:${PORTSDIR}/graphics/png \
 		Xpm.4:${PORTSDIR}/graphics/xpm \
-		tcl80.1:${PORTSDIR}/lang/tcl80 \
-		tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
 		BLT.2:${PORTSDIR}/x11-toolkits/blt
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
-		--with-tclincludedir=${PREFIX}/include/tcl8.0/generic \
-		--with-tkincludedir=${PREFIX}/include/tk8.0/generic \
+		--with-tclincludedir=${PREFIX}/include/tcl8.0 \
+		--with-tkincludedir=${PREFIX}/include/tk8.0 \
+		--with-tclscriptdir=${PREFIX}/lib/tcl8.0 \
+		--with-tkscriptdir=${PREFIX}/lib/tk8.0
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/swarm/distinfo b/devel/swarm/distinfo
index dde8cf2809b4..9112375ba1ee 100644
--- a/devel/swarm/distinfo
+++ b/devel/swarm/distinfo
@@ -1 +1 @@
-MD5 (swarm-1.3.1.tar.gz) = 2d315c7f3bdb492ac8ea56d79b7db84f
+MD5 (swarm-1.4.1.tar.gz) = 3880ac3c3bf3ba3b1e01e6f07775b465
diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist
index 773230fcd8f9..2841a5274b59 100644
--- a/devel/swarm/pkg-plist
+++ b/devel/swarm/pkg-plist
@@ -4,6 +4,7 @@ bin/make-h2x
 etc/swarm/Makefile.appl
 etc/swarm/Makefile.common
 etc/swarm/Makefile.lib
+etc/swarm/Makefile.rules
 etc/swarm/config.swarm
 include/activity.h
 include/activity/Action.h
@@ -28,12 +29,14 @@ include/collections/Array.h
 include/collections/Collection.h
 include/collections/InputStream.h
 include/collections/List.h
+include/collections/ListShuffler.h
 include/collections/List_GEN.h
 include/collections/List_linked.h
 include/collections/List_mlinks.h
 include/collections/Map.h
 include/collections/OrderedSet.h
 include/collections/OutputStream.h
+include/collections/Permutation.h
 include/collections/Set.h
 include/collections/StringObject.h
 include/collections/classes.h
@@ -41,10 +44,13 @@ include/collections/collections.h
 include/collections/predicates.h
 include/collections/types.h
 include/defobj.h
+include/defobj/Archiver.h
+include/defobj/Arguments.h
 include/defobj/Create.h
 include/defobj/Customize.h
 include/defobj/DefClass.h
 include/defobj/DefObject.h
+include/defobj/HDF5Object.h
 include/defobj/Program.h
 include/defobj/Symbol.h
 include/defobj/Zone.h
@@ -52,13 +58,13 @@ include/defobj/classes.h
 include/defobj/defalloc.h
 include/defobj/deftype.h
 include/defobj/types.h
+include/defobj/version.h
 include/gui.h
 include/misc.h
 include/misc/argp.h
 include/misc/getopt.h
 include/objectbase.h
 include/objectbase/ActivityControl.h
-include/objectbase/Arguments.h
 include/objectbase/CompleteProbeMap.h
 include/objectbase/CompleteVarMap.h
 include/objectbase/CustomProbeMap.h
@@ -73,7 +79,6 @@ include/objectbase/SwarmObject.h
 include/objectbase/VarProbe.h
 include/objectbase/probing.h
 include/objectbase/swarm_rts_routines.h
-include/objectbase/version.h
 include/random.h
 include/random/ACGgen.h
 include/random/BernoulliDist.h
@@ -96,8 +101,6 @@ include/random/PSWBgen.h
 include/random/RWC2gen.h
 include/random/RWC8gen.h
 include/random/RandomBitDist.h
-include/random/RandomDefs.h
-include/random/RandomVars.h
 include/random/SCGgen.h
 include/random/SWBgen.h
 include/random/TGFSRgen.h
@@ -106,11 +109,11 @@ include/random/UniformIntegerDist.h
 include/random/UniformUnsignedDist.h
 include/random/distributions.h
 include/random/generators.h
+include/random/randomdefs.h
+include/random/randomvars.h
 include/simtools.h
 include/simtools/AppendFile.h
-include/simtools/Archiver.h
 include/simtools/InFile.h
-include/simtools/ListShuffler.h
 include/simtools/NSelect.h
 include/simtools/ObjectLoader.h
 include/simtools/ObjectSaver.h
@@ -134,7 +137,6 @@ include/simtoolsgui/ProbeDisplayManager.h
 include/simtoolsgui/SimpleProbeDisplay.h
 include/simtoolsgui/SingleProbeDisplay.h
 include/simtoolsgui/VarProbeWidget.h
-include/simtoolsgui/global.h
 include/space.h
 include/space/Ca2d.h
 include/space/ConwayLife2d.h
@@ -197,19 +199,19 @@ include/tkobjc/win32dib.h
 lib/libactivity.a
 lib/libactivity.la
 lib/libactivity.so
-lib/libactivity.so.1
+lib/libactivity.so.3
 lib/libanalysis.a
 lib/libanalysis.la
 lib/libanalysis.so
-lib/libanalysis.so.2
+lib/libanalysis.so.3
 lib/libcollections.a
 lib/libcollections.la
 lib/libcollections.so
-lib/libcollections.so.1
+lib/libcollections.so.2
 lib/libdefobj.a
 lib/libdefobj.la
 lib/libdefobj.so
-lib/libdefobj.so.0
+lib/libdefobj.so.2
 lib/libmisc.a
 lib/libmisc.la
 lib/libmisc.so
@@ -217,19 +219,19 @@ lib/libmisc.so.2
 lib/libobjectbase.a
 lib/libobjectbase.la
 lib/libobjectbase.so
-lib/libobjectbase.so.2
+lib/libobjectbase.so.3
 lib/librandom.a
 lib/librandom.la
 lib/librandom.so
-lib/librandom.so.0
+lib/librandom.so.1
 lib/libsimtools.a
 lib/libsimtools.la
 lib/libsimtools.so
-lib/libsimtools.so.2
+lib/libsimtools.so.3
 lib/libsimtoolsgui.a
 lib/libsimtoolsgui.la
 lib/libsimtoolsgui.so
-lib/libsimtoolsgui.so.2
+lib/libsimtoolsgui.so.4
 lib/libspace.a
 lib/libspace.la
 lib/libspace.so
@@ -237,13 +239,13 @@ lib/libspace.so.2
 lib/libtclobjc.a
 lib/libtclobjc.la
 lib/libtclobjc.so
-lib/libtclobjc.so.0
+lib/libtclobjc.so.1
 lib/libtkobjc.a
 lib/libtkobjc.la
 lib/libtkobjc.so
-lib/libtkobjc.so.2
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/libtkobjc.so.4
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm etc/swarm
 @dirrm include/activity
 @dirrm include/analysis