svn commit: r317837 - in head: math/glpk math/octave math/octave/files net-p2p/gnunet

[Brendan Fabeny]

Author: bf
Date: Fri May 10 19:39:58 2013
New Revision: 317837
URL: http://svnweb.freebsd.org/changeset/ports/317837

Log:
  update math/glpk to 4.49, and adjust dependent ports
  
  Approved by:	maho

Added:
  head/math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc   (contents, props changed)
Modified:
  head/math/glpk/Makefile
  head/math/glpk/distinfo
  head/math/glpk/pkg-plist
  head/math/octave/Makefile
  head/net-p2p/gnunet/Makefile

Modified: head/math/glpk/Makefile
==============================================================================
--- head/math/glpk/Makefile	Fri May 10 19:25:02 2013	(r317836)
+++ head/math/glpk/Makefile	Fri May 10 19:39:58 2013	(r317837)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	glpk
-PORTVERSION=	4.48
+PORTVERSION=	4.49
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	glpk
@@ -53,17 +53,17 @@ post-patch:
 	@${REINPLACE_CMD} -e "s;\/usr\/include\/mysql;${LOCALBASE}\/include\/mysql;g" \
 	${WRKSRC}/configure
 
-.if ${PORT_OPTIONS:MDOCS}
 DOCS1=	cnfsat.pdf glpk.pdf glpk_faq.txt gmpl.pdf graphs.pdf miplib2.txt \
 	miplib3.txt netlib.txt
 DOCS2=	dfeas.pdf gomory.pdf keller.pdf scaling.pdf updating.pdf
 PORTDOCS=	${DOCS1} ${DOCS2}
 
 post-install:
+	@${INSTALL_DATA} ${WRKSRC}/src/glplpx.h ${PREFIX}/include
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc ; \
 	${INSTALL_DATA} ${DOCS1} ${DOCS2:S|^|notes/|} ${DOCSDIR}
-
 .endif
 
 check regression-test test: build

Modified: head/math/glpk/distinfo
==============================================================================
--- head/math/glpk/distinfo	Fri May 10 19:25:02 2013	(r317836)
+++ head/math/glpk/distinfo	Fri May 10 19:39:58 2013	(r317837)
@@ -1,2 +1,2 @@
-SHA256 (glpk-4.48.tar.gz) = abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1
-SIZE (glpk-4.48.tar.gz) = 3488482
+SHA256 (glpk-4.49.tar.gz) = 1e7cbec1ff4a9ae910414b25d8fea93229a3ec7ceaedf21504b4e940e34e8008
+SIZE (glpk-4.49.tar.gz) = 2991108

Modified: head/math/glpk/pkg-plist
==============================================================================
--- head/math/glpk/pkg-plist	Fri May 10 19:25:02 2013	(r317836)
+++ head/math/glpk/pkg-plist	Fri May 10 19:39:58 2013	(r317837)
@@ -1,6 +1,7 @@
 bin/glpsol
 include/glpk.h
+include/glplpx.h
 lib/libglpk.a
 lib/libglpk.la
 lib/libglpk.so
-lib/libglpk.so.33
+lib/libglpk.so.34

Modified: head/math/octave/Makefile
==============================================================================
--- head/math/octave/Makefile	Fri May 10 19:25:02 2013	(r317836)
+++ head/math/octave/Makefile	Fri May 10 19:39:58 2013	(r317837)
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	3.6.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/octave/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/

Added: head/math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc	Fri May 10 19:39:58 2013	(r317837)
@@ -0,0 +1,10 @@
+--- src/DLD-FUNCTIONS/__glpk__.cc.orig	2012-01-03 15:48:37.000000000 -0500
++++ src/DLD-FUNCTIONS/__glpk__.cc	2013-05-07 09:25:34.000000000 -0400
+@@ -45,6 +45,7 @@
+ #include <glpk/glpk.h>
+ #else
+ #include <glpk.h>
++#include <glplpx.h>
+ #endif
+ 
+ #if 0

Modified: head/net-p2p/gnunet/Makefile
==============================================================================
--- head/net-p2p/gnunet/Makefile	Fri May 10 19:25:02 2013	(r317836)
+++ head/net-p2p/gnunet/Makefile	Fri May 10 19:39:58 2013	(r317837)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnunet
 DISTVERSION=	0.9.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU