Changes 4.10:

Cutting planes of two new classes were implemented: mixed cover
cuts and clique cuts. On API level this feature can be enabled
by setting control parameter LPX_K_USECUTS passed to the routine
lpx_intopt. In glpsol this feature is available through the
command-line options --cover and --clique. For more details see
the reference manual.

Now the routines lpx_read_mps and lpx_read_freemps support LI
bound type. It is similar to LO, however, indicates the column
as of integer kind.

5 files changed, 20 insertions, 20 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 425d8d82b0c..653dd5e495b 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:02 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/23 10:17:20 adam Exp $
 
-DISTNAME=	glpk-4.9
-PKGREVISION=	1
+DISTNAME=	glpk-4.10
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/glpk/
 
@@ -9,8 +8,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/glpk/glpk.html
 COMMENT=	Library for solving linear programming problems
 
-USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/glpk/PLIST b/math/glpk/PLIST
index b95086dfcb5..14b3a53d5c3 100644
--- a/math/glpk/PLIST
+++ b/math/glpk/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2006/02/04 11:54:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/05/23 10:17:20 adam Exp $
 bin/glpsol
 bin/tspsol
 include/glpavl.h
+include/glpbfi.h
 include/glpdmp.h
 include/glphbm.h
 include/glpiet.h
diff --git a/math/glpk/buildlink3.mk b/math/glpk/buildlink3.mk
index 63dcd3abb7d..f47db34d78a 100644
--- a/math/glpk/buildlink3.mk
+++ b/math/glpk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/05/23 10:17:20 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLPK_BUILDLINK3_MK:=	${GLPK_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	glpk
 
 .if !empty(GLPK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glpk+=	glpk>=4.8nb1
-BUILDLINK_ABI_DEPENDS.glpk?=	glpk>=4.9nb1
+BUILDLINK_ABI_DEPENDS.glpk+=	glpk>=4.9nb1
 BUILDLINK_PKGSRCDIR.glpk?=	../../math/glpk
 .endif	# GLPK_BUILDLINK3_MK
 
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index 5cf9212caf4..cd2d9dd6535 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/02/04 11:54:51 markd Exp $
+$NetBSD: distinfo,v 1.8 2006/05/23 10:17:20 adam Exp $
 
-SHA1 (glpk-4.9.tar.gz) = dc066acc6447e78bf09d684c00a677bafb1899b0
-RMD160 (glpk-4.9.tar.gz) = 00aed968c2795446facd289f1168dbcd7632a0d1
-Size (glpk-4.9.tar.gz) = 1018189 bytes
-SHA1 (patch-aa) = 74854ad5b1f4b19c33539cd86760b5687d988b15
+SHA1 (glpk-4.10.tar.gz) = 2451c7efad659e2ba67ae57db463be1e0725300a
+RMD160 (glpk-4.10.tar.gz) = aff1ba99e10f9b3d77eedfab819478b892b38220
+Size (glpk-4.10.tar.gz) = 1034733 bytes
+SHA1 (patch-aa) = 232213abc53bc4bdf829c3af9bdbd7bcaeea1098
 SHA1 (patch-ab) = a4b382b3d27dee710fb3127bf141a7c429662ab3
diff --git a/math/glpk/patches/patch-aa b/math/glpk/patches/patch-aa
index 0bacebe55e2..d5f77382c3c 100644
--- a/math/glpk/patches/patch-aa
+++ b/math/glpk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $
+$NetBSD: patch-aa,v 1.3 2006/05/23 10:17:20 adam Exp $
 
---- src/Makefile.in.orig	2006-01-17 22:00:00.000000000 +1300
+--- src/Makefile.in.orig	2006-05-11 10:00:00.000000000 +0200
 +++ src/Makefile.in
 @@ -65,7 +65,7 @@ VERSION = @VERSION@
  
@@ -9,10 +9,10 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $
 -lib_LIBRARIES = libglpk.a
 +lib_LIBRARIES = libglpk.la
  
- libglpk_a_SOURCES =  glpavl.c glpdmp.c glphbm.c glpiet.c glpinv.c glpios1.c glpios2.c glpios3.c glpipm.c glpipp1.c glpipp2.c glplib1a.c glplib1b.c glplib2.c glplib3.c glplib4.c glplpp1.c glplpp2.c glplpx1.c glplpx2.c glplpx3.c glplpx4.c glplpx5.c glplpx6a.c glplpx6b.c glplpx6c.c glplpx6d.c glplpx7.c glplpx7a.c glplpx8a.c glplpx8b.c glplpx8c.c glplpx8d.c glplpx8e.c glpluf.c glpmat.c glpmip1.c glpmip2.c glpmpl1.c glpmpl2.c glpmpl3.c glpmpl4.c glpqmd.c glprng.c glpspx1.c glpspx2.c glpstr.c glptsp.c
+ libglpk_a_SOURCES =  glpavl.c glpbfi.c glpdmp.c glphbm.c glpiet.c glpinv.c glpios1.c glpios2.c glpios3.c glpipm.c glpipp1.c glpipp2.c glplib1a.c glplib1b.c glplib2.c glplib3.c glplib4.c glplpp1.c glplpp2.c glplpx1.c glplpx2.c glplpx3.c glplpx4.c glplpx5.c glplpx6a.c glplpx6b.c glplpx6c.c glplpx6d.c glplpx7.c glplpx7a.c glplpx7b.c glplpx8a.c glplpx8b.c glplpx8c.c glplpx8d.c glplpx8e.c glpluf.c glpmat.c glpmip1.c glpmip2.c glpmpl1.c glpmpl2.c glpmpl3.c glpmpl4.c glpqmd.c glprng.c glpspx1.c glpspx2.c glpstr.c glptsp.c
  
-@@ -89,9 +89,9 @@ glpmpl1.o glpmpl2.o glpmpl3.o glpmpl4.o 
- glpspx2.o glpstr.o glptsp.o
+@@ -89,9 +89,9 @@ glpmip2.o glpmpl1.o glpmpl2.o glpmpl3.o 
+ glpspx1.o glpspx2.o glpstr.o glptsp.o
  AR = ar
  CFLAGS = @CFLAGS@
 -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-@@ -139,15 +139,7 @@ install-libLIBRARIES: $(lib_LIBRARIES)
+@@ -140,15 +140,7 @@ install-libLIBRARIES: $(lib_LIBRARIES)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
  	@list='$(lib_LIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $
  	  else :; fi; \
  	done
  
-@@ -173,10 +165,9 @@ distclean-compile:
+@@ -174,10 +166,9 @@ distclean-compile:
  
  maintainer-clean-compile:
  
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $
 -	$(RANLIB) libglpk.a
 +libglpk.la: $(libglpk_a_OBJECTS) $(libglpk_a_DEPENDENCIES)
 +	${LIBTOOL} --mode=link ${CC} -o $@ \
-+	${libglpk_a_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 4:9
++	${libglpk_a_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${subst .,:,${VERSION}}
  
  tags: TAGS