From owner-svn-ports-head@freebsd.org Sun Feb 7 18:14:39 2021 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 7CF7B533345; Sun, 7 Feb 2021 18:14:39 +0000 (UTC) (envelope-from lbartoletti@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 4DYckR37WVz4vCl; Sun, 7 Feb 2021 18:14:39 +0000 (UTC) (envelope-from lbartoletti@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 5E824DD6; Sun, 7 Feb 2021 18:14:39 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 117IEdQu027487; Sun, 7 Feb 2021 18:14:39 GMT (envelope-from lbartoletti@FreeBSD.org) Received: (from lbartoletti@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 117IEcFD027484; Sun, 7 Feb 2021 18:14:38 GMT (envelope-from lbartoletti@FreeBSD.org) Message-Id: <202102071814.117IEcFD027484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lbartoletti set sender to lbartoletti@FreeBSD.org using -f From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= Date: Sun, 7 Feb 2021 18:14:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564633 - in head/databases/grass7: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lbartoletti X-SVN-Commit-Paths: in head/databases/grass7: . files X-SVN-Commit-Revision: 564633 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.34 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: Sun, 07 Feb 2021 18:14:39 -0000 Author: lbartoletti Date: Sun Feb 7 18:14:38 2021 New Revision: 564633 URL: https://svnweb.freebsd.org/changeset/ports/564633 Log: databases/grass7: remove use of sbrk sbrk is deprecated and is not present on some architectures. There is only one use of this function in grass for the r.terraflow module. Its use will be removed in the next version, so I integrate this patch now to use it on architectures that don't have sbrk. Thanks to mikael@ for the tests on aarch64 Added: head/databases/grass7/files/patch-raster_r.terraflow_stats.cpp (contents, props changed) head/databases/grass7/files/patch-raster_r.terraflow_stats.h (contents, props changed) Modified: head/databases/grass7/Makefile head/databases/grass7/pkg-plist Modified: head/databases/grass7/Makefile ============================================================================== --- head/databases/grass7/Makefile Sun Feb 7 17:33:24 2021 (r564632) +++ head/databases/grass7/Makefile Sun Feb 7 18:14:38 2021 (r564633) @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 7.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases geography MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ @@ -134,12 +134,6 @@ ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include - -.if ${ARCH} == "aarch64" || ${ARCH} == "riscv64" -PLIST_SUB+= WOSBRK="@comment " -.else -PLIST_SUB+= WOSBRK="" -.endif .if ${ARCH} == "i386" && ${OSVERSION} < 1200000 # clang 7.x and 8.x do not build properly on 11i386 Added: head/databases/grass7/files/patch-raster_r.terraflow_stats.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/grass7/files/patch-raster_r.terraflow_stats.cpp Sun Feb 7 18:14:38 2021 (r564633) @@ -0,0 +1,47 @@ +--- raster/r.terraflow/stats.cpp.orig 2020-12-21 18:40:15 UTC ++++ raster/r.terraflow/stats.cpp +@@ -126,44 +126,7 @@ statsRecorder::statsRecorder(char *fname) : ofstream(n + //ofstream that takes an fd; wrote another noclobber() function that + //closes fd and returns the name; + rt_start(tm); +-#ifndef __MINGW32__ +- bss = sbrk(0); +-#endif +- char buf[BUFSIZ]; +- *this << freeMem(buf) << endl; + } +- +-/* ********************************************************************** */ +- +-long +-statsRecorder::freeMem() { +-#ifdef __MINGW32__ +- return -1; +-#else +- struct rlimit rlim; +- if (getrlimit(RLIMIT_DATA, &rlim) == -1) { +- perror("getrlimit: "); +- return -1; +- } +- /* printf("getrlimit returns: %d \n", rlim.rlim_cur); */ +- if (rlim.rlim_cur == RLIM_INFINITY) { +- /* printf("rlim is infinity\n"); */ +- /* should fix this */ +- return -1; +- } +- long freeMem = rlim.rlim_cur - ((char*)sbrk(0)-(char*)bss); +- return freeMem; +-#endif /* __MINGW32__ */ +-} +- +-char * +-statsRecorder::freeMem(char *buf) { +- char buf2[BUFSIZ]; +- sprintf(buf, "Free Memory=%s", formatNumber(buf2, freeMem())); +- return buf; +-} +- +- + + /* ********************************************************************** */ + Added: head/databases/grass7/files/patch-raster_r.terraflow_stats.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/grass7/files/patch-raster_r.terraflow_stats.h Sun Feb 7 18:14:38 2021 (r564633) @@ -0,0 +1,17 @@ +--- raster/r.terraflow/stats.h.orig 2020-12-21 18:40:15 UTC ++++ raster/r.terraflow/stats.h +@@ -35,14 +35,11 @@ int noclobberFile(char *); + class statsRecorder : public ofstream { + private: + Rtimer tm; +- void *bss; + public: + statsRecorder(char *fname); + ~statsRecorder() { + this->flush(); + } +- char *freeMem(char *); +- long freeMem(); + char *timestamp(); + void timestamp(const char *s); + void comment(const char *s, const int verbose=1); Modified: head/databases/grass7/pkg-plist ============================================================================== --- head/databases/grass7/pkg-plist Sun Feb 7 17:33:24 2021 (r564632) +++ head/databases/grass7/pkg-plist Sun Feb 7 18:14:38 2021 (r564633) @@ -240,7 +240,7 @@ bin/grass%%VER%% %%GRASS_INST_DIR%%/bin/r.surf.gauss %%GRASS_INST_DIR%%/bin/r.surf.idw %%GRASS_INST_DIR%%/bin/r.surf.random -%%WOSBRK%%%%GRASS_INST_DIR%%/bin/r.terraflow +%%GRASS_INST_DIR%%/bin/r.terraflow %%GRASS_INST_DIR%%/bin/r.texture %%GRASS_INST_DIR%%/bin/r.thin %%GRASS_INST_DIR%%/bin/r.tile