<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e837033bd2225e31773760a11db66e10c962092a">https://github.com/macports/macports-ports/commit/e837033bd2225e31773760a11db66e10c962092a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e837033bd22 source-extractor: update to 2.28.0
</span>e837033bd22 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e837033bd2225e31773760a11db66e10c962092a
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Thu Jan 18 10:37:59 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> source-extractor: update to 2.28.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Update upstream package.
</span><span style='display:block; white-space:pre;color:#404040;'> - Update patches from the Debian package.
</span><span style='display:block; white-space:pre;color:#404040;'> - Build against OpenBLAS instead of Atlas because the Atlas port
</span><span style='display:block; white-space:pre;color:#404040;'> does not currently build on recent versions of macOS
</span><span style='display:block; white-space:pre;color:#404040;'> (see https://trac.macports.org/ticket/66546).
</span>---
science/source-extractor/Portfile | 23 +++---
...-name-and-add-a-minimal-ldactoasc-manpage.patch | 84 ----------------------
.../files/Fix-format-security-errors.patch | 76 ++++++++++++++++++++
.../Rename-CLI-tool-to-source-extractor.patch | 65 ++++++++++++-----
...ble-name-in-help-message-to-source-extrac.patch | 24 -------
5 files changed, 138 insertions(+), 134 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/source-extractor/Portfile b/science/source-extractor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1be2325312..4944950cfba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/source-extractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/source-extractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup astromatic sextractor 2.25.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup astromatic sextractor 2.28.0
</span> name source-extractor
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,23 +22,26 @@ long_description Source Extractor is software \
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:cfitsio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span> port:fftw-3-single \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openblas
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b4eb2bfebdefc1e93f3b1993d2cf5a661192d99d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 28680961fe01e2903df6ecd1e328b16fceb22626f72ad5fdf6c3de7aed1cefd9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2300777
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 32d56c0b46cf67ebbb479ccffda7242370e51e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d386deceff3fb9cc50841f530f6612d12595ba548e1a81970e2d1f54866aee92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2687844
</span>
patchfiles Rename-CLI-tool-to-source-extractor.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Correct-manpage-name-and-add-a-minimal-ldactoasc-manpage.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Set-executable-name-in-help-message-to-source-extrac.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix-format-security-errors.patch
</span> patch.pre_args -p1
configure.fc ${prefix}/bin/no-possible-compiler
configure.cflags-append {*}${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-atlas=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-atlas-incdir=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-openblas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openblas-libdir=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openblas-incdir=${prefix}/include/openblas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cfitsio-libdir=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cfitsio-incdir=${prefix}/include \
</span> --with-fftw=${prefix}/lib \
--with-fftw-incdir=${prefix}/include
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/source-extractor/files/Correct-manpage-name-and-add-a-minimal-ldactoasc-manpage.patch b/science/source-extractor/files/Correct-manpage-name-and-add-a-minimal-ldactoasc-manpage.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cee581ff0d3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/source-extractor/files/Correct-manpage-name-and-add-a-minimal-ldactoasc-manpage.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ole Streicher <olebole@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 2 Jun 2015 12:18:10 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Correct manpage name and add a minimal ldactoasc manpage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man/Makefile.am | 5 ++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man/ldactoasc.1 | 23 +++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man/sex.1.in | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 31 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create mode 100644 man/ldactoasc.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/man/Makefile.am b/man/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 695885c..3691062 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/man/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/man/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,5 +26,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dist_man_MANS = source-extractor.1 source-extractor.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dist_man_MANS = source-extractor.1 ldactoasc.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+source-extractor.1: sex.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -f $< $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/man/ldactoasc.1 b/man/ldactoasc.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..e101e5a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/man/ldactoasc.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.TH LDACTOASC "1" "December 2011" "Source-Extractor 2.8.6" "User Commands"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH NAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ldactoasc \- Convert LDAC binary format to ASCII
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH SYNOPSIS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.B ldactoasc \fIcatalog\fR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH DESCRIPTION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Convert LDAC binary format to ASCII
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH AUTHOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Written by Emmanuel Bertin (Institut d'Astrophysique de Paris and Observatoire de Paris).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.PP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright 1994-2005 Emmanuel Bertin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.RE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This is free software; see the source for copying conditions. There is NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.SH "REPORTING BUGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Report bugs to <astromatic@astromatic.net>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.PP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+The full documentation for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.B Source-Extractor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+is maintained as a Postscript manual available at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.B http://terapix.iap.fr/soft/sextractor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+; on Debian systems, it is also installed to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/usr/share/doc/source-extractor/.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/man/sex.1.in b/man/sex.1.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b3e2a64..8a90720 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/man/sex.1.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/man/sex.1.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,12 +4,12 @@ source-extractor \- extract a source catalogue from an astronomical FITS image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SH SYNOPSIS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .B source-extractor \fIimage\fR [\fI-c configuration-file\fR]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .RS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--[\fI-parameter1 value1 -parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[\fI\-parameter1 value1 \-parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .RE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .TP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .B source-extractor \fIimage\_detect\fR \fIimage_measure\fR [\fI-c configuration-file\fR]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .RS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--[\fI-parameter1 value1 -parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+[\fI\-parameter1 value1 \-parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .RE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .TP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .B source-extractor \fI-d\fR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,8 +39,8 @@ Please report bugs to the SExtractor software forum at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://astromatic.net/forum.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SH "SEE ALSO"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .BR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--eye(1), missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ww(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+weightwatcher(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SH AUTHORS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Written by Emmanuel Bertin (Institut d'Astrophysique de Paris)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PP
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/source-extractor/files/Fix-format-security-errors.patch b/science/source-extractor/files/Fix-format-security-errors.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1b446238189
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/source-extractor/files/Fix-format-security-errors.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ole Streicher <olebole@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 21 Mar 2014 10:37:47 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix format security errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/catout.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/xml.c | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/catout.c b/src/catout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd8569f..6c575dc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/catout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/catout.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1006,7 +1006,7 @@ void endcat(char *error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ASCII_SKYCAT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(ascfile, skycattail);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(ascfile, "%s", skycattail);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!prefs.pipe_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(ascfile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/xml.c b/src/xml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 087f128..0cf6ee3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/xml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/xml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -697,7 +697,7 @@ int write_xmlconfigparam(FILE *file, char *name, char *unit,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name, ucd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case P_STRING:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(value, (char *)key[i].ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(value, "%s", (char *)key[i].ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\" arraysize=\"*\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " ucd=\"%s\" value=\"%s\"/>\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name, ucd, *value? value: " ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -706,13 +706,13 @@ int write_xmlconfigparam(FILE *file, char *name, char *unit,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n = *(key[i].nlistptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(value, ((char **)key[i].ptr)[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(value, "%s", ((char **)key[i].ptr)[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " arraysize=\"*\" ucd=\"%s\" value=\"%s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name, ucd, *value? value: " ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (j=1; j<n; j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(value, ((char **)key[i].ptr)[j]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(value, "%s", ((char **)key[i].ptr)[j]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, ",%s", *value? value: " ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, "\"/>\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -723,7 +723,7 @@ int write_xmlconfigparam(FILE *file, char *name, char *unit,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name, ucd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case P_KEY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(value, key[i].keylist[*((int *)key[i].ptr)]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(value, "%s", key[i].keylist[*((int *)key[i].ptr)]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\" arraysize=\"*\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " ucd=\"%s\" value=\"%s\"/>\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name, ucd, value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -732,13 +732,13 @@ int write_xmlconfigparam(FILE *file, char *name, char *unit,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n = *(key[i].nlistptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(value, key[i].keylist[((int *)key[i].ptr)[0]]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(value, "%s", key[i].keylist[((int *)key[i].ptr)[0]]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, " <PARAM name=\"%s\" datatype=\"char\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " arraysize=\"*\" ucd=\"%s\" value=\"%s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name, ucd, value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (j=1; j<n; j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(value, key[i].keylist[((int *)key[i].ptr)[j]]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(value, "%s", key[i].keylist[((int *)key[i].ptr)[j]]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, ",%s", value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(file, "\"/>\n");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/source-extractor/files/Rename-CLI-tool-to-source-extractor.patch b/science/source-extractor/files/Rename-CLI-tool-to-source-extractor.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a53e7191048..10e858f02b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/source-extractor/files/Rename-CLI-tool-to-source-extractor.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/source-extractor/files/Rename-CLI-tool-to-source-extractor.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,15 +9,16 @@ Subject: Rename CLI tool to source-extractor
</span> doc/src/Installing.rst | 4 ++--
doc/src/Param.rst | 2 +-
doc/src/Using.rst | 2 +-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- man/Makefile.am | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man/sex.1.in | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man/Makefile.am | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man/sex.1.in | 16 ++++++++--------
</span> man/sex.x | 2 +-
src/Makefile.am | 8 ++++----
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/define.h | 4 ++--
</span> tests/modelfit.test | 2 +-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 11 files changed, 23 insertions(+), 23 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 12 files changed, 32 insertions(+), 29 deletions(-)
</span>
diff --git a/configure.ac b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7ff6cce..06b984d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 07e1b37..942043d 100644
</span> --- a/configure.ac
+++ b/configure.ac
@@ -5,22 +5,22 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +28,7 @@ index 7ff6cce..06b984d 100644
</span> -# This file part of: SExtractor
+# This file part of: Source Extractor
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright: (C) 2002-2018 IAP/CNRS/UPMC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright: (C) 2002-2023 CFHT/IAP/CNRS/SorbonneU
</span> #
# License: GNU General Public License
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,15 +46,15 @@ index 7ff6cce..06b984d 100644
</span> -# along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
+# along with Source Extractor. If not, see <http://www.gnu.org/licenses/>.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Last modified: 08/02/2018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Last modified: 07/03/2023
</span> #
@@ -31,8 +31,8 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is your standard Bertin source code...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_INIT(SExtractor, 2.25.0,[astromatic@astromatic.net],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sextractor, [http://astromatic.net/software/sextractor])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_INIT(Source-Extractor, 2.25.0,[astromatic@astromatic.net],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is your standard AstrOmatic source code...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_INIT([SExtractor],[2.28.0],[astromatic@astromatic.iap.fr],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [sextractor],[http://astromatic.net/software/sextractor])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_INIT(Source-Extractor, 2.28.0,[astromatic@astromatic.iap.fr],
</span> + source-extractor, [http://astromatic.net/software/sextractor])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(autoconf)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,18 +134,21 @@ index 953b84e..95d8ea0 100644
</span> The parts enclosed within brackets are optional.
Any `-Parameter Value` statement in the command-line overrides the corresponding definition in the configuration file or any default value (see :ref:`configuration section<config_file>`).
diff --git a/man/Makefile.am b/man/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8e1f78c..695885c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8e1f78c..441696f 100644
</span> --- a/man/Makefile.am
+++ b/man/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,5 +26,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,5 +26,8 @@
</span> #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-dist_man_MANS = sex.1 sex.x
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+dist_man_MANS = source-extractor.1 source-extractor.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dist_man_MANS = source-extractor.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++source-extractor.1: sex.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp -f $< $@
</span>
diff --git a/man/sex.1.in b/man/sex.1.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d0f7208..b3e2a64 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d0f7208..8a90720 100644
</span> --- a/man/sex.1.in
+++ b/man/sex.1.in
@@ -1,18 +1,18 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,13 +160,15 @@ index d0f7208..b3e2a64 100644
</span> -.B sex \fIimage\fR [\fI-c configuration-file\fR]
+.B source-extractor \fIimage\fR [\fI-c configuration-file\fR]
.RS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [\fI-parameter1 value1 -parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-[\fI-parameter1 value1 -parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[\fI\-parameter1 value1 \-parameter2 value2 ...\fR]
</span> .RE
.TP
-.B sex \fIimage\_detect\fR \fIimage_measure\fR [\fI-c configuration-file\fR]
+.B source-extractor \fIimage\_detect\fR \fIimage_measure\fR [\fI-c configuration-file\fR]
.RS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [\fI-parameter1 value1 -parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-[\fI-parameter1 value1 -parameter2 value2 ...\fR]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[\fI\-parameter1 value1 \-parameter2 value2 ...\fR]
</span> .RE
.TP
-.B sex \fI-d\fR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +176,17 @@ index d0f7208..b3e2a64 100644
</span> .SH DESCRIPTION
SExtractor is a program that builds a catalogue of objects from an astronomical
image. Although it is particularly oriented towards reduction of large scale
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,8 +39,8 @@ Please report bugs to the SExtractor software forum at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://astromatic.net/forum.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH "SEE ALSO"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .BR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-eye(1), missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ww(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++weightwatcher(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH AUTHORS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Written by Emmanuel Bertin (Institut d'Astrophysique de Paris)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span> diff --git a/man/sex.x b/man/sex.x
index c6f97ad..134310f 100644
--- a/man/sex.x
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,6 +221,22 @@ index 3017766..8dd1c98 100644
</span> $(srcdir)/wcs/libwcs_c.a \
$(LEVLIB)
ldactoasc_LDADD = $(srcdir)/fits/libfits.a
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/define.h b/src/define.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 22653bb..2f163e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/define.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/define.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,9 +35,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------ what, who, when and where ------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BANNER "SExtractor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define BANNER "Source Extractor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MYVERSION VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define EXECUTABLE "sex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define EXECUTABLE "source-extractor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define COPYRIGHT "2012-2015 IAP/CNRS/UPMC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DISCLAIMER BANNER " comes with ABSOLUTELY NO WARRANTY\n" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "You may redistribute copies of " BANNER "\n" \
</span> diff --git a/tests/modelfit.test b/tests/modelfit.test
index a98dc0e..791032c 100755
--- a/tests/modelfit.test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/source-extractor/files/Set-executable-name-in-help-message-to-source-extrac.patch b/science/source-extractor/files/Set-executable-name-in-help-message-to-source-extrac.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 45c4ed1251a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/source-extractor/files/Set-executable-name-in-help-message-to-source-extrac.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Leo Singer <leo.singer@ligo.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 24 Oct 2019 14:44:12 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Set executable name in --help message to source-extractor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/define.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/define.h b/src/define.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0123b13..2839c14 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/define.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/define.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,9 +35,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*------------------------ what, who, when and where ------------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define BANNER "SExtractor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define BANNER "Source Extractor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MYVERSION VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define EXECUTABLE "sex"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXECUTABLE "source-extractor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define COPYRIGHT "2012-2015 IAP/CNRS/UPMC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define DISCLAIMER BANNER " comes with ABSOLUTELY NO WARRANTY\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "You may redistribute copies of " BANNER "\n" \
</span></pre><pre style='margin:0'>
</pre>