Changes 4.57:

A new, more efficient implementation of the dual simplex method
was included in the package. This new implementation replaces
the old one, which was removed.

Option sr_heur was added to struct glp_iocp to enable/disable
the simple rounding heuristic used by the MIP solver.

New API routine glp_at_error was added and documented.

Some minor typos were corrected in the GLPK documentation.

An example application program TSPSOL was added. It uses the
GLPK MIP optimizer to solve the Symmetric Traveling Salesman
Problem and illustrates "lazy" constraints generation. For more
details please see glpk/examples/tsp/README.

3 files changed, 34 insertions, 33 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 4124705a032..acea5d7f64d 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2014/08/30 11:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.42 2015/11/27 21:00:28 adam Exp $
 
-DISTNAME=	glpk-4.55
+DISTNAME=	glpk-4.57
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=glpk/}
 
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index 6a45eac9159..19aa475af10 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.35 2015/11/03 23:33:33 agc Exp $
+$NetBSD: distinfo,v 1.36 2015/11/27 21:00:28 adam Exp $
 
-SHA1 (glpk-4.55.tar.gz) = 893058aada022a8dfc63c675ebcd7e7e86a3a363
-RMD160 (glpk-4.55.tar.gz) = 850fd32e3f7261e9ddbfd87ff05d848cc7d505e1
-SHA512 (glpk-4.55.tar.gz) = a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689
-Size (glpk-4.55.tar.gz) = 3424345 bytes
-SHA1 (patch-src_Makefile.in) = 1d9b7a1b668bf7e2452a2466d19ca3a30fc7202f
+SHA1 (glpk-4.57.tar.gz) = d2df2de59798c35024df8d140a53453e29a095be
+RMD160 (glpk-4.57.tar.gz) = 10cbe9f5c681d5893739cde1fd9d8c16cf468c73
+SHA512 (glpk-4.57.tar.gz) = 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48
+Size (glpk-4.57.tar.gz) = 3782998 bytes
+SHA1 (patch-src_Makefile.in) = 277e8df4b63147b8bd9c637589df1491d2fa5189
diff --git a/math/glpk/patches/patch-src_Makefile.in b/math/glpk/patches/patch-src_Makefile.in
index b1fad9693bd..ff91a75f514 100644
--- a/math/glpk/patches/patch-src_Makefile.in
+++ b/math/glpk/patches/patch-src_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2014/08/30 11:19:52 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2015/11/27 21:00:28 adam Exp $
 
 Use external zlib.
 
---- src/Makefile.in.orig	2014-04-01 08:25:18.000000000 +0000
+--- src/Makefile.in.orig	2015-11-08 07:00:00.000000000 +0000
 +++ src/Makefile.in
 @@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
    }
@@ -13,36 +13,37 @@ Use external zlib.
  am_libglpk_la_OBJECTS = libglpk_la-avl.lo libglpk_la-bfd.lo \
  	libglpk_la-bfx.lo libglpk_la-glpapi01.lo \
  	libglpk_la-glpapi02.lo libglpk_la-glpapi03.lo \
-@@ -151,13 +151,7 @@ am_libglpk_la_OBJECTS = libglpk_la-avl.l
- 	libglpk_la-strspx.lo libglpk_la-strtrim.lo \
- 	libglpk_la-triang.lo libglpk_la-wclique.lo \
- 	libglpk_la-wclique1.lo libglpk_la-proxy.lo \
--	libglpk_la-proxy1.lo libglpk_la-adler32.lo \
--	libglpk_la-compress.lo libglpk_la-crc32.lo \
--	libglpk_la-deflate.lo libglpk_la-gzclose.lo \
--	libglpk_la-gzlib.lo libglpk_la-gzread.lo libglpk_la-gzwrite.lo \
--	libglpk_la-inffast.lo libglpk_la-inflate.lo \
--	libglpk_la-inftrees.lo libglpk_la-trees.lo \
--	libglpk_la-uncompr.lo libglpk_la-zio.lo libglpk_la-zutil.lo
-+	libglpk_la-proxy1.lo
+@@ -154,14 +154,7 @@ am_libglpk_la_OBJECTS = libglpk_la-avl.l
+ 	libglpk_la-spxchuzc.lo libglpk_la-spxchuzr.lo \
+ 	libglpk_la-spxlp.lo libglpk_la-spxnt.lo libglpk_la-spxprim.lo \
+ 	libglpk_la-spxprob.lo libglpk_la-spychuzc.lo \
+-	libglpk_la-spychuzr.lo libglpk_la-spydual.lo \
+-	libglpk_la-adler32.lo libglpk_la-compress.lo \
+-	libglpk_la-crc32.lo libglpk_la-deflate.lo \
+-	libglpk_la-gzclose.lo libglpk_la-gzlib.lo libglpk_la-gzread.lo \
+-	libglpk_la-gzwrite.lo libglpk_la-inffast.lo \
+-	libglpk_la-inflate.lo libglpk_la-inftrees.lo \
+-	libglpk_la-trees.lo libglpk_la-uncompr.lo libglpk_la-zio.lo \
+-	libglpk_la-zutil.lo
++	libglpk_la-spychuzr.lo libglpk_la-spydual.lo
  libglpk_la_OBJECTS = $(am_libglpk_la_OBJECTS)
  libglpk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -310,8 +304,7 @@ libglpk_la_CPPFLAGS = \
- -I$(srcdir)/env \
+@@ -315,8 +308,7 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
---I$(srcdir)/proxy \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
 --I$(srcdir)/zlib
-+-I$(srcdir)/proxy
++-I$(srcdir)/simplex
  
  libglpk_la_LDFLAGS = \
- -version-info 37:2:1 \
-@@ -447,22 +440,7 @@ misc/triang.c \
- misc/wclique.c \
- misc/wclique1.c \
- proxy/proxy.c \
--proxy/proxy1.c \
+ -version-info 38:0:2 \
+@@ -459,22 +451,7 @@ simplex/spxprim.c \
+ simplex/spxprob.c \
+ simplex/spychuzc.c \
+ simplex/spychuzr.c \
+-simplex/spydual.c \
 -zlib/adler32.c \
 -zlib/compress.c \
 -zlib/crc32.c \
@@ -58,7 +59,7 @@ Use external zlib.
 -zlib/uncompr.c \
 -zlib/zio.c \
 -zlib/zutil.c
-+proxy/proxy1.c
++simplex/spydual.c
  
  all: all-am