<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/937927b9e16844e0c77f0c8dc51f57b04ff7e660">https://github.com/macports/macports-ports/commit/937927b9e16844e0c77f0c8dc51f57b04ff7e660</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 937927b9e16844e0c77f0c8dc51f57b04ff7e660
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Apr 25 11:29:05 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> molden: Update to 6.8-20210407175900
</span>---
science/molden/Portfile | 13 +++----
science/molden/files/patch-makefile.diff | 60 ++++----------------------------
2 files changed, 12 insertions(+), 61 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 eecddcfc74d..75c114623f2 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;'>@@ -14,14 +14,11 @@ name molden
</span> # as well as checksums should be updated each time this happens.
# See https://trac.macports.org/wiki/PortfileRecipes#stealth-updates
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.7-20210202142200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.8-20210407175900
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dfa7e0421d5b0991bf7f954715423004bb7539a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ebd73e8d95271eb82a1464a7eab28a042662483bbff6e6dcc7db0d1c9b2e4432 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11600372
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Not arm64 compatible because the makefile relies on -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc ppc64 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cb95f8d129d895783b6058e616cf8cc125794023 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4dfbf6524b60112afb5720cba3c200a07a0f57b5d190e05ec14cceae1edf5782 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13850111
</span>
set version_number [lindex [split ${version} -] 0]
set branch [join [lrange [split ${version_number} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +77,7 @@ compilers.setup require_fortran -gcc10
</span> minimum_xcodeversions {9 3.1}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Delete compiled objects which were included in the 6.7-20210202142200 distfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete ELF executables which were included in the 6.8-20210407175900 distfile.
</span> # This problem has been reported to the developer by email; no response yet.
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 029d47dba1e..871d5f21ba4 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,8 @@
</span> The lack of a PREFIX or X11 path variable, the problems with the install
target, and the duplicate lines in the Darwin section have been reported
to the developer by email.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2021-01-28 08:05:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2021-03-16 01:24:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2021-04-07 13:48:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2021-04-25 10:47:53.000000000 -0500
</span> @@ -16,7 +16,7 @@
CC = cc
LIBS = -lX11 -lm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,53 +12,7 @@ to the developer by email.
</span> ARCH := $(shell getconf LONG_BIT)
AFLAG= -m$(ARCH)
EXTEN=
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,10 +34,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(os), Ubuntu)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTEN = exten
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTENZ = exten2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBSG = -L$(PREFIX)/lib -lGLU -lGL -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(os), Debian)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBSG = -L/usr/lib/X11 -lGLU -lGL -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBSG = -L$(PREFIX)/lib -lGLU -lGL -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- choosefc := 'yes'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,29 +91,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(uname), Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--comgcc := $(shell gcc --version | grep 5.4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- comgcc := $(shell gcc --version | grep 6.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- comgcc := $(shell gcc --version | grep 7.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- comgcc := $(shell gcc --version | grep 9.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# EXTRAZ = -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXTRAZ = -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXTRAZ = -Wno-implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXT = ${EXTRAZ}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS = -g ${AFLAG}
</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;'>-+LIBS = -L$(PREFIX)/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(AFLAG),"-m64")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS = -L/usr/X11R6/lib64 -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = -L$(PREFIX)/lib64 -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDR = ${FC} -g ${AFLAG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS = ${AFLAG} ${EXTRAZ} -c -g -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS = ${AFLAG} ${EXTRAZ} -c -g -I$(PREFIX)/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(os), Debian)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = ${AFLAG} ${EXTRAZ} -c -I/usr/include/X11 -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = -L/usr/lib/X11 -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,15 +115,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,15 +131,11 @@
</span> # Mac OS X g77
#
CC=cc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,14 +24,14 @@ to the developer by email.
</span> FFLAGS=-O3 -funroll-loops
-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-implicit-function-declaration -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
</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-implicit-function-declaration -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
</span> LDR = ${FC}
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -270,7 +250,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,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;'>@@ -86,7 +40,7 @@ to the developer by email.
</span> #
# on linux :
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -363,7 +343,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,7 +359,7 @@
</span> endif
exten2:
</pre><pre style='margin:0'>
</pre>