From owner-dev-commits-ports-all@freebsd.org Fri Apr 30 10:09:09 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D2BC5F9547; Fri, 30 Apr 2021 10:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWp4P0FN9z4bP6; Fri, 30 Apr 2021 10:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAF392A622; Fri, 30 Apr 2021 10:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13UA98IE093832; Fri, 30 Apr 2021 10:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13UA98QH093831; Fri, 30 Apr 2021 10:09:08 GMT (envelope-from git) Date: Fri, 30 Apr 2021 10:09:08 GMT Message-Id: <202104301009.13UA98QH093831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 373e06cd1dc4 - main - math/lemon: Add GLPK option, remove DOCS option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 373e06cd1dc4b0288e0b6344256ecfeda4663cee Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2021 10:09:09 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=373e06cd1dc4b0288e0b6344256ecfeda4663cee commit 373e06cd1dc4b0288e0b6344256ecfeda4663cee Author: Yuri Victorovich AuthorDate: 2021-04-30 08:59:51 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-30 10:09:03 +0000 math/lemon: Add GLPK option, remove DOCS option GLPK license is very different, so it's better to make this dependency conditional on the port option The port doesn't install any docs. --- math/lemon/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/math/lemon/Makefile b/math/lemon/Makefile index d7b6a4ddfec1..6fa38a466249 100644 --- a/math/lemon/Makefile +++ b/math/lemon/Makefile @@ -1,5 +1,6 @@ PORTNAME= lemon DISTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://lemon.cs.elte.hu/pub/sources/ PKGNAMEPREFIX= coin-or- @@ -10,8 +11,7 @@ COMMENT= Library for Efficient Modeling and Optimization in Networks LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libCbc.so:math/coinmp \ - libglpk.so:math/glpk +LIB_DEPENDS= libCbc.so:math/coinmp USES= cmake USE_LDCONFIG= yes @@ -20,9 +20,12 @@ CMAKE_ON= BUILD_SHARED_LIBS CONFLICTS_BUILD= SoPlex # Incompatible with SoPlex-4.0.0 optional dependency: https://lemon.cs.elte.hu/trac/lemon/ticket/616 -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= GLPK +OPTIONS_DEFAULT= GLPK -PORTDOCS= * +GLPK_DESC= Build with GLPK solver +GLPK_CMAKE_BOOL= LEMON_ENABLE_GLPK +GLPK_LIB_DEPENDS= libglpk.so:math/glpk post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-0.x-to-1.x.sh