<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/067f7f34a8a540aea559615220a163934f62a997">https://github.com/macports/macports-ports/commit/067f7f34a8a540aea559615220a163934f62a997</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 067f7f34a8a molden: Update to 7.1
</span>067f7f34a8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 067f7f34a8a540aea559615220a163934f62a997
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat May 14 03:35:44 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> molden: Update to 7.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update to 7.1. Update homepage and master_sites and fix livecheck.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove stealth update provisions; let's see if the developers have
</span><span style='display:block; white-space:pre;color:#404040;'> learned to refrain from doing stealth updates by now.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use -fallow-argument-mismatch to allow building with gcc10 and later.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use -Wno-implicit-function-declaration to allow building with Xcode 12
</span><span style='display:block; white-space:pre;color:#404040;'> and later on x86_64, therefore mark the port as incompatible with arm64.
</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/61231
</span>---
science/molden/Portfile | 42 +++++++++-----------
science/molden/files/patch-makefile.diff | 68 ++++++++++++++++++++++++++------
2 files changed, 75 insertions(+), 35 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 736c6f5707f..4eef9815528 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;'>@@ -10,27 +10,28 @@ PortGroup compilers 1.0
</span>
name molden
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This project regularly makes "stealth updates". The version (with date)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as well as checksums should be updated each time this happens.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/wiki/PortfileRecipes#stealth-updates
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.8-20210407175900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cb95f8d129d895783b6058e616cf8cc125794023 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4dfbf6524b60112afb5720cba3c200a07a0f57b5d190e05ec14cceae1edf5782 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13850111
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0401531415d4b07aaf3496fe3b0a42bc330d871f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 98a39f0aa1667c14c36f40c0251522984245e5ba282af8fbc8a2f06079e40d43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14645590
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_number [lindex [split ${version} -] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version_number} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span> categories science graphics chemistry
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license Restrictive Noncommercial Nomirror
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://cheminf.cmbi.ru.nl/molden/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}${version_number}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The patchfile adds -Wno-implicit-function-declaration to makefile and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# src/surf/Makefile and it is already present in src/ambfor/makefile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This makes the software incompatible with Apple Silicon.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs-delete i386 ppc ppc64 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.theochem.ru.nl/molden/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://ftp.science.ru.nl/Molden/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}${version}
</span> worksrcdir ${name}${branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/
</span>
description Molecular graphics visualisation tool
long_description Molden is a package for displaying Molecular Density from \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,15 +71,12 @@ patchfiles patch-makefile.diff
</span> patchfiles-append implicit.patch
compilers.choose fc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.setup require_fortran -gcc10 -gcc11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This should allow gcc10 to work but the port doesn't honor MacPorts flags.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#compilers.allow_arguments_mismatch yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The argument mismatch problem has been reported to the developer by email.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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 6.8-20210407175900 distfile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This problem has been reported to the developer by email; no response yet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete ELF executables which were included in the 7.1 distfile. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # has been reported to the developer by email but they have not reacted.
</span> system -W ${worksrcpath} "${build.cmd} clean"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +106,4 @@ post-destroot {
</span> ${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.ryandesign.com/macports/version.php/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {^(.+)$}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex >${name}(\[0-9.\]+)\\.
</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 871d5f21ba4..896d1962ea5 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;'>@@ -1,8 +1,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The lack of a PREFIX or X11 path variable, the problems with the install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-target, and the duplicate lines in the Darwin section have been reported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to the developer by email.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2021-04-07 13:48:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2021-04-25 10:47:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change hardcoded references to /usr/local and /usr/X11R6 to $(PREFIX). This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+has been reported to the 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;'>+Fix the install target not to use sudo, not to use the GNU-specific -t flag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and to use DESTDIR. This has been reported to the developer by email but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+they have not reacted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable warning-to-error conversion for implicit function declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+because otherwise it won't compile with Xcode 12 or later. The separate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ambfor makefile already does this. Doing this makes the port incompatible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with the arm64 architecture. This project has a zillion implicit function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+declarations which it is too much work for me to fix myself; the developer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+should do it. This has been reported to the developer by email but they have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+not reacted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove duplicate declarations of CFLAGS, FFLAGS, LIBS, and LIBSG. The first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+FFLAGS has the vital -fallow-argument-mismatch flag that lets this software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compile with gcc10 and later. The second FFLAGS erroneously overwrites the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+first and removes that flag again. Also, the separate ambfor makefile has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+its own separate FFLAGS which needs this flag added.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove -fallow-argument-mismatch from CFLAGS because it is not a flag a C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler understands. Only a Fortran compiler understands this and the flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is already in (the first copy of) FFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2022-01-21 05:28:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2022-05-14 01:35:39.000000000 -0500
</span> @@ -16,7 +16,7 @@
CC = cc
LIBS = -lX11 -lm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,26 +33,27 @@ to the developer by email.
</span> ARCH := $(shell getconf LONG_BIT)
AFLAG= -m$(ARCH)
EXTEN=
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,15 +131,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,16 +131,11 @@
</span> # Mac OS X g77
#
CC=cc
-CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses
<span style='display:block; white-space:pre;background:#ffe0e0;'>--FFLAGS=-O3 -funroll-loops
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFLAGS=-O3 -funroll-loops -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</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
EXT= -std=gnu89 -Wno-return-type -DDARWIN ${EXTRAZ}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS=-O3 -funroll-loops
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FFLAGS=-O3 -funroll-loops
</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;'>--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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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> +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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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> LDR = ${FC}
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -270,7 +266,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -271,7 +266,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;'>@@ -40,7 +62,7 @@ to the developer by email.
</span> #
# on linux :
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -363,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,7 +359,7 @@
</span> endif
exten2:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,3 +72,25 @@ to the developer by email.
</span> install: $(EXTENZ)
- sudo install -t /usr/local/bin -m 755 bin/molden bin/gmolden bin/ambfor bin/ambmd bin/surf
+ install -m 755 bin/molden bin/gmolden bin/ambfor bin/ambmd bin/surf $(DESTDIR)$(PREFIX)/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ambfor/makefile.orig 2020-06-19 07:29:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ambfor/makefile 2022-05-14 03:03:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = -c -g ${EXT} -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #FC = g77
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FC = gfortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FFLAGS = -c -g -ffast-math -funroll-loops -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FFLAGS = -c -g -ffast-math -funroll-loops -O3 -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS = -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDR = ${FC} -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXT :=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/surf/Makefile.orig 2022-05-06 15:51:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/surf/Makefile 2022-05-14 03:23:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINCLUDE = -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT_CFLAGS = -O2 $(FLAGS) $(INCLUDE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CFLAGS = -g $(FLAGS) $(INCLUDE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -Wno-implicit-int -O2 $(FLAGS) $(INCLUDE) ${EXT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = -Wno-implicit-int -O2 $(FLAGS) $(INCLUDE) ${EXT} -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(uname), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span></pre><pre style='margin:0'>
</pre>