Update cassowary to 0.60. Changes from version 0.50:

12-March-2000: Version 0.60 released.
* Changed license to LGPL!!!
* Added SetAutoResetStayConstants(), FIsAutoResetStayConstants(), make ResetStayConstants() public

29-Jan-2000: Version 0.55 released.
* Some bug fixes
* Added ClSimplexSolver::{ChangeStrength,ChangeStrengthAndWeight,ChangeWeight,
                          DisplayObjective,ExternalResetStayConstants} fns
  From A. Beurivé.

16-Dec-1999: Version 0.54a released.
* Include correct version of OTI Smalltalk .dat file
  (the source in the *.app files was right, the .dat file was old)
* Fix java build bug

15-Dec-1999: Version 0.54 released.
* Bug fixes
* auto-configuration improvements
* Support Java 2 (jdk-1.2)
* Improved ease of building Java demos
* Build guile wrapper as long as guile-config works, use new --disable-guile-build to force off
* Alpha-version of Java constraint parser contributed by Will Portnoy

24-October-1999: Version 0.53 released.
* Bug fixes
* License exception for linking with Scwm.

25-September-1999: Version 0.52 released.
* Bug fix for nested edits where a later edit includes an already-being-edited variable

14-September-1999: Version 0.51 released.
* Minor bug fixes
* Much better packaging, RPMs, etc. more forced reliance on GTL

9 files changed, 79 insertions, 110 deletions

diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index 3cf0b3a5070..9b101a3d33b 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.6 2000/07/15 02:36:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/31 06:58:35 jlam Exp $
 #
 
-DISTNAME=		cassowary-0.50
+DISTNAME=		cassowary-0.60
 CATEGORIES=		math
 MASTER_SITES=		http://www.cs.washington.edu/research/constraints/cassowary/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.washington.edu/research/constraints/cassowary/
 
+BUILD_DEPENDS+=		bison:../../devel/bison
 DEPENDS+=		guile>=1.3.2:../../lang/guile
-BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
+DEPENDS+=		gtl>=0.3.2:../../devel/gtl
 
-GNU_CONFIGURE=		yes
-USE_PKGLIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-YACC=			${LOCALBASE}/bin/bison -y
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--enable-fd-solver
 CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-gtl=${LOCALBASE}
+
+YACC=			bison -y
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,4 +30,7 @@ DEPENDS+=		egcs-1.1.2:../../lang/egcs
 MAKE_ENV+=		CXX=${LOCALBASE}/egcs/bin/g++
 .endif
 
+post-install:
+	cd ${PREFIX}/lib/cassowary && ${RMDIR} -p bench
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/cassowary/files/md5 b/math/cassowary/files/md5
index 428240550ff..e830b4b0bc3 100644
--- a/math/cassowary/files/md5
+++ b/math/cassowary/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/08/24 14:24:26 agc Exp $
+$NetBSD: md5,v 1.2 2000/07/31 06:58:36 jlam Exp $
 
-MD5 (cassowary-0.50.tar.gz) = 68ed957e217a8d0802709084dc51f060
+MD5 (cassowary-0.60.tar.gz) = e8bc875306b1c873ceeb0a9d8a83533d
diff --git a/math/cassowary/files/patch-sum b/math/cassowary/files/patch-sum
index 183ba2fccad..13e0aa5a389 100644
--- a/math/cassowary/files/patch-sum
+++ b/math/cassowary/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.3 1999/10/06 04:37:58 simonb Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/31 06:58:36 jlam Exp $
 
-MD5 (patch-aa) = b21220ed2c64fbcdecfd8f161fc84b99
-MD5 (patch-ab) = e799bf95602aa9317d409d757cfa9dae
-MD5 (patch-ac) = 9675ed06ca6bca37686ea67f0967189c
-MD5 (patch-ad) = 1c62b7a555dece05e3c1fe28a2e501fa
+MD5 (patch-aa) = ec39d4030b8a999f79cfac57f56ac975
+MD5 (patch-ab) = 3e2e8bc7e6b43dff861b0420b615a0ad
diff --git a/math/cassowary/patches/patch-aa b/math/cassowary/patches/patch-aa
index 8aa7421bae8..3f26651045a 100644
--- a/math/cassowary/patches/patch-aa
+++ b/math/cassowary/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/24 14:24:27 agc Exp $
+$NetBSD: patch-aa,v 1.2 2000/07/31 06:58:36 jlam Exp $
 
-Use NetBSD's own pkg libtool
-
---- configure	1999/08/23 14:29:48	1.1
-+++ configure	1999/08/23 14:30:43
-@@ -1819,6 +1819,7 @@
- fi
- 
+--- docs/Makefile.in.orig	Sun Mar 12 17:15:11 2000
++++ docs/Makefile.in	Mon Jul 31 00:55:30 2000
+@@ -94,7 +94,7 @@
+ YACC = @YACC@
+ cassoguiledir = @cassoguiledir@
  
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1976,6 +1977,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+fi
+-docdir = $(prefix)/doc
++docdir = $(prefix)/share/doc/cassowary
  
+ doc_DATA = cassowary-tr.pdf cassowary-tr.ps.gz
  
- ## ACE == AC-Extended -- this was SCWM_ARG_PATH
diff --git a/math/cassowary/patches/patch-ab b/math/cassowary/patches/patch-ab
index 2a09b1e8fd5..299b0e14f69 100644
--- a/math/cassowary/patches/patch-ab
+++ b/math/cassowary/patches/patch-ab
@@ -1,26 +1,22 @@
-$NetBSD: patch-ab,v 1.2 1999/09/08 17:17:42 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2000/07/31 06:58:36 jlam Exp $
 
---- c++/Cassowary.h.orig	Mon Jul 12 05:13:14 1999
-+++ c++/Cassowary.h	Wed Sep  8 17:58:26 1999
-@@ -22,7 +22,9 @@
- #endif
+--- cassowary-config.in.orig	Wed Sep  8 01:22:13 1999
++++ cassowary-config.in	Mon Jul 31 00:53:49 2000
+@@ -4,7 +4,7 @@
  
- #include "ClConstraintHash.h"
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
+ # gotten from LDADD in c++/Makefile.am
+ cassowary_gtllibs="@GTL_LIB@"
+-cassowary_libs="-L@prefix@/lib $cassowary_gtllibs"
++cassowary_libs="-Wl,-R@prefix@/lib -L@prefix@/lib $cassowary_gtllibs"
+ cassowary_cflags="@GUILE_INCLUDES@ @GTL_INCLUDES@"
  
- #ifdef USE_GC
- #include "../../gc/gc_cpp.h"
-@@ -47,6 +49,11 @@
- typedef double Number;
+ prefix=@prefix@
+@@ -94,7 +94,7 @@
+ fi
  
- typedef long FDNumber;
-+
-+#ifndef MINLONG
-+#include <limits.h>
-+#define MINLONG	LONG_MIN
-+#endif
- 
- enum { FDN_NOTSET = MINLONG };
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -lcassowary -lstdc++ $cassowary_libs
++      echo -Wl,-R@libdir@ -L@libdir@ -lcassowary -lstdc++ $cassowary_libs
+ fi
  
+ if test "$echo_gtllibs" = "yes"; then
diff --git a/math/cassowary/patches/patch-ac b/math/cassowary/patches/patch-ac
deleted file mode 100644
index 240d8d49135..00000000000
--- a/math/cassowary/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/10/06 04:34:42 simonb Exp $
-
---- c++/ClC.cc.orig	Wed Sep  8 18:38:16 1999
-+++ c++/ClC.cc	Wed Sep  8 18:38:36 1999
-@@ -17,7 +17,9 @@
- #include "Cl.h"
- #include <strstream.h>
- #include <stdio.h>
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
- 
- #ifdef HAVE_CONFIG_H
- #include <cassowary/config.h>
diff --git a/math/cassowary/patches/patch-ad b/math/cassowary/patches/patch-ad
deleted file mode 100644
index 6c10234300b..00000000000
--- a/math/cassowary/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/10/06 04:34:42 simonb Exp $
-
---- c++/ClC.h.orig	Wed Sep  8 18:46:40 1999
-+++ c++/ClC.h	Wed Sep  8 18:46:50 1999
-@@ -23,7 +23,9 @@
- #endif
- 
- #include <stdio.h>
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
- 
- 
- #define boolean int
diff --git a/math/cassowary/pkg/DESCR b/math/cassowary/pkg/DESCR
index d0af03c4110..f3dae228caa 100644
--- a/math/cassowary/pkg/DESCR
+++ b/math/cassowary/pkg/DESCR
@@ -3,8 +3,6 @@ efficiently solves systems of linear equalities and inequalities.
 Constraints may be either requirements or preferences.  Client code
 specifies the constraints to be maintained, and the solver updates the
 constrained variables to have values that satisfy the constraints. 
-Version 0.50 of the solving toolkit adds support for a one-way finite
-domain subsolver.
 
 A technical report is included in the distribution that describes the
 algorithm, interface, and implementation of the Cassowary solver. 
diff --git a/math/cassowary/pkg/PLIST b/math/cassowary/pkg/PLIST
index 87190801189..d82b9434088 100644
--- a/math/cassowary/pkg/PLIST
+++ b/math/cassowary/pkg/PLIST
@@ -1,55 +1,61 @@
-@comment $NetBSD: PLIST,v 1.2 2000/05/15 22:37:01 dmcmahill Exp $
-lib/libcassowary.a
-lib/libcassowary.so.0.0
-lib/cassowary/bench
-lib/cassowary/tests/ClTests
-lib/libconstraints.a
+@comment $NetBSD: PLIST,v 1.3 2000/07/31 06:58:38 jlam Exp $
+bin/cassowary-config
 include/Cl.h
 include/ClC.h
 include/cassowary/Cassowary.h
 include/cassowary/ClAbstractVariable.h
-include/cassowary/ClDummyVariable.h
-include/cassowary/ClObjectiveVariable.h
-include/cassowary/ClSlackVariable.h
 include/cassowary/ClConstraint.h
 include/cassowary/ClConstraintHash.h
+include/cassowary/ClDummyVariable.h
 include/cassowary/ClEditConstraint.h
 include/cassowary/ClEditOrStayConstraint.h
 include/cassowary/ClErrors.h
+include/cassowary/ClFDBinaryOneWayConstraint.h
+include/cassowary/ClFDConnectorVariable.h
+include/cassowary/ClFDConstraint.h
+include/cassowary/ClFDSolver.h
+include/cassowary/ClFDVariable.h
+include/cassowary/ClFloatVariable.h
 include/cassowary/ClLinearConstraint.h
 include/cassowary/ClLinearEquation.h
 include/cassowary/ClLinearExpression.h
 include/cassowary/ClLinearExpression_fwd.h
 include/cassowary/ClLinearInequality.h
-include/cassowary/ClSolver.h
+include/cassowary/ClMap.h
+include/cassowary/ClObjectiveVariable.h
+include/cassowary/ClPoint.h
+include/cassowary/ClReader.h
+include/cassowary/ClSet.h
 include/cassowary/ClSimplexSolver.h
-include/cassowary/ClFDSolver.h
-include/cassowary/ClFDBinaryOneWayConstraint.h
-include/cassowary/ClFDConstraint.h
+include/cassowary/ClSlackVariable.h
+include/cassowary/ClSolver.h
 include/cassowary/ClStayConstraint.h
 include/cassowary/ClStrength.h
 include/cassowary/ClSymbolicWeight.h
 include/cassowary/ClTableau.h
-include/cassowary/ClFDVariable.h
-include/cassowary/ClFDConnectorVariable.h
-include/cassowary/ClFloatVariable.h
-include/cassowary/ClVariable.h
-include/cassowary/ClReader.h
 include/cassowary/ClTypedefs.h
-include/cassowary/ClMap.h
-include/cassowary/ClSet.h
-include/cassowary/ClPoint.h
-include/cassowary/auto_ptr.h
+include/cassowary/ClVariable.h
+include/cassowary/cl_auto_ptr.h
 include/cassowary/config-inline.h
 include/cassowary/debug.h
+include/cassowary/timer.h
 include/cassowary_scm.h
 include/cassowary_scm.hpp
 include/cl-snarf.h
-share/guile/site/cassowary/libconstraints.so.0.0
-share/guile/site/cassowary/libconstraints.a
-doc/cassowary-tr.pdf
-doc/cassowary-tr.ps.gz
+lib/cassowary/tests/ClTests
+lib/guile/site/cassowary/libconstraints.a
+lib/guile/site/cassowary/libconstraints.la
+lib/guile/site/cassowary/libconstraints.so.0.0
+lib/libcassowary.a
+lib/libcassowary.la
+lib/libcassowary.so.0.1
+lib/libconstraints.a
+share/doc/cassowary/cassowary-tr.pdf
+share/doc/cassowary/cassowary-tr.ps.gz
+@dirrm share/doc/cassowary
+@dirrm lib/guile/site/cassowary
 @dirrm lib/cassowary/tests
 @dirrm lib/cassowary
 @dirrm include/cassowary
-@dirrm share/guile/site/cassowary
+@unexec rmdir %D/lib/guile/site 2>/dev/null || true
+@unexec rmdir %D/lib/guile 2>/dev/null || true