Date: Fri, 9 May 2008 03:38:57 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/123543: [PATCH] math/glpk: update to 4.28 Message-ID: <200805090338.m493cvTp079771@www.freebsd.org> Resent-Message-ID: <200805090350.m493o1WZ098937@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123543
>Category: ports
>Synopsis: [PATCH] math/glpk: update to 4.28
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri May 09 03:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: bf
>Release: 7-STABLE i386
>Organization:
-
>Environment:
>Description:
Cumulative changes:
* glplib.h, glplib.c
Three wrapper routines xdlopen, xdlsym, and xdlclose, which
provide the shared library support, were added. A particular
version of these routines depends on the option --enable-dl
passed to the configure script (see file INSTALL for details).
Thanks to Rafael Laboissiere <rafael@debian.org> for useful
advices concerning the shared library support.
* glpsql.c
A static linking to iODBC and MySQL libraries used in the
MathProg table drivers was replaced by a dynamic linking to
corresponding shared libraries.
Many thanks to Heinrich Schuchardt <heinrich.schuchardt@gmx.de>
for the contribution and to Vijay Patil <vijay.patil@gmail.com>
for testing this feature under Windows XP.
* glpgmp.h, glpgmp.c
A bug (which appeared only on 64-bit platforms) was fixed.
Thanks to Axel Simon <Axel.Simon@ens.fr> for the bug report.
* glpapi.c
A bug was fixed in the api routine glp_add_cols. (If the basis
is valid, adding column keeps it valid, however, col->bind was
set to -1 rather to 0.)
Thanks to Cedric[FR] <fox2113@wanadoo.fr> for the bug report.
* glplib.c
64-bit unsigned int type glp_ulong and corresponding routines
were replaced by 64-bit signed int type xlong_t.
* glpk.h, glpapi.c
The type glp_ulong was replaced by glp_long. This affects only
the api routine glp_mem_usage.
* glplib.c
Compressed data file support was added. This feature requires
the zlib data compression libraries and allows compressing and
decompressing .gz files "on the fly".
* glpcli.h, glpcli.c
Command-line interface routines were added. (This feature is
incomplete so far.)
* glpsql.h, glpsql.c
Two MathProg table drivers for iODBC and MySQL contributed by
Heinrich Schuchardt <heinrich.schuchardt@gmx.de> were added to
the package.
* glpmpl05.c
Mathprog table driver for xBASE was added to the package.
* glpmpl03.c
A minor was fixed in the MathProg translator (if some field
specified in the table statement is missing in corresponding
input table, the bug causes abnormal termination). Thanks to
Heinrich Schuchardt <heinrich.schuchardt@gmx.de> for the bug
report.
* glpmpl.h, glpmpl.c
STRING data type was replaced by plain character strings.
* glpmpl.h, glpmpl01.c, glpmpl03.c, glpmpl05.c
The table statement was implemented. Description of this new
feature is given in file doc/tables.txt.
* glpios03.c
A bug causing zero divide error on computing euclidean norm of
the cut coefficient vector was fixed.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN glpk.orig/Makefile glpk/Makefile
--- glpk.orig/Makefile 2008-02-08 10:07:22.000000000 -0500
+++ glpk/Makefile 2008-05-08 23:24:27.140146218 -0400
@@ -6,7 +6,7 @@
#
PORTNAME= glpk
-PORTVERSION= 4.25
+PORTVERSION= 4.28
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= glpk
@@ -16,6 +16,9 @@
LIB_DEPENDS= gmp:${PORTSDIR}/math/libgmp4
+OPTIONS= IODBC "Enable MathProg iodbc support" Off \
+ MYSQL "Enable MathProg mysql support" Off
+
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
@@ -24,11 +27,37 @@
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_IODBC || WITH_MYSQL)
+CONFIGURE_ARGS+= --enable-dl=dlfcn
+.else
+CONFIGURE_ARGS+= --disable-dl
+.endif
+
+.ifdef(WITH_IODBC)
+CONFIGURE_ARGS+= --enable-odbc
+LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
+.else
+CONFIGURE_ARGS+= --disable-odbc
+.endif
+
+.ifdef(WITH_MYSQL)
+CONFIGURE_ARGS+= --enable-mysql
+USE_MYSQL= yes
+.else
+CONFIGURE_ARGS+= --disable-mysql
+.endif
+
.if !defined(NOPORTDOCS)
PORTDOCS= bench.txt bench1.txt glpk.ps glpk_faq.txt gmpl.ps \
- gomory.djvu opb.txt
+ gomory.djvu opb.txt tables.txt
.endif
+post-patch:
+ @${REINPLACE_CMD} -e "s;\/usr\/include\/mysql;${LOCALBASE}\/include\/mysql;g" \
+ ${WRKSRC}/configure
+
post-install:
@${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
@@ -40,4 +69,4 @@
done
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN glpk.orig/distinfo glpk/distinfo
--- glpk.orig/distinfo 2008-02-08 10:07:22.000000000 -0500
+++ glpk/distinfo 2008-05-07 16:34:17.530919000 -0400
@@ -1,3 +1,3 @@
-MD5 (glpk-4.25.tar.gz) = 3bd85385acb1123a2b62420af45bcc39
-SHA256 (glpk-4.25.tar.gz) = a178a5ac51d4f344090bd71782f229c7cf69ba86f185c494f57a61d6f2948841
-SIZE (glpk-4.25.tar.gz) = 1487597
+MD5 (glpk-4.28.tar.gz) = 6e4f30c37fb189aec6c71b27f0a57449
+SHA256 (glpk-4.28.tar.gz) = 8faeb202e58a3a9f6a6a8b0e8ae557bcc30f712060b4871a530f070c14939fd8
+SIZE (glpk-4.28.tar.gz) = 1546104
diff -ruN glpk.orig/pkg-plist glpk/pkg-plist
--- glpk.orig/pkg-plist 2008-02-08 10:07:22.000000000 -0500
+++ glpk/pkg-plist 2008-05-07 17:02:51.049065000 -0400
@@ -3,6 +3,7 @@
include/glpavl.h
include/glpbfd.h
include/glpbfx.h
+include/glpcli.h
include/glpdmp.h
include/glpfhv.h
include/glpgmp.h
@@ -20,14 +21,17 @@
include/glpmpl.h
include/glppds.h
include/glpqmd.h
+include/glprgr.h
include/glprng.h
include/glpscf.h
include/glpscg.h
+include/glpspm.h
include/glpspx.h
+include/glpsql.h
include/glpssx.h
include/glpstd.h
include/glptsp.h
lib/libglpk.a
lib/libglpk.la
lib/libglpk.so
-lib/libglpk.so.10
+lib/libglpk.so.13
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805090338.m493cvTp079771>