<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/2a765437fbb511c7b25e93db1e3130e28fd458a4">https://github.com/macports/macports-ports/commit/2a765437fbb511c7b25e93db1e3130e28fd458a4</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 2a765437fbb molden: Update to 6.4-20200625124000 and build all
</span>2a765437fbb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2a765437fbb511c7b25e93db1e3130e28fd458a4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 29 13:11:20 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> molden: Update to 6.4-20200625124000 and build all
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now build and install all targets including gmolden, not just the molden
</span><span style='display:block; white-space:pre;color:#404040;'> target.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove the opengl variant because the moldenogl target has been removed
</span><span style='display:block; white-space:pre;color:#404040;'> from the makefile. It's still in makefile.old so it could possibly be
</span><span style='display:block; white-space:pre;color:#404040;'> brought back, but moldenogl seems to be superseded by gmolden.
</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/51722
</span>---
science/molden/Portfile | 59 +++++++++++++++++--------------
science/molden/files/no-symver.patch | 35 +++++++++++++++++++
science/molden/files/patch-makefile.diff | 60 ++++++++++++++++++++++----------
3 files changed, 109 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 b093f619a5c..f4e3292d1cf 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,18 +14,19 @@ 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.3-20200416125300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.4-20200625124000
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b552f06daed151f936764ff3e4447da68cb37d46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 01b3018942397a07ad255cf1745675fc3be52096b71dc2d8b0ce71f1af09110b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6544338
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 749fe151625bc78d691c9e6a9abefc9e5603c86a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 36f5d653db6d5cfb01030a842289e56ffd639f919bfcb1221d9a8e85fd4c7f96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6119574
</span>
set version_number [lindex [split ${version} -] 0]
set branch [join [lrange [split ${version_number} .] 0 1] .]
categories science graphics chemistry
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span> license Restrictive Noncommercial Nomirror
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.cmbi.ru.nl/molden/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://cheminf.cmbi.ru.nl/molden/
</span> distname ${name}${version_number}
worksrcdir ${name}${branch}
dist_subdir ${name}/${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +37,7 @@ long_description Molden is a package for displaying Molecular Density from \
</span> the Ab Initio packages GAMESS-UK, GAMESS-US and \
GAUSSIAN and the Semi-Empirical packages Mopac/Ampac, it \
also supports a number of other programs via the Molden Format. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- In order to keep up support for Molden, proof that \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\nIn order to keep up support for Molden, proof that \
</span> it is being used outside the CMBI is required. \
Please register your copy of molden at: \
${homepage}form.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,18 +45,30 @@ long_description Molden is a package for displaying Molecular Density from \
</span> notes "
In order to keep up support for Molden, proof that\
it is being used outside the CMBI is required.\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Please register your copy of molden at:\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\n${homepage}form.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Please register your copy of molden at:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${homepage}form.html
</span> "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:makedepend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libGLU \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXmu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy "group" permission to "others", which is empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse item ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p [file attributes ${item} -permissions]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${item} -permissions [format {0%o} [expr {(${p} >> 3 & 7) + ${p}}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append no-symver.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compilers.choose fc
compilers.setup require_fortran -gcc10
# This should allow gcc10 to work but the port doesn't honor MacPorts flags.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +77,16 @@ compilers.setup require_fortran -gcc10
</span> minimum_xcodeversions {9 3.1}
use_parallel_build yes
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target molden
</span> build.cmd ${prefix}/bin/gmake
pre-build {
build.args CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FC=${configure.fc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FC=${configure.fc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} molden ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span> set docdir ${destroot}${prefix}/share/doc/molden
xinstall -m 0755 -d ${docdir}
xinstall -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,15 +98,6 @@ destroot {
</span> ${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opengl description "Install moldenogl OpenGL helper program" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:freeglut \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target-append moldenogl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} moldenogl ${destroot}${prefix}/bin
</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;'>-
</span> livecheck.type regex
livecheck.url http://www.ryandesign.com/macports/version.php/${name}
livecheck.regex {^(.+)$}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/molden/files/no-symver.patch b/science/molden/files/no-symver.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c9cbe523fe3
</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/no-symver.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</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;'>+<inline asm>:1:1: error: unknown directive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.symver logf,logf@GLIBC_2.2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<inline asm>:2:1: error: unknown directive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.symver powf,powf@GLIBC_2.2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<inline asm>:3:1: error: unknown directive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.symver memcpy,memcpy@GLIBC_2.2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<inline asm>:4:1: error: unknown directive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.symver memmove,memmove@GLIBC_2.2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This problem has been reported to the developer by email.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xwin.c.orig 2020-06-19 07:05:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xwin.c 2020-06-26 11:56:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,16 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define SYMVER "GLIBC_2.2.5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define SYMVER "GLIBC_2.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define USE_OLD_SYM(F,V) __asm__(".symver " #F "," #F "@" V)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-USE_OLD_SYM(logf,SYMVER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-USE_OLD_SYM(powf,SYMVER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-USE_OLD_SYM(memcpy,SYMVER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-USE_OLD_SYM(memmove,SYMVER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//__asm__(".symver memmove,memmove@GLIBC_2.2.5");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef VMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "decw$include:xlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "decw$include:xutil.h"
</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 e78dfcc3e8e..6151947e985 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,11 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2018-11-12 09:16:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2018-11-26 14:42:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The lack of a PREFIX or X11 path variable, the problems with the install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+target, and the duplicate lines in the Darwin section have been reported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to the developer by email.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2020-06-19 07:14:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2020-06-29 11:07:39.000000000 -0500
</span> @@ -16,7 +16,7 @@
CC = cc
LIBS = -lX11 -lm
LDR = ${FC}
-LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBSG = -L@PREFIX@/lib -lGLU -lGL -lXmu -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBSG = -L$(PREFIX)/lib -lGLU -lGL -lXmu -lX11 -lm
</span> ARCH := $(shell getconf LONG_BIT)
AFLAG= -m$(ARCH)
EXTEN=
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,29 +17,40 @@
</span> EXTEN = exten
EXTENZ = exten2
- LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
<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:#e0ffe0;'>++ LIBSG = -L$(PREFIX)/lib -lGLU -lGL -lX11 -lm
</span> endif
ifeq ($(os), Debian)
- LIBSG = -L/usr/lib/X11 -lGLU -lGL -lX11 -lm
<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:#e0ffe0;'>++ LIBSG = -L$(PREFIX)/lib -lGLU -lGL -lX11 -lm
</span> endif
choosefc := 'yes'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,25 +91,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,36 +91,13 @@
</span>
ifeq ($(uname), Linux)
CC = gcc
-comgcc := $(shell gcc --version | grep 5.4)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- comgcc := $(shell gcc --version | grep 6.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- comgcc := $(shell gcc --version | grep 7.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(comgcc), $(empty))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- comgcc := $(shell gcc --version | grep 9.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# EXTRAZ = -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EXTRAZ = -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span> -ifneq ($(comgcc), $(empty))
- EXTRAZ = -Wno-implicit-function-declaration
- EXT = ${EXTRAZ}
-endif
FFLAGS = -g ${AFLAG}
-LIBS = -L/usr/X11R6/lib -lX11 -lm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = -L@PREFIX@/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -L$(PREFIX)/lib -lX11 -lm
</span> ifeq ($(AFLAG),"-m64")
-LIBS = -L/usr/X11R6/lib64 -lX11 -lm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = -L@PREFIX@/lib64 -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -L$(PREFIX)/lib64 -lX11 -lm
</span> endif
LDR = ${FC} -g ${AFLAG}
-CFLAGS = ${AFLAG} ${EXTRAZ} -c -g -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,38 +61,48 @@
</span> - LIBS = -L/usr/X11R6/lib64 -lX11 -lm
- endif
- endif
<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:#e0ffe0;'>++CFLAGS = ${AFLAG} ${EXTRAZ} -c -g -I$(PREFIX)/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
</span> ifeq ($(os), FreeBSD)
CFLAGS = ${CFLAGS} -DFREEBSD
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,15 +108,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,15 +108,15 @@
</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;'>-+CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I@PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I$(PREFIX)/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses
</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;'>-+LIBS = -L@PREFIX@/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+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><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -L$(PREFIX)/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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> EXT= -std=gnu89 -Wno-return-type -DDARWIN ${EXTRAZ}
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
-CFLAGS= -g -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;'>-+LIBS = -L@PREFIX@/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+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><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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -L$(PREFIX)/lib -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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><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
</span> LDR = ${FC}
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,7 +247,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,7 +247,7 @@
</span> # and the full opengl version of molden 'gmolden', (does not need glut)
# (make gmolden)
#
-LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBSOGL = -L@PREFIX@/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBSOGL = -L$(PREFIX)/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
</span> #
# on linux :
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,7 +340,7 @@
</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;'>+ exten2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- utils/register_extension.sh /usr/local/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ utils/register_extension.sh $(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: $(EXTENZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sudo install -t /usr/local/bin -m 755 bin/molden bin/gmolden bin/ambfor bin/ambmd bin/surf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install -m 755 bin/molden bin/gmolden bin/ambfor bin/ambmd bin/surf $(DESTDIR)$(PREFIX)/bin
</span></pre><pre style='margin:0'>
</pre>