Import of pkgsrc-2016Q3

math/glpk/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2014/08/30 11:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.43 2016/04/12 21:40:47 adam Exp $
 
-DISTNAME=	glpk-4.55
+DISTNAME=	glpk-4.60
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=glpk/}
 

math/glpk/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.34 2014/08/30 11:19:52 adam Exp $
+$NetBSD: distinfo,v 1.37 2016/04/12 21:40:47 adam Exp $
 
-SHA1 (glpk-4.55.tar.gz) = 893058aada022a8dfc63c675ebcd7e7e86a3a363
-RMD160 (glpk-4.55.tar.gz) = 850fd32e3f7261e9ddbfd87ff05d848cc7d505e1
-Size (glpk-4.55.tar.gz) = 3424345 bytes
-SHA1 (patch-src_Makefile.in) = 1d9b7a1b668bf7e2452a2466d19ca3a30fc7202f
+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

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.4 2016/04/12 21:40:47 adam Exp $
 
 Use external zlib.
 
---- src/Makefile.in.orig	2014-04-01 08:25:18.000000000 +0000
+--- src/Makefile.in.orig	2016-04-01 07:00:00.000000000 +0000
 +++ src/Makefile.in
 @@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
    }
@@ -10,39 +10,40 @@ Use external zlib.
  LTLIBRARIES = $(lib_LTLIBRARIES)
 -libglpk_la_LIBADD =
 +libglpk_la_LIBADD = -lz
- 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
+ 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_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 \
- -I$(srcdir)/minisat \
+@@ -327,8 +320,7 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/misc \
---I$(srcdir)/proxy \
+ -I$(srcdir)/mpl \
+ -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 41:0:1 \
+@@ -506,22 +498,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