aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2013-05-10 19:39:58 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2013-05-10 19:39:58 +0000
commit755e402f2deba48a194faf8c6e2bcb00acd7874d (patch)
treef1580795390299cb2dd522363f0700ba0d5a08d0 /math
parentbb9aeb16087d6fc1b8e4d798f61a9f34673f5cb1 (diff)
downloadports-755e402f2deba48a194faf8c6e2bcb00acd7874d.tar.gz
ports-755e402f2deba48a194faf8c6e2bcb00acd7874d.zip
Notes
Diffstat (limited to 'math')
-rw-r--r--math/glpk/Makefile6
-rw-r--r--math/glpk/distinfo4
-rw-r--r--math/glpk/pkg-plist3
-rw-r--r--math/octave/Makefile1
-rw-r--r--math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc10
5 files changed, 18 insertions, 6 deletions
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index f45125b9b354..dd9d48c8f587 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -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
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index da6bb2e84ce8..662ef3690381 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -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
diff --git a/math/glpk/pkg-plist b/math/glpk/pkg-plist
index 91a964290633..52f6e456a702 100644
--- a/math/glpk/pkg-plist
+++ b/math/glpk/pkg-plist
@@ -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
diff --git a/math/octave/Makefile b/math/octave/Makefile
index b615b1e49c2a..fd2cb6a17333 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -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/
diff --git a/math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc b/math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc
new file mode 100644
index 000000000000..bfada7679d8f
--- /dev/null
+++ b/math/octave/files/patch-src+DLD-FUNCTIONS+__glpk__.cc
@@ -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