Chaneges 4.15:

 Autotools specification files (configure.ac, Makefile.am) were
 changed to use GNU Libtool. This allows building the static as
 well as shared GLPK library.

Changes 4.14:
 Now GLPK conforms to ILP32, LLP64, and LP64 programming models
 (the latter seems to be the ultimate choice regarding 64-bit
 architectures). Note that GLPK itself is a 32-bit application,
 and the conformity only means that the package works correctly
 on all these arenae. Nevertheless, on 64-bit platforms it is
 possible to use more than 4GB of memory, if necessary.

5 files changed, 7 insertions, 135 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index c29adb2cddf..10a7e2b2284 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2007/01/04 22:38:49 adam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/20 12:57:21 adam Exp $
 
-DISTNAME=	glpk-4.13
+DISTNAME=	glpk-4.15
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/glpk/
 
diff --git a/math/glpk/PLIST b/math/glpk/PLIST
index 97e7cb5c830..00dd08c323f 100644
--- a/math/glpk/PLIST
+++ b/math/glpk/PLIST
@@ -1,31 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2007/01/04 22:38:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/02/20 12:57:21 adam Exp $
 bin/glpsol
 bin/tspsol
-include/glpavl.h
-include/glpbfi.h
-include/glpbfx.h
-include/glpcfg.h
-include/glpdmp.h
-include/glpgmp.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
-include/glplpx.h
-include/glpluf.h
-include/glplux.h
-include/glpmat.h
-include/glpmip.h
-include/glpmpl.h
-include/glpqmd.h
-include/glprng.h
-include/glpspx.h
-include/glpssx.h
-include/glpstr.h
-include/glptsp.h
 lib/libglpk.la
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index 96d7d9785bd..dcdd1752fba 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2007/01/04 22:38:49 adam Exp $
+$NetBSD: distinfo,v 1.10 2007/02/20 12:57:21 adam Exp $
 
-SHA1 (glpk-4.13.tar.gz) = 954c673a2c71b868b5ec589d6456d9a8085d570f
-RMD160 (glpk-4.13.tar.gz) = 2d0590466b24471c3c14bdc7e13eb09d0c9de252
-Size (glpk-4.13.tar.gz) = 1082072 bytes
-SHA1 (patch-aa) = 17f22688f1047cc87509e7598e34f610acd5f99f
-SHA1 (patch-ab) = a4b382b3d27dee710fb3127bf141a7c429662ab3
+SHA1 (glpk-4.15.tar.gz) = 52b7244b2aae9ac82fcfa324bcfecc5a8fe950ef
+RMD160 (glpk-4.15.tar.gz) = 334244fd36fc5391170910a0527a7500179b2b55
+Size (glpk-4.15.tar.gz) = 1291700 bytes
diff --git a/math/glpk/patches/patch-aa b/math/glpk/patches/patch-aa
deleted file mode 100644
index 85d0105c78c..00000000000
--- a/math/glpk/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/04 22:38:49 adam Exp $
-
---- src/Makefile.in.orig	2006-11-13 10:00:00.000000000 +0100
-+++ src/Makefile.in
-@@ -65,7 +65,7 @@ VERSION = @VERSION@
- 
- INCLUDES = -I../include
- 
--lib_LIBRARIES = libglpk.a
-+lib_LIBRARIES = libglpk.la
- 
- libglpk_a_SOURCES =  glpavl.c glpbfi.c glpbfx.c glpdmp.c glpgmp.c glphbm.c glpiet.c glpinv.c glpinv1.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 glplpx6e.c glplpx7.c glplpx7a.c glplpx7b.c glplpx8a.c glplpx8b.c glplpx8c.c glplpx8d.c glplpx8e.c glpluf.c glpluf1.c glplux.c glpmat.c glpmip1.c glpmip2.c glpmpl1.c glpmpl2.c glpmpl3.c glpmpl4.c glpqmd.c glprng.c glpspx1.c glpspx2.c glpssx1.c glpssx2.c glpstr.c glptsp.c
- 
-@@ -90,9 +90,9 @@ glpmip2.o glpmpl1.o glpmpl2.o glpmpl3.o 
- glpspx1.o glpspx2.o glpssx1.o glpssx2.o glpstr.o glptsp.o
- AR = ar
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = ${LIBTOOL} --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+LINK = ${LIBTOOL} --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
-@@ -143,15 +143,7 @@ install-libLIBRARIES: $(lib_LIBRARIES)
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
--	  else :; fi; \
--	done
--	@$(POST_INSTALL)
--	@list='$(lib_LIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
--	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
-+	    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$p $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
-@@ -177,10 +169,9 @@ distclean-compile:
- 
- maintainer-clean-compile:
- 
--libglpk.a: $(libglpk_a_OBJECTS) $(libglpk_a_DEPENDENCIES)
--	-rm -f libglpk.a
--	$(AR) cru libglpk.a $(libglpk_a_OBJECTS) $(libglpk_a_LIBADD)
--	$(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 ${subst .,:,${VERSION}}
- 
- tags: TAGS
- 
diff --git a/math/glpk/patches/patch-ab b/math/glpk/patches/patch-ab
deleted file mode 100644
index 23578f6936c..00000000000
--- a/math/glpk/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/03/30 15:23:53 adam Exp $
-
---- examples/Makefile.in.orig	2005-01-12 09:00:00.000000000 +0000
-+++ examples/Makefile.in
-@@ -65,7 +65,7 @@ VERSION = @VERSION@
- 
- INCLUDES = -I../include
- 
--LDADD = ../src/libglpk.a
-+LDADD = ../src/libglpk.la
- 
- bin_PROGRAMS = glpsol tspsol
- 
-@@ -83,16 +83,16 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- glpsol_OBJECTS =  glpsol.o
- glpsol_LDADD = $(LDADD)
--glpsol_DEPENDENCIES =  ../src/libglpk.a
-+glpsol_DEPENDENCIES =  ../src/libglpk.la
- glpsol_LDFLAGS = 
- tspsol_OBJECTS =  tspsol.o
- tspsol_LDADD = $(LDADD)
--tspsol_DEPENDENCIES =  ../src/libglpk.a
-+tspsol_DEPENDENCIES =  ../src/libglpk.la
- tspsol_LDFLAGS = 
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = ${LIBTOOL} --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+LINK = ${LIBTOOL} --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
-@@ -129,8 +129,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	     ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
-