Update glpk to 4.9

A MIP presolver were implemented (currently incomplete). It is
used internally in the routine lpx_intopt (see below).

An advanced branch-and-bound solver (the routine lpx_intopt)
were implemented.

The routine lpx_check_int to check MIP feasibility conditions
was added.

The routine lpx_print_mip was changed to print MIP feasibility
conditions.

The built-in functions sin, cos, atan, and atan2 were added to
the MathProg language.

Some typos were fixed.
Thanks to Minh Ha Duong <haduong@centre-cired.fr> (CIRED, CNRS).

4 files changed, 18 insertions, 17 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 8969c39087f..15b985383eb 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/04 11:54:51 markd Exp $
 
-DISTNAME=	glpk-4.8
-PKGREVISION=	1
+DISTNAME=	glpk-4.9
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/glpk/
 
diff --git a/math/glpk/PLIST b/math/glpk/PLIST
index 01cae72b989..b95086dfcb5 100644
--- a/math/glpk/PLIST
+++ b/math/glpk/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/30 15:23:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/02/04 11:54:51 markd Exp $
 bin/glpsol
 bin/tspsol
 include/glpavl.h
 include/glpdmp.h
+include/glphbm.h
 include/glpiet.h
 include/glpinv.h
 include/glpios.h
 include/glpipm.h
+include/glpipp.h
 include/glpk.h
 include/glplib.h
 include/glplpp.h
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index e4dcf362273..5cf9212caf4 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/03/30 15:23:53 adam Exp $
+$NetBSD: distinfo,v 1.7 2006/02/04 11:54:51 markd Exp $
 
-SHA1 (glpk-4.8.tar.gz) = f45f7e0f8b38de7531aa84458877083a4094e0e8
-RMD160 (glpk-4.8.tar.gz) = 505921e0702996fec843e3704c33f07d4bfab869
-Size (glpk-4.8.tar.gz) = 972875 bytes
-SHA1 (patch-aa) = 2a33fe1d803ff7b9cd8943d08c5c37e1582a2532
+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 (patch-ab) = a4b382b3d27dee710fb3127bf141a7c429662ab3
diff --git a/math/glpk/patches/patch-aa b/math/glpk/patches/patch-aa
index 50ef647e977..0bacebe55e2 100644
--- a/math/glpk/patches/patch-aa
+++ b/math/glpk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2005/03/30 15:23:53 adam Exp $
+$NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $
 
---- src/Makefile.in.orig	2005-01-12 09:00:00.000000000 +0000
+--- src/Makefile.in.orig	2006-01-17 22:00:00.000000000 +1300
 +++ src/Makefile.in
 @@ -65,7 +65,7 @@ VERSION = @VERSION@
  
@@ -9,10 +9,10 @@ $NetBSD: patch-aa,v 1.1 2005/03/30 15:23:53 adam Exp $
 -lib_LIBRARIES = libglpk.a
 +lib_LIBRARIES = libglpk.la
  
- libglpk_a_SOURCES =  glpavl.c glpdmp.c glpiet.c glpinv.c glpios1.c glpios2.c glpios3.c glpipm.c glplib1a.c glplib1b.c glplib2.c glplib3.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 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 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
  
-@@ -88,9 +88,9 @@ glpmip2.o glpmpl1.o glpmpl2.o glpmpl3.o 
- glpspx1.o glpspx2.o glpstr.o glptsp.o
+@@ -89,9 +89,9 @@ glpmpl1.o glpmpl2.o glpmpl3.o glpmpl4.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.1 2005/03/30 15:23:53 adam Exp $
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-@@ -137,15 +137,7 @@ install-libLIBRARIES: $(lib_LIBRARIES)
+@@ -139,15 +139,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.1 2005/03/30 15:23:53 adam Exp $
  	  else :; fi; \
  	done
  
-@@ -171,10 +163,9 @@ distclean-compile:
+@@ -173,10 +165,9 @@ distclean-compile:
  
  maintainer-clean-compile:
  
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.1 2005/03/30 15:23:53 adam 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:8
++	${libglpk_a_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 4:9
  
  tags: TAGS