Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Aug 2020 16:19:07 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r544623 - head/math/minizinc
Message-ID:  <202008101619.07AGJ7JU006292@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Mon Aug 10 16:19:07 2020
New Revision: 544623
URL: https://svnweb.freebsd.org/changeset/ports/544623

Log:
  math/minizinc: Fix typo in GH_ACCOUNT; Set default to the MiniZinc standard library

Modified:
  head/math/minizinc/Makefile
  head/math/minizinc/distinfo

Modified: head/math/minizinc/Makefile
==============================================================================
--- head/math/minizinc/Makefile	Mon Aug 10 15:55:57 2020	(r544622)
+++ head/math/minizinc/Makefile	Mon Aug 10 16:19:07 2020	(r544623)
@@ -2,6 +2,7 @@
 
 PORTNAME=	minizinc
 DISTVERSION=	2.4.3.20200807 # from the develop branch because it contains fixes for the latest bison
+PORTREVISION=	1
 CATEGORIES=	math lang
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -17,7 +18,7 @@ LIB_DEPENDS=	libCbc.so:math/cbc \
 
 USES=		bison cmake compiler:c++11-lang
 USE_GITHUB=	yes
-GH_ACCOIUNT=	MiniZinc
+GH_ACCOUNT=	MiniZinc
 GH_PROJECT=	libminizinc
 GH_TAGNAME=	01854690be366b964df9e25eaf5bd244759c4e76 # develop branch
 USE_LDCONFIG=	yes
@@ -30,5 +31,9 @@ WITH_SCIP_DESC=		Build with the SCIP optimizer
 WITH_SCIP_CMAKE_BOOL=	USE_SCIP
 WITH_SCIP_LIB_DEPENDS=	libscip.so:math/SCIP/
 WITH_SCIP_BROKEN=	Build failure: https://github.com/MiniZinc/libminizinc/issues/402
+
+post-patch:
+	${REINPLACE_CMD} -e 's|string std_lib_dir;|string std_lib_dir = "${DATADIR}";|' ${WRKSRC}/mzn2doc.cpp
+	${REINPLACE_CMD} -e 's|std_lib_dir(stdlibDir) {}|std_lib_dir(stdlibDir.empty() ? "${DATADIR}" : stdlibDir) {}|' ${WRKSRC}/lib/flattener.cpp
 
 .include <bsd.port.mk>

Modified: head/math/minizinc/distinfo
==============================================================================
--- head/math/minizinc/distinfo	Mon Aug 10 15:55:57 2020	(r544622)
+++ head/math/minizinc/distinfo	Mon Aug 10 16:19:07 2020	(r544623)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597032841
-SHA256 (minizinc-libminizinc-2.4.3.20200807-01854690be366b964df9e25eaf5bd244759c4e76_GH0.tar.gz) = 7d7d7ebaef2dfb80aca467e6a5731d43b416921f40624137cbad37116a3a724e
-SIZE (minizinc-libminizinc-2.4.3.20200807-01854690be366b964df9e25eaf5bd244759c4e76_GH0.tar.gz) = 1547462
+TIMESTAMP = 1597074276
+SHA256 (MiniZinc-libminizinc-2.4.3.20200807-01854690be366b964df9e25eaf5bd244759c4e76_GH0.tar.gz) = 7d7d7ebaef2dfb80aca467e6a5731d43b416921f40624137cbad37116a3a724e
+SIZE (MiniZinc-libminizinc-2.4.3.20200807-01854690be366b964df9e25eaf5bd244759c4e76_GH0.tar.gz) = 1547462



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008101619.07AGJ7JU006292>