<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8e5162b8e36511d287b5e7ee70470c7dd1242a9e">https://github.com/macports/macports-ports/commit/8e5162b8e36511d287b5e7ee70470c7dd1242a9e</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 8e5162b8e36 grace: Fix implicit declaration of functions
</span>8e5162b8e36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e5162b8e36511d287b5e7ee70470c7dd1242a9e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 17 05:44:44 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> grace: Fix implicit declaration of functions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61261
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix netcdf variant so that it actually uses netcdf by removing a patch
</span><span style='display:block; white-space:pre;color:#404040;'> of unknown purpose that has been in the port since the netcdf variant
</span><span style='display:block; white-space:pre;color:#404040;'> was added:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/16910
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix port to ensure that netcdf support is not included unless the netcdf
</span><span style='display:block; white-space:pre;color:#404040;'> variant is selected.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add size to checksums.
</span>---
x11/grace/Portfile | 12 +++---
x11/grace/files/implicit.patch | 73 ++++++++++++++++++++++++++++++++++++
x11/grace/files/patch-configure.diff | 22 -----------
3 files changed, 80 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/grace/Portfile b/x11/grace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c50cdec5d5..f0f899dbe6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/grace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/grace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name grace
version 5.1.25
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories x11 math science print
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,8 @@ master_sites ftp://ftp.fu-berlin.de/unix/graphics/${sub} \
</span> ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/${sub}
checksums rmd160 3fff22b3ceaaffddd81c8d23d26623f2e8f87c7c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2957689
</span>
depends_lib lib:libXm:openmotif \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,12 +32,13 @@ depends_lib lib:libXm:openmotif \
</span>
depends_run port:openbrowser
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch
</span>
# The default optimization level apparently causes xmgrace to crash for some users.
configure.optflags -O1
configure.pre_args --prefix=${prefix}/lib
configure.args --with-helpviewer="${prefix}/bin/openbrowser ${prefix}/share/doc/${name}/`basename %s`" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-netcdf \
</span> --x-include=${prefix}/include --x-lib=${prefix}/lib --with-bundled-t1lib=yes
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +54,8 @@ post-destroot {
</span> }
variant netcdf description {Support for NetCDF data files} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:netcdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-netcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:netcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-netcdf --enable-netcdf
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/grace/files/implicit.patch b/x11/grace/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f40ff705508
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/grace/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcmp' with type 'int (const char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'XmRegisterConverters' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exit and strcmp are OS functions; fix by including the right OS header.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+XmRegisterConverters is an internal Motif function; fix by providing the right declaration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2015-02-14 16:59:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-03-17 01:59:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4935,6 +4935,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOG2EA 0.44269504088896340735992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8179,8 +8180,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netcdf.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *vlib;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlib = nc_inq_libvers();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8345,6 +8347,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <zlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8431,6 +8434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <jpeglib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int vinc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8515,6 +8519,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <png.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8603,6 +8608,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pdflib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *vinc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int vlibn, vincn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9552,7 +9559,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Xm/XmAll.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void XmRegisterConverters(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int vlibn, vincn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vincn = XmVersion;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/grace/files/patch-configure.diff b/x11/grace/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3a578e3160e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/grace/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8179,15 +8179,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netcdf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *vlib;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vlib = nc_inq_libvers();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (strcmp(vlib, "3.0") < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (strstr(nc_inq_libvers(), "3.") == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</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;'>- _ACEOF
</span></pre><pre style='margin:0'>
</pre>