Date: Fri, 27 Mar 2026 08:44:25 +0000 From: =?utf-8?Q?=C3=84lven?= <alven@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 157348412287 - main - astro/oskar: Update 2.8.3 => 2.12.2, unbreak on all ARCHS Message-ID: <69c64369.22090.47700a5c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by alven: URL: https://cgit.FreeBSD.org/ports/commit/?id=157348412287662986ef95b62f0317b2fdee94b1 commit 157348412287662986ef95b62f0317b2fdee94b1 Author: Älven <alven@FreeBSD.org> AuthorDate: 2026-03-27 08:41:32 +0000 Commit: Älven <alven@FreeBSD.org> CommitDate: 2026-03-27 08:44:11 +0000 astro/oskar: Update 2.8.3 => 2.12.2, unbreak on all ARCHS * Add WWW for documentation site * Clarify LICENSE * Unbreak on all ARCHS * Remove upstreamed patches * Pet portclippy(1) and portfmt(1) Approved by: yuri@ (maintainer, Mentor) Approved by: db@, yuri@ (Mentors, implicit) Differential Revision: https://reviews.freebsd.org/D56106 --- astro/oskar/Makefile | 17 +++---- astro/oskar/distinfo | 6 +-- .../patch-extern_Random123_features_gccfeatures.h | 32 ------------- astro/oskar/pkg-plist | 54 +++++++++++----------- 4 files changed, 36 insertions(+), 73 deletions(-) diff --git a/astro/oskar/Makefile b/astro/oskar/Makefile index 9583d9efd6a6..38b373e57290 100644 --- a/astro/oskar/Makefile +++ b/astro/oskar/Makefile @@ -1,31 +1,28 @@ PORTNAME= OSKAR -DISTVERSION= 2.8.3 -PORTREVISION= 5 +DISTVERSION= 2.12.2 CATEGORIES= astro MAINTAINER= yuri@FreeBSD.org COMMENT= SKA Radio telescope simulator -WWW= https://github.com/OxfordSKA/OSKAR +WWW= https://github.com/OxfordSKA/OSKAR/ \ + https://ska-telescope.gitlab.io/sim/oskar/ -LICENSE= GPLv2 +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le -ONLY_FOR_ARCHS_REASON= gccfeatures.h:54:4: This code has only been tested on x86 and powerpc platforms - LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libhdf5.so:science/hdf5 \ libsz.so:science/libaec -USES= cmake compiler:c++11-lang localbase:ldflags python qt:5 \ - shebangfix +USES= cmake compiler:c++11-lang localbase:ldflags python qt:5 USE_QT= core gui network widgets buildtools:build qmake:build USE_LDCONFIG= yes -SHEBANG_FILES= apps/oskar_convert_cst_to_scalar.py USE_GITHUB= yes GH_ACCOUNT= OxfordSKA CMAKE_ARGS= -DFREEBSD_FILESDIR:STRING=${FILESDIR} +PLIST_SUB= SOVERSION=${DISTVERSION} + .include <bsd.port.mk> diff --git a/astro/oskar/distinfo b/astro/oskar/distinfo index 22693b79cdfe..e2c79b1734ca 100644 --- a/astro/oskar/distinfo +++ b/astro/oskar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653680745 -SHA256 (OxfordSKA-OSKAR-2.8.3_GH0.tar.gz) = 828fe0ff72019bec3b6fa10a3928f9aa2aa1a5c6a4a8d5643364cfd6ddd50fac -SIZE (OxfordSKA-OSKAR-2.8.3_GH0.tar.gz) = 4825009 +TIMESTAMP = 1774595984 +SHA256 (OxfordSKA-OSKAR-2.12.2_GH0.tar.gz) = 04bc7994a2fad8bb020fbf6bc3782a59ba5798b7a95330a0724cab548160489b +SIZE (OxfordSKA-OSKAR-2.12.2_GH0.tar.gz) = 4772857 diff --git a/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h b/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h deleted file mode 100644 index d7eb4af213fc..000000000000 --- a/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h +++ /dev/null @@ -1,32 +0,0 @@ ---- extern/Random123/features/gccfeatures.h.orig 2019-11-17 00:45:21 UTC -+++ extern/Random123/features/gccfeatures.h -@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O - Please let the authors know of any successes (or failures). */ - #endif - --#ifdef __powerpc__ -+#if defined(__powerpc__) && !defined(__clang__) - #include <ppu_intrinsics.h> - #endif - -@@ -246,6 +246,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O - #else - #define R123_USE_MULHILO64_MULHI_INTRIN 0 - #endif -+#endif -+ -+#if defined(__powerpc__) && defined(__clang__) -+#ifdef __powerpc64__ -+static inline unsigned long long __mulhdu(unsigned long long a, unsigned long long b) { -+ __uint128_t c = (__uint128_t) a * (__uint128_t) b; -+ return c >> 64; -+} -+#endif -+ -+static inline unsigned int __mulhwu(unsigned int a, unsigned int b) { -+ unsigned long long c = (unsigned long long) a * (unsigned long long) b; -+ return c >> 32; -+} - #endif - - #ifndef R123_MULHILO64_MULHI_INTRIN diff --git a/astro/oskar/pkg-plist b/astro/oskar/pkg-plist index 58187ad3f800..413a9d6bb340 100644 --- a/astro/oskar/pkg-plist +++ b/astro/oskar/pkg-plist @@ -1,10 +1,8 @@ bin/oskar bin/oskar_binary_file_query -bin/oskar_convert_cst_to_scalar.py bin/oskar_convert_ecef_to_enu bin/oskar_convert_geodetic_to_ecef bin/oskar_filter_sky_model_clusters -bin/oskar_fit_element_data bin/oskar_fits_image_to_sky_model bin/oskar_imager bin/oskar_sim_beam_pattern @@ -63,17 +61,16 @@ include/oskar/convert/oskar_convert_geodetic_spherical_to_ecef.h include/oskar/convert/oskar_convert_healpix_ring_to_theta_phi.h include/oskar/convert/oskar_convert_lon_lat_to_relative_directions.h include/oskar/convert/oskar_convert_lon_lat_to_xyz.h -include/oskar/convert/oskar_convert_ludwig3_to_theta_phi_components.h include/oskar/convert/oskar_convert_mjd_to_gast_fast.h include/oskar/convert/oskar_convert_mjd_to_gmst.h include/oskar/convert/oskar_convert_mjd_ut1_to_era.h include/oskar/convert/oskar_convert_mjd_utc_to_mjd_tt.h include/oskar/convert/oskar_convert_offset_ecef_to_ecef.h +include/oskar/convert/oskar_convert_pqr_to_ecef_matrix.h include/oskar/convert/oskar_convert_relative_directions_to_enu_directions.h include/oskar/convert/oskar_convert_relative_directions_to_lon_lat.h include/oskar/convert/oskar_convert_station_uvw_to_baseline_uvw.h include/oskar/convert/oskar_convert_theta_phi_to_enu_directions.h -include/oskar/convert/oskar_convert_theta_phi_to_ludwig3_components.h include/oskar/convert/oskar_convert_xyz_to_lon_lat.h include/oskar/convert/oskar_equation_of_equinoxes_fast.h include/oskar/convert/oskar_evaluate_diurnal_aberration.h @@ -86,7 +83,6 @@ include/oskar/correlate/oskar_cross_correlate_scalar_omp.h include/oskar/correlate/oskar_evaluate_auto_power.h include/oskar/correlate/oskar_evaluate_cross_power.h include/oskar/gains/oskar_gains.h -include/oskar/harp/CMakeLists.txt include/oskar/harp/oskar_harp.h include/oskar/imager/oskar_grid_correction.h include/oskar/imager/oskar_grid_functions_pillbox.h @@ -116,6 +112,7 @@ include/oskar/interferometer/oskar_interferometer.h include/oskar/interferometer/oskar_interferometer_accessors.h include/oskar/interferometer/oskar_jones.h include/oskar/interferometer/oskar_jones_accessors.h +include/oskar/interferometer/oskar_jones_apply_cable_length_errors.h include/oskar/interferometer/oskar_jones_apply_station_gains.h include/oskar/interferometer/oskar_jones_create.h include/oskar/interferometer/oskar_jones_create_copy.h @@ -123,7 +120,6 @@ include/oskar/interferometer/oskar_jones_free.h include/oskar/interferometer/oskar_jones_join.h include/oskar/interferometer/oskar_jones_set_size.h include/oskar/log/oskar_log.h -include/oskar/math/CMakeLists.txt include/oskar/math/oskar_angular_distance.h include/oskar/math/oskar_bearing_angle.h include/oskar/math/oskar_cmath.h @@ -141,6 +137,7 @@ include/oskar/math/oskar_find_closest_match.h include/oskar/math/oskar_fit_ellipse.h include/oskar/math/oskar_floating_point_compare.h include/oskar/math/oskar_gaussian_circular.h +include/oskar/math/oskar_gaussian_ellipse.h include/oskar/math/oskar_healpix_npix_to_nside.h include/oskar/math/oskar_kahan_sum.h include/oskar/math/oskar_lapack_subset.h @@ -161,10 +158,8 @@ include/oskar/mem/oskar_binary_write_mem.h include/oskar/mem/oskar_mem.h include/oskar/mem/oskar_mem_accessors.h include/oskar/mem/oskar_mem_add.h -include/oskar/mem/oskar_mem_add_real.h include/oskar/mem/oskar_mem_append_raw.h include/oskar/mem/oskar_mem_clear_contents.h -include/oskar/mem/oskar_mem_conjugate.h include/oskar/mem/oskar_mem_convert_precision.h include/oskar/mem/oskar_mem_copy.h include/oskar/mem/oskar_mem_copy_contents.h @@ -185,9 +180,9 @@ include/oskar/mem/oskar_mem_normalise.h include/oskar/mem/oskar_mem_random_gaussian.h include/oskar/mem/oskar_mem_random_range.h include/oskar/mem/oskar_mem_random_uniform.h -include/oskar/mem/oskar_mem_read_binary_raw.h include/oskar/mem/oskar_mem_read_element.h include/oskar/mem/oskar_mem_read_fits.h +include/oskar/mem/oskar_mem_read_fits_bintable.h include/oskar/mem/oskar_mem_read_fits_image_plane.h include/oskar/mem/oskar_mem_read_healpix_fits.h include/oskar/mem/oskar_mem_realloc.h @@ -197,6 +192,8 @@ include/oskar/mem/oskar_mem_set_alias.h include/oskar/mem/oskar_mem_set_element.h include/oskar/mem/oskar_mem_set_value_real.h include/oskar/mem/oskar_mem_stats.h +include/oskar/mem/oskar_mem_to_sdp_mem.h +include/oskar/mem/oskar_mem_write_fits_bintable.h include/oskar/mem/oskar_mem_write_fits_cube.h include/oskar/mem/oskar_mem_write_healpix_fits.h include/oskar/ms/oskar_measurement_set.h @@ -273,10 +270,15 @@ include/oskar/sky/oskar_sky.h include/oskar/sky/oskar_sky_accessors.h include/oskar/sky/oskar_sky_append.h include/oskar/sky/oskar_sky_append_to_set.h +include/oskar/sky/oskar_sky_clear_source_flux.h +include/oskar/sky/oskar_sky_column.h +include/oskar/sky/oskar_sky_column_type_from_name.h +include/oskar/sky/oskar_sky_column_type_to_name.h include/oskar/sky/oskar_sky_copy.h include/oskar/sky/oskar_sky_copy_contents.h include/oskar/sky/oskar_sky_copy_source_data.h include/oskar/sky/oskar_sky_create.h +include/oskar/sky/oskar_sky_create_columns.h include/oskar/sky/oskar_sky_create_copy.h include/oskar/sky/oskar_sky_evaluate_gaussian_source_parameters.h include/oskar/sky/oskar_sky_evaluate_relative_directions.h @@ -290,28 +292,23 @@ include/oskar/sky/oskar_sky_generate_grid.h include/oskar/sky/oskar_sky_generate_random_power_law.h include/oskar/sky/oskar_sky_horizon_clip.h include/oskar/sky/oskar_sky_load.h -include/oskar/sky/oskar_sky_override_polarisation.h -include/oskar/sky/oskar_sky_read.h +include/oskar/sky/oskar_sky_load_named_columns.h include/oskar/sky/oskar_sky_resize.h -include/oskar/sky/oskar_sky_rotate_to_position.h include/oskar/sky/oskar_sky_save.h +include/oskar/sky/oskar_sky_save_named_columns.h include/oskar/sky/oskar_sky_scale_flux_with_frequency.h -include/oskar/sky/oskar_sky_set_gaussian_parameters.h include/oskar/sky/oskar_sky_set_source.h -include/oskar/sky/oskar_sky_set_spectral_index.h -include/oskar/sky/oskar_sky_write.h include/oskar/sky/oskar_update_horizon_mask.h -include/oskar/splines/oskar_splines.h -include/oskar/splines/oskar_splines_evaluate.h -include/oskar/splines/oskar_splines_fit.h include/oskar/telescope/oskar_TelescopeLoadAbstract.h include/oskar/telescope/oskar_telescope.h include/oskar/telescope/oskar_telescope_accessors.h include/oskar/telescope/oskar_telescope_analyse.h include/oskar/telescope/oskar_telescope_create.h include/oskar/telescope/oskar_telescope_create_copy.h +include/oskar/telescope/oskar_telescope_evaluate_magnetic_field.h include/oskar/telescope/oskar_telescope_free.h include/oskar/telescope/oskar_telescope_load.h +include/oskar/telescope/oskar_telescope_load_cable_length_error.h include/oskar/telescope/oskar_telescope_load_pointing_file.h include/oskar/telescope/oskar_telescope_load_position.h include/oskar/telescope/oskar_telescope_load_station_coords_ecef.h @@ -326,6 +323,7 @@ include/oskar/telescope/oskar_telescope_resize.h include/oskar/telescope/oskar_telescope_resize_station_array.h include/oskar/telescope/oskar_telescope_save.h include/oskar/telescope/oskar_telescope_save_layout.h +include/oskar/telescope/oskar_telescope_set_station_cable_length_error.h include/oskar/telescope/oskar_telescope_set_station_coords.h include/oskar/telescope/oskar_telescope_set_station_coords_ecef.h include/oskar/telescope/oskar_telescope_set_station_coords_enu.h @@ -341,23 +339,19 @@ include/oskar/telescope/station/element/oskar_element_create.h include/oskar/telescope/station/element/oskar_element_different.h include/oskar/telescope/station/element/oskar_element_evaluate.h include/oskar/telescope/station/element/oskar_element_free.h -include/oskar/telescope/station/element/oskar_element_load.h -include/oskar/telescope/station/element/oskar_element_load_cst.h -include/oskar/telescope/station/element/oskar_element_load_scalar.h include/oskar/telescope/station/element/oskar_element_load_spherical_wave_coeff.h -include/oskar/telescope/station/element/oskar_element_read.h include/oskar/telescope/station/element/oskar_element_resize_freq_data.h -include/oskar/telescope/station/element/oskar_element_save.h -include/oskar/telescope/station/element/oskar_element_write.h include/oskar/telescope/station/element/oskar_evaluate_dipole_pattern.h include/oskar/telescope/station/element/oskar_evaluate_geometric_dipole_pattern.h include/oskar/telescope/station/element/oskar_evaluate_spherical_wave_sum.h +include/oskar/telescope/station/element/oskar_evaluate_spherical_wave_sum_feko.h +include/oskar/telescope/station/element/oskar_evaluate_spherical_wave_sum_feko_norm_polynomial.h +include/oskar/telescope/station/element/oskar_evaluate_spherical_wave_sum_galileo.h include/oskar/telescope/station/oskar_blank_below_horizon.h include/oskar/telescope/station/oskar_evaluate_element_weights_dft.h include/oskar/telescope/station/oskar_evaluate_element_weights_errors.h include/oskar/telescope/station/oskar_evaluate_pierce_points.h include/oskar/telescope/station/oskar_evaluate_station_beam_aperture_array.h -include/oskar/telescope/station/oskar_evaluate_station_beam_gaussian.h include/oskar/telescope/station/oskar_evaluate_station_from_telescope_dipole_azimuth.h include/oskar/telescope/station/oskar_evaluate_tec_screen.h include/oskar/telescope/station/oskar_evaluate_vla_beam_pbcor.h @@ -372,6 +366,7 @@ include/oskar/telescope/station/oskar_station_create_copy.h include/oskar/telescope/station/oskar_station_different.h include/oskar/telescope/station/oskar_station_duplicate_first_child.h include/oskar/telescope/station/oskar_station_evaluate_element_weights.h +include/oskar/telescope/station/oskar_station_evaluate_magnetic_field.h include/oskar/telescope/station/oskar_station_free.h include/oskar/telescope/station/oskar_station_load_apodisation.h include/oskar/telescope/station/oskar_station_load_cable_length_error.h @@ -381,6 +376,7 @@ include/oskar/telescope/station/oskar_station_load_gain_phase.h include/oskar/telescope/station/oskar_station_load_layout.h include/oskar/telescope/station/oskar_station_load_mount_types.h include/oskar/telescope/station/oskar_station_load_permitted_beams.h +include/oskar/telescope/station/oskar_station_load_spherical_wave_coeff_feko_h5.h include/oskar/telescope/station/oskar_station_override_element_cable_length_errors.h include/oskar/telescope/station/oskar_station_override_element_feed_angle.h include/oskar/telescope/station/oskar_station_override_element_gains.h @@ -423,7 +419,9 @@ include/oskar/utility/oskar_getline.h include/oskar/utility/oskar_hdf5.h include/oskar/utility/oskar_kernel_macros.h include/oskar/utility/oskar_lock_file.h +include/oskar/utility/oskar_string_to_angle.h include/oskar/utility/oskar_string_to_array.h +include/oskar/utility/oskar_string_trim.h include/oskar/utility/oskar_thread.h include/oskar/utility/oskar_timer.h include/oskar/utility/oskar_vector_types.h @@ -450,10 +448,10 @@ include/oskar/vis/oskar_vis_header_read.h include/oskar/vis/oskar_vis_header_write.h include/oskar/vis/oskar_vis_header_write_ms.h lib/liboskar.so -lib/liboskar.so.2.8.3 +lib/liboskar.so.%%SOVERSION%% lib/liboskar_apps.so -lib/liboskar_apps.so.2.8.3 +lib/liboskar_apps.so.%%SOVERSION%% lib/liboskar_binary.so lib/liboskar_binary.so.2.1 lib/liboskar_settings.so -lib/liboskar_settings.so.2.8.3 +lib/liboskar_settings.so.%%SOVERSION%%home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c64369.22090.47700a5c>