<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/2d07c99d96e0d5e163e57e21f358cae83d7757dc">https://github.com/macports/macports-ports/commit/2d07c99d96e0d5e163e57e21f358cae83d7757dc</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 2d07c99d96e molden: Update to 7.3
</span>2d07c99d96e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2d07c99d96e0d5e163e57e21f358cae83d7757dc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Aug 30 08:47:39 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> molden: Update to 7.3
</span>---
science/molden/Portfile | 20 ++++-----
science/molden/files/docker.patch | 13 ++++++
science/molden/files/patch-makefile.diff | 76 +++++++++++++++++---------------
3 files changed, 64 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/molden/Portfile b/science/molden/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7253382ed81..410111624b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/molden/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/molden/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,20 +11,20 @@ PortGroup compilers 1.0
</span> name molden
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.3
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c1cc5ab0ddaa93d310b7cd2eaf5daa7fff1edfe3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fb878f0d8c597befbf7710f827a8722093085a9fc15f125a2f64d25c82a9a4e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14624659
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1695d7b5e027482eb35229ab461d71d90c6372b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 870f4fa6635229791bb09bbbd07f51456b2c90101d73564dc47ed7769b8c07a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7151194
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories science graphics chemistry
license Restrictive Noncommercial Nomirror
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The patchfile adds -Wno-implicit-function-declaration to makefile and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# src/surf/Makefile and it is already present in src/ambfor/makefile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This makes the software incompatible with Apple Silicon.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The makefile patch adds -Wno-implicit-function-declaration to three makefiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and it is already present in src/ambfor/makefile. This makes the software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# potentially incompatible with Apple Silicon.
</span> supported_archs i386 ppc ppc64 x86_64
homepage https://www.theochem.ru.nl/molden/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ depends_lib-append port:libGLU \
</span>
post-extract {
# Copy "group" permission to "others" which is empty for most items in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the 7.2.1 distfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the 7.3 distfile.
</span> fs-traverse item ${worksrcpath} {
set p [file attributes ${item} -permissions]
file attributes ${item} -permissions [format {0%o} [expr {(${p} >> 3 & 7) | ${p}}]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +69,7 @@ post-extract {
</span> }
patchfiles patch-makefile.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append docker.patch
</span> patchfiles-append implicit.patch
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,8 +84,7 @@ compilers.setup require_fortran
</span> minimum_xcodeversions {9 3.1}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Delete ELF executables which were included in the 7.2.1 distfile. This
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # has been reported to the developer by email but they have not reacted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete ELF docker executable included in the 7.3 distfile.
</span> system -W ${worksrcpath} "${build.cmd} clean"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/molden/files/docker.patch b/science/molden/files/docker.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..56f4f5a4fab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/molden/files/docker.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Uncomment a print statement, as instructed by the HISTORY file, to prevent a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crash on (some verisons of?) macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docker/docker.f.orig 2023-05-26 03:31:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docker/docker.f 2023-08-30 04:54:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1913,7 +1913,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c print is to prevent segment violation on MacOSX gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c apple-darwin15. Uncomment next line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c newer versions of grfortran may not have this bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-c print*," "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print*," "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (iflat.gt.0) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oflat = .true.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/molden/files/patch-makefile.diff b/science/molden/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d29cded5c2..a3ed3886d58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/molden/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/molden/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,35 +5,38 @@ Fix the install target not to use sudo, not to use the GNU-specific -t flag,
</span> and to use DESTDIR. This has been reported to the developer by email but
they have not reacted.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Disable warning-to-error conversion for implicit function declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-because otherwise it won't compile with Xcode 12 or later. The separate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ambfor makefile already does this. Doing this makes the port incompatible
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with the arm64 architecture. This project has a zillion implicit function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-declarations which it is too much work for me to fix myself; the developer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-should do it. This has been reported to the developer by email but they have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not reacted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix the clean target so it also deletes bin/docker.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove duplicate declarations of CFLAGS, FFLAGS, LIBS, and LIBSG. The first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FFLAGS has the vital -fallow-argument-mismatch flag that lets this software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compile with gcc10 and later. The second FFLAGS appends some unnecessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-duplicate flags so remove it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-function-declaration to fix errors like the following with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Apple Clang 12 and later and LLVM.org Clang 16 and later:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove -fallow-argument-mismatch from CFLAGS because it is not a flag a C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler understands. Only a Fortran compiler understands this and the flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-is already in (the first copy of) FFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- docker/makefile.orig 2022-07-01 04:42:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docker/makefile 2023-03-03 02:22:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'mkcon_' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The separate ambfor makefile already does this. This makes the port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+potentially incompatible with the arm64 architecture. This project has a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+zillion implicit function declarations which it is too much work for me to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fix myself; the developer should do it. This has been reported to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+developer by email but they have not reacted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -fallow-argument-mismatch to FFLAGS to fix errors like the following
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with GCC 10 and later:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Error: Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/REAL(4)).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docker/makefile.orig 2023-02-09 03:52:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docker/makefile 2023-08-30 08:18:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=gcc
</span>
EXT= -std=gnu89 -Wno-return-type -DDARWIN ${EXTRAZ}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS=-O3 -funroll-loops -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS= -g -std=gnu89 -Wno-return-type -DDARWIN -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FFLAGS=-O3 -funroll-loops
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS= -g -std=gnu89 -Wno-return-type -DDARWIN -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FFLAGS=-O3 -funroll-loops -fallow-argument-mismatch
</span> +CFLAGS= -g -std=gnu89 -Wno-return-type -DDARWIN -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare -Wno-implicit-function-declaration
LDR = ${FC}
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2022-12-08 07:09:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2023-03-03 00:59:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2023-05-24 02:18:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2023-08-30 08:14:52.000000000 -0500
</span> @@ -16,7 +16,7 @@
CC = cc
LIBS = -lX11 -lm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,29 +46,23 @@ is already in (the first copy of) FFLAGS.
</span> ARCH := $(shell getconf LONG_BIT)
AFLAG= -m$(ARCH)
EXTEN=
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,18 +132,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,11 +132,11 @@
</span> # Mac OS X g77
#
CC=cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#FFLAGS=-O3 -funroll-loops -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS+=-O3 -funroll-loops -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FFLAGS+=-O3 -funroll-loops -DDARWIN ${EXTRAZ}
</span> -LIBS = -L/usr/X11R6/lib -lX11 -lm
-LIBSG = -L/usr/X11R6/lib -lGLU "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" -lGL -lXmu -lX11 -lm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- EXT= -std=gnu89 -Wno-return-type -DDARWIN ${EXTRAZ}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#FFLAGS=-O3 -funroll-loops
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FFLAGS+=-O3 -funroll-loops
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS = -L/usr/X11R6/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBSG = -L/usr/X11R6/lib -lGLU "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" -lGL -lXmu -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS= -g -std=gnu89 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FFLAGS+=-O3 -funroll-loops -fallow-argument-mismatch -DDARWIN ${EXTRAZ}
</span> +LIBS = -L$(PREFIX)/lib -lX11 -lm
+LIBSG = -L$(PREFIX)/lib -lGLU "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" -lGL -lXmu -lX11 -lm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS= -g -std=gnu89 -Wno-return-type -DDARWIN -I$(PREFIX)/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXT= -std=gnu89 -Wno-return-type -DDARWIN ${EXTRAZ}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS= -g -std=gnu90 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS= -g -std=gnu90 -Wno-return-type -DDARWIN -I$(PREFIX)/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare -Wno-implicit-function-declaration
</span> LDR = ${FC}
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,7 +267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,7 +267,7 @@
</span> # and the full opengl version of molden 'gmolden', (does not need glut)
# (make gmolden)
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +71,16 @@ is already in (the first copy of) FFLAGS.
</span> #
# on linux :
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -371,7 +364,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -354,7 +354,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LDR) -o bin/cad2mol src/cad2mol.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f src/$(OBJS) src/mpdum.o src/xwin.o src/xwingl.o bin/molden bin/gmolden bin/ambfor bin/ambmd bin/surf src/ambfor/*.o src/surf/*.o docker/*.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f src/$(OBJS) src/mpdum.o src/xwin.o src/xwingl.o bin/molden bin/gmolden bin/ambfor bin/ambmd bin/surf bin/docker src/ambfor/*.o src/surf/*.o docker/*.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exten:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ("/usr/bin/gio", "$(shell which gio)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,7 +364,7 @@
</span> endif
exten2:
</pre><pre style='margin:0'>
</pre>