From owner-dev-commits-ports-all@freebsd.org Thu Jun 3 15:22:38 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 8089963BE26; Thu, 3 Jun 2021 15:22:38 +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 4FwqQQ3Dblz3knT; Thu, 3 Jun 2021 15:22:38 +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 589E743E0; Thu, 3 Jun 2021 15:22:38 +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 153FMcLC076414; Thu, 3 Jun 2021 15:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 153FMcTZ076413; Thu, 3 Jun 2021 15:22:38 GMT (envelope-from git) Date: Thu, 3 Jun 2021 15:22:38 GMT Message-Id: <202106031522.153FMcTZ076413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 0932acb439f0 - main - math/plplot: set WXGTK by default + other fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0932acb439f08739f7498b8de8267e32075c6ab7 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: Thu, 03 Jun 2021 15:22:38 -0000 The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=0932acb439f08739f7498b8de8267e32075c6ab7 commit 0932acb439f08739f7498b8de8267e32075c6ab7 Author: Thierry Thomas AuthorDate: 2021-06-03 14:06:17 +0000 Commit: Thierry Thomas CommitDate: 2021-06-03 15:22:28 +0000 math/plplot: set WXGTK by default + other fixes - Enable the option WXGTK by default (used by science/gnudatalanguage); - fix the Fortran option. Note: the fix about shapelib has been committed previously. PR: 247181 Reported by: /me --- math/plplot/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 87ca6c7838c1..2a6bd20bb17b 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -2,7 +2,7 @@ PORTNAME= plplot DISTVERSION= 5.15.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source @@ -30,7 +30,7 @@ SHEBANG_FILES= ${WRKSRC}/examples/python/* \ ${WRKSRC}/examples/tk/* SHEBANG_LANG= sh xtk01 xtk02 xtk04 sh_OLD_CMD= @SH_EXECUTABLE@ -sh_CMD= /bin/sh +sh_CMD= ${SH} xtk01_OLD_CMD= @xtk01_LOCATION@ xtk01_CMD= ${DATADIR}/examples/tk/xtk01 xtk02_OLD_CMD= @xtk02_LOCATION@ @@ -49,7 +49,7 @@ CMAKE_ARGS= -DENABLE_java:BOOL=OFF \ -DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \ -DCMAKE_INSTALL_PKG_CONFIG_DIR:PATH="${PREFIX}/libdata/pkgconfig" \ -DPLD_plmeta:BOOL=OFF -CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_ +CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_ -DSHAPELIB_INCLUDE_DIR=/nonexistent USE_LDCONFIG= yes CMAKE_OFF= DEFAULT_NO_QT_DEVICES LDFLAGS+= -pthread @@ -59,11 +59,11 @@ PLIST_SUB= PLPLOT_VERSION=${PORTVERSION} FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf OPTIONS_DEFINE= DOCS FORTRAN GD LUA QHULL2015 QT5 TCLTK THREADS WXGTK X11 -OPTIONS_DEFAULT= QHULL2015 THREADS X11 +OPTIONS_DEFAULT= QHULL2015 THREADS WXGTK X11 OPTIONS_SUB= yes FORTRAN_USES= fortran -FORTRAN_CMAKE_BOOL= ENABLE_f95 +FORTRAN_CMAKE_BOOL= ENABLE_fortran FORTRAN_CONFIGURE_ENV= CMAKE_Fortran_COMPILER="${FC}" GD_LIB_DEPENDS= libgd.so:graphics/gd \ @@ -115,11 +115,14 @@ X11_USES= xorg X11_USE= XORG=ice,sm,x11,xext X11_CMAKE_BOOL= PLD_xcairo PLD_xwin -post-patch: +pre-configure: ${REINPLACE_CMD} -e \ 's|dl dlopen|c dlopen|' \ ${WRKSRC}/cmake/modules/FindLTDL.cmake ${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' + ${REINPLACE_CMD} -e \ + 's|shapefil.h|do_not_want_shapefil.h|' \ + ${WRKSRC}/cmake/modules/FindShapelib.cmake .include