changeset 6440:eaf43454b1fa release

of-statistics: update to v1.5.0 * src/of-statistics.mk: update to v1.5.0, use github * dist-files.mk: remove ref to deleted file, add new ref * src/of-statistics-1-cross.patch: removed * src/of-statistics-fixes.patch: new file (grafted from 802dd54c177c5af7db3778a22a224186b4080565)
author John Donoghue <john.donoghue@ieee.org>
date Sat, 01 Oct 2022 08:57:05 -0400
parents 78b9fc115590
children 5daef644ab9a 86edd6018826
files dist-files.mk src/of-statistics-1-cross.patch src/of-statistics-fixes.patch src/of-statistics.mk
diffstat 4 files changed, 40 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Sep 29 15:54:52 2022 +0200
+++ b/dist-files.mk	Sat Oct 01 08:57:05 2022 -0400
@@ -542,7 +542,7 @@
   of-specfun-1-deprecated.patch \
   of-specfun.mk \
   of-splines.mk \
-  of-statistics-1-cross.patch \
+  of-statistics-fixes.patch \
   of-statistics.mk \
   of-stk.mk \
   of-strings.mk \
--- a/src/of-statistics-1-cross.patch	Thu Sep 29 15:54:52 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ur statistics-1.4.0.orig/utils/conditional_installation.m statistics-1.4.0/utils/conditional_installation.m
---- statistics-1.4.0.orig/utils/conditional_installation.m	2018-05-21 07:55:58.881279480 -0400
-+++ statistics-1.4.0/utils/conditional_installation.m	2018-05-21 07:58:13.197213866 -0400
-@@ -24,7 +24,7 @@
-   ## build system, and this file here has to be configured as follows:
-   ##
-   ## Set this to true if you have considered the next step.
--  configured = false;
-+  configured = true;
-   ##
-   ## If core Octave called at the build system has the same statistics
-   ## functions as the core Octave you build for, leave the following
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-statistics-fixes.patch	Sat Oct 01 08:57:05 2022 -0400
@@ -0,0 +1,32 @@
+diff --git a/PKG_ADD b/inst/PKG_ADD
+similarity index 88%
+rename from PKG_ADD
+rename to inst/PKG_ADD
+index 937bc41..fc0ce78 100644
+--- a/PKG_ADD
++++ b/inst/PKG_ADD
+@@ -8,7 +8,7 @@ d_2seRTE546_oyi_795jg09_dirname = fileparts (canonicalize_file_name ...
+                                              (mfilename ("fullpath")));
+ 
+ for iiII123DRT_idx = 1:length (a1_e324kporit985_itogj3_dirlist)
+-  addpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, "..", ...
++  addpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, ...
+            a1_e324kporit985_itogj3_dirlist{iiII123DRT_idx}));
+ endfor
+ 
+diff --git a/PKG_DEL b/inst/PKG_DEL
+similarity index 90%
+rename from PKG_DEL
+rename to inst/PKG_DEL
+index 095f782..dd619e6 100644
+--- a/PKG_DEL
++++ b/inst/PKG_DEL
+@@ -10,7 +10,7 @@ d_2seRTE546_oyi_795jg09_dirname = fileparts (canonicalize_file_name ...
+                                              (mfilename ("fullpath")));
+ 
+ for iiII123DRT_idx = 1:length (a1_e324kporit985_itogj3_dirlist)
+-  rmpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, "..", ...
++  rmpath (fullfile (d_2seRTE546_oyi_795jg09_dirname, ...
+           a1_e324kporit985_itogj3_dirlist{iiII123DRT_idx}));
+ endfor
+ 
--- a/src/of-statistics.mk	Thu Sep 29 15:54:52 2022 +0200
+++ b/src/of-statistics.mk	Sat Oct 01 08:57:05 2022 -0400
@@ -3,26 +3,22 @@
 
 PKG             := of-statistics
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.3
-$(PKG)_CHECKSUM := 5892ebffd8298db3f9e16fcef917701ad8085ffb
+$(PKG)_VERSION  := 1.5.0
+$(PKG)_CHECKSUM := 45157ebc92edeb48913b7d7540a4b9d7cc192c6d
 $(PKG)_REMOTE_SUBDIR :=
-$(PKG)_SUBDIR   := statistics-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := statistics-release-$($(PKG)_VERSION)
 $(PKG)_FILE     := statistics-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+$(PKG)_URL      := https://github.com/gnu-octave/statistics/archive/refs/tags/release-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := of-io
 
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
     $(PKG)_DEPS += $(OCTAVE_TARGET)
-    ifeq ($(MXE_NATIVE_BUILD),no)
-        ifeq ($(USE_SYSTEM_OCTAVE),no)
-            # Remove this when package builds without calling Octave
-            $(PKG)_DEPS += build-octave
-        endif
-    endif
 endif
 
 define $(PKG)_UPDATE
-    $(OCTAVE_FORGE_PKG_UPDATE)
+    $(WGET) -q -O- 'https://github.com/gnu-octave/statistics/tags' | \
+    $(SED) -n 's|.*releases/tag/release-\([^"]*\).*|\1|p' | $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD