From owner-svn-ports-head@freebsd.org Sat Oct 3 09:51:11 2020 Return-Path: Delivered-To: svn-ports-head@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 8F52942A556; Sat, 3 Oct 2020 09:51:11 +0000 (UTC) (envelope-from rhurlin@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3MZ54frTz46mM; Sat, 3 Oct 2020 09:51:08 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEB86113C0; Sat, 3 Oct 2020 09:51:05 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0939p5EV096689; Sat, 3 Oct 2020 09:51:05 GMT (envelope-from rhurlin@FreeBSD.org) Received: (from rhurlin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0939p5vE096687; Sat, 3 Oct 2020 09:51:05 GMT (envelope-from rhurlin@FreeBSD.org) Message-Id: <202010030951.0939p5vE096687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rhurlin set sender to rhurlin@FreeBSD.org using -f From: Rainer Hurling Date: Sat, 3 Oct 2020 09:51:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551288 - in head/math/saga: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rhurlin X-SVN-Commit-Paths: in head/math/saga: . files X-SVN-Commit-Revision: 551288 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2020 09:51:11 -0000 Author: rhurlin Date: Sat Oct 3 09:51:05 2020 New Revision: 551288 URL: https://svnweb.freebsd.org/changeset/ports/551288 Log: math/saga: Configure not finding OpenCV headers - Let pkg-config find the OpenCV 3.x headers after change in sources[1] - Convert sed replacement to proper patch file - While here, remove unneeded OpenMP post-patch [1] https://sourceforge.net/p/saga-gis/code/ci/1a4b6df792186480953f4fb20474f16b328a9a5c/ Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D26645 Added: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am (contents, props changed) Modified: head/math/saga/Makefile Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Sat Oct 3 09:51:03 2020 (r551287) +++ head/math/saga/Makefile Sat Oct 3 09:51:05 2020 (r551288) @@ -3,6 +3,7 @@ PORTNAME= saga PORTVERSION= 7.7.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -89,8 +90,6 @@ post-extract: ${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \ ${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am - @${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \ - ${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am post-patch: .if ${ARCH} == "powerpc" @@ -102,8 +101,6 @@ post-patch: post-patch-OPENMP-on: @${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \ - ${WRKSRC}/configure.ac \ - ${WRKSRC}/configure \ ${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile post-configure: Added: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am Sat Oct 3 09:51:05 2020 (r551288) @@ -0,0 +1,14 @@ +--- src/tools/imagery/imagery_opencv/Makefile.am.orig 2020-09-28 15:32:31 UTC ++++ src/tools/imagery/imagery_opencv/Makefile.am +@@ -7,9 +7,9 @@ endif + + if HAVE_CV + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +-CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags` ++CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv --cflags` + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs` ++AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs` + pkglib_LTLIBRARIES = libimagery_opencv.la + libimagery_opencv_la_SOURCES =\ + MLB_Interface.cpp\