CVS commit: pkgsrc/math/glpk

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Nov 28 20:08:24 UTC 2021

Modified Files:
        pkgsrc/math/glpk: Makefile distinfo
        pkgsrc/math/glpk/patches: patch-src_Makefile.in

Log Message:
glpk: updated to 5.0

GLPK 5.0

The copyright was transferred to the Free Software Foundation.

To fix some licensing problems the routines in the following
files were disabled by replacing with dummy ones that print an
error message:

src/api/gridgen.c
src/api/netgen.c
src/api/rmfgen.c
src/misc/qmd.c
src/misc/relax4.c

Note that this change does not affect the main faunctionality
of the package.

Some minor bugs were fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/math/glpk/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/math/glpk/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/glpk/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/glpk/Makefile
diff -u pkgsrc/math/glpk/Makefile:1.47 pkgsrc/math/glpk/Makefile:1.48
--- pkgsrc/math/glpk/Makefile:1.47      Sat Jan 18 23:32:51 2020
+++ pkgsrc/math/glpk/Makefile   Sun Nov 28 20:08:24 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2020/01/18 23:32:51 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2021/11/28 20:08:24 adam Exp $
 
-DISTNAME=      glpk-4.65
+DISTNAME=      glpk-5.0
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=glpk/}
 

Index: pkgsrc/math/glpk/distinfo
diff -u pkgsrc/math/glpk/distinfo:1.42 pkgsrc/math/glpk/distinfo:1.43
--- pkgsrc/math/glpk/distinfo:1.42      Tue Oct 26 10:55:41 2021
+++ pkgsrc/math/glpk/distinfo   Sun Nov 28 20:08:24 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.42 2021/10/26 10:55:41 nia Exp $
+$NetBSD: distinfo,v 1.43 2021/11/28 20:08:24 adam Exp $
 
-BLAKE2s (glpk-4.65.tar.gz) = 7dcb5cb6f2f4f4779d4b0c95ef122954f8b736f3f5bc723ca31ce8919d05a884
-SHA512 (glpk-4.65.tar.gz) = 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
-Size (glpk-4.65.tar.gz) = 4167110 bytes
-SHA1 (patch-src_Makefile.in) = a79e4afc4d46dce13c1ff431da23681b17ea4a83
+BLAKE2s (glpk-5.0.tar.gz) = d090b119a54420b9ab28ac998484c678a631d8a4c59ef53dfd15e0fb0965597f
+SHA512 (glpk-5.0.tar.gz) = 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d
+Size (glpk-5.0.tar.gz) = 4132649 bytes
+SHA1 (patch-src_Makefile.in) = 7af10aca835da7a25da977ae784dfa6037050bb8

Index: pkgsrc/math/glpk/patches/patch-src_Makefile.in
diff -u pkgsrc/math/glpk/patches/patch-src_Makefile.in:1.7 pkgsrc/math/glpk/patches/patch-src_Makefile.in:1.8
--- pkgsrc/math/glpk/patches/patch-src_Makefile.in:1.7  Mon Jul  8 16:28:16 2019
+++ pkgsrc/math/glpk/patches/patch-src_Makefile.in      Sun Nov 28 20:08:24 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_Makefile.in,v 1.7 2019/07/08 16:28:16 leot Exp $
+$NetBSD: patch-src_Makefile.in,v 1.8 2021/11/28 20:08:24 adam Exp $
 
 Use external zlib.
 
---- src/Makefile.in.orig       2018-02-16 07:00:00.000000000 +0000
+--- src/Makefile.in.orig       2020-12-16 09:00:00.000000000 +0000
 +++ src/Makefile.in
 @@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
    }
@@ -13,22 +13,23 @@ Use external zlib.
  am_libglpk_la_OBJECTS = libglpk_la-amd_1.lo libglpk_la-amd_2.lo \
        libglpk_la-amd_aat.lo libglpk_la-amd_control.lo \
        libglpk_la-amd_defaults.lo libglpk_la-amd_dump.lo \
-@@ -162,13 +162,7 @@ am_libglpk_la_OBJECTS = libglpk_la-amd_1
-       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
+@@ -161,14 +161,7 @@ am_libglpk_la_OBJECTS = libglpk_la-amd_1
+       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) \
-@@ -327,8 +321,7 @@ libglpk_la_CPPFLAGS = \
+@@ -327,8 +320,7 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/mpl \
  -I$(srcdir)/npp \
  -I$(srcdir)/proxy \
@@ -37,8 +38,8 @@ Use external zlib.
 +-I$(srcdir)/simplex
  
  libglpk_la_LDFLAGS = \
- -version-info 43:0:3 \
-@@ -511,22 +504,7 @@ simplex/spxprim.c \
+ -version-info 43:1:3 \
+@@ -511,22 +503,7 @@ simplex/spxprim.c \
  simplex/spxprob.c \
  simplex/spychuzc.c \
  simplex/spychuzr.c \