GLPK 4.61 (42:0:2) has been released.

The following modules were renamed to simplify maintenance.
* src/prob.h     RENAMED            -> src/api/prob.h
* src/glpapi01.c RENAMED            -> src/api/prob1.c
* src/glpapi02.c RENAMED            -> src/api/prob2.c
* src/glpapi03.c RENAMED            -> src/api/prob3.c
* src/glpapi04.c RENAMED            -> src/api/prob4.c
* src/glpapi05.c RENAMED            -> src/api/prob5.c

* src/env/tls.c
TLS (thread local storage class specifier) option was added;
see comments in tls.c for details.

* configure.ac, config.h.in
Test for TLS was added.

* src/env/tls.c
Dll support was added.

The following modules were changed to add __cdecl specifier
for functions passed to qsort (this is needed only on compiling
GLPK with MSVC to run under MS Windows).
* src/api/cpxbas.c
* src/cglib/cfg1.c
* src/cglib/gmigen.c
* src/cglib/mirgen.c
* src/misc/wclique1.c
* src/simplex/spychuzc.c
* src/glpios10.c
* src/glpios11.c
* examples/glpsol.c

* src/glpk.h, src/env/env.c
The API routine glp_version was changed to avoid initialization
of the GLPK environment. The new API routine glp_config was
added (but not documented yet).

* INSTALL
Description of the configure option '--with-zlib' was removed.

3 files changed, 27 insertions, 28 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 0e522a21f97..09be9947b21 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2016/04/12 21:40:47 adam Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/25 10:02:16 adam Exp $
 
-DISTNAME=	glpk-4.60
+DISTNAME=	glpk-4.61
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=glpk/}
 
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index 26ed86eb9b7..be4611c0825 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.37 2016/04/12 21:40:47 adam Exp $
+$NetBSD: distinfo,v 1.38 2017/01/25 10:02:16 adam Exp $
 
-SHA1 (glpk-4.60.tar.gz) = 4e55a3d2aa38b19c5bdd8a195738dbaf44e91e90
-RMD160 (glpk-4.60.tar.gz) = a1fb4b2730c5f2faad47b9014e2e70c384f63db9
-SHA512 (glpk-4.60.tar.gz) = 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a
-Size (glpk-4.60.tar.gz) = 4160915 bytes
-SHA1 (patch-src_Makefile.in) = 8acd8cdf567d4e391a4c775b8d9a6ca3f2dba13b
+SHA1 (glpk-4.61.tar.gz) = 5d260d2dd3143f7b8446fb007c6ce8c4272cafa2
+RMD160 (glpk-4.61.tar.gz) = 763b558b32b91fbf36a52cf539e11b7897bf7507
+SHA512 (glpk-4.61.tar.gz) = 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1
+Size (glpk-4.61.tar.gz) = 4116291 bytes
+SHA1 (patch-src_Makefile.in) = b7e295312d6678f66721f55d6c1b74b709ba4e2b
diff --git a/math/glpk/patches/patch-src_Makefile.in b/math/glpk/patches/patch-src_Makefile.in
index a34b01b9397..9d061a8d3b6 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.4 2016/04/12 21:40:47 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.5 2017/01/25 10:02:16 adam Exp $
 
 Use external zlib.
 
---- src/Makefile.in.orig	2016-04-01 07:00:00.000000000 +0000
+--- src/Makefile.in.orig	2017-01-22 07:00:00.000000000 +0000
 +++ src/Makefile.in
 @@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
    }
@@ -11,25 +11,24 @@ Use external zlib.
 -libglpk_la_LIBADD =
 +libglpk_la_LIBADD = -lz
  am_libglpk_la_OBJECTS = libglpk_la-bfd.lo libglpk_la-bfx.lo \
- 	libglpk_la-glpapi01.lo libglpk_la-glpapi02.lo \
- 	libglpk_la-glpapi03.lo libglpk_la-glpapi04.lo \
-@@ -163,14 +163,7 @@ am_libglpk_la_OBJECTS = libglpk_la-bfd.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-glpapi06.lo libglpk_la-glpapi07.lo \
+ 	libglpk_la-glpapi08.lo libglpk_la-glpapi09.lo \
+@@ -162,13 +162,7 @@ am_libglpk_la_OBJECTS = libglpk_la-bfd.l
+ 	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-spydual.lo
  libglpk_la_OBJECTS = $(am_libglpk_la_OBJECTS)
  libglpk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -327,8 +320,7 @@ libglpk_la_CPPFLAGS = \
+@@ -325,8 +319,7 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/misc \
  -I$(srcdir)/mpl \
  -I$(srcdir)/proxy \
@@ -38,8 +37,8 @@ Use external zlib.
 +-I$(srcdir)/simplex
  
  libglpk_la_LDFLAGS = \
- -version-info 41:0:1 \
-@@ -506,22 +498,7 @@ simplex/spxprim.c \
+ -version-info 42:0:2 \
+@@ -504,22 +497,7 @@ simplex/spxprim.c \
  simplex/spxprob.c \
  simplex/spychuzc.c \
  simplex/spychuzr.c \