<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/d47227354802723efa6f03c2e212a636bf50f3ab">https://github.com/macports/macports-ports/commit/d47227354802723efa6f03c2e212a636bf50f3ab</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 d4722735480 molden: Update to 7.2.1
</span>d4722735480 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d47227354802723efa6f03c2e212a636bf50f3ab
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 3 02:49:08 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> molden: Update to 7.2.1
</span>---
science/molden/Portfile | 20 ++++++++++-----
science/molden/files/patch-makefile.diff | 43 ++++++++++++++++----------------
2 files changed, 36 insertions(+), 27 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 3e1f11f9ae0..7253382ed81 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,11 +11,11 @@ PortGroup compilers 1.0
</span> name molden
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.2.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0401531415d4b07aaf3496fe3b0a42bc330d871f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98a39f0aa1667c14c36f40c0251522984245e5ba282af8fbc8a2f06079e40d43 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14645590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c1cc5ab0ddaa93d310b7cd2eaf5daa7fff1edfe3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb878f0d8c597befbf7710f827a8722093085a9fc15f125a2f64d25c82a9a4e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14624659
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories science graphics chemistry
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,8 @@ depends_lib-append port:libGLU \
</span> port:xorg-libXmu
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy "group" permission to "others", which is empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy "group" permission to "others" which is empty for most items in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the 7.2.1 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;'>@@ -70,12 +71,19 @@ post-extract {
</span> patchfiles patch-makefile.diff
patchfiles-append implicit.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This Makefile declares dependencies on headers in /usr/include. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't work with recent Xcode versions where there is no /usr/include:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gmake[1]: *** No rule to make target '/usr/include/stdio.h', needed by 'surf.o'. Stop.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {/^[^[:space:]]+\.o: /s, /usr/include/[^[:space:]]+\.h,,g} ${worksrcpath}/src/surf/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compilers.choose fc
compilers.setup require_fortran
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.1 distfile. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete ELF executables which were included in the 7.2.1 distfile. This
</span> # has been reported to the developer by email but they have not reacted.
system -W ${worksrcpath} "${build.cmd} clean"
}
<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 896d1962ea5..5d29cded5c2 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;'>@@ -15,15 +15,25 @@ not reacted.
</span>
Remove duplicate declarations of CFLAGS, FFLAGS, LIBS, and LIBSG. The first
FFLAGS has the vital -fallow-argument-mismatch flag that lets this software
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compile with gcc10 and later. The second FFLAGS erroneously overwrites the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-first and removes that flag again. Also, the separate ambfor makefile has
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-its own separate FFLAGS which needs this flag added.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compile with gcc10 and later. The second FFLAGS appends some unnecessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+duplicate flags so remove it.
</span>
Remove -fallow-argument-mismatch from CFLAGS because it is not a flag a C
compiler understands. Only a Fortran compiler understands this and the flag
is already in (the first copy of) FFLAGS.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2022-01-21 05:28:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2022-05-14 01:35:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docker/makefile.orig 2022-07-01 04:42:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docker/makefile 2023-03-03 02:22:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ FFLAGS=-O3 -funroll-loops -fallow-argument-mismatch
</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 -fallow-argument-mismatch
</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 -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDR = ${FC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2022-12-08 07:09:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2023-03-03 00:59:43.000000000 -0600
</span> @@ -16,7 +16,7 @@
CC = cc
LIBS = -lX11 -lm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,17 +43,19 @@ 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;'>-@@ -131,16 +131,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,18 +132,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 -fallow-argument-mismatch
</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;'>+ FFLAGS+=-O3 -funroll-loops -fallow-argument-mismatch
</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><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
-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 style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +65,7 @@ is already in (the first copy of) FFLAGS.
</span> LDR = ${FC}
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -271,7 +266,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,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;'>@@ -62,7 +74,7 @@ is already in (the first copy of) FFLAGS.
</span> #
# on linux :
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -371,7 +364,7 @@
</span> endif
exten2:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,17 +84,6 @@ is already in (the first copy of) FFLAGS.
</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:#ffe0e0;'>---- src/ambfor/makefile.orig 2020-06-19 07:29:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ambfor/makefile 2022-05-14 03:03:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -c -g ${EXT} -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #FC = g77
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FC = gfortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FFLAGS = -c -g -ffast-math -funroll-loops -O3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FFLAGS = -c -g -ffast-math -funroll-loops -O3 -fallow-argument-mismatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDR = ${FC} -g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXT :=
</span> --- src/surf/Makefile.orig 2022-05-06 15:51:50.000000000 -0500
+++ src/surf/Makefile 2022-05-14 03:23:26.000000000 -0500
@@ -6,7 +6,7 @@
</pre><pre style='margin:0'>
</pre>