summaryrefslogtreecommitdiff
path: root/biology/molden
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2022-07-23 11:32:05 -0700
committerYuri Victorovich <yuri@FreeBSD.org>2022-07-23 13:00:53 -0700
commit8dc7394ac87a6e1630ebfc2219f8668fa9b36f40 (patch)
tree1afacb4f373c2e3976376e9953a59edf6a1ca2ff /biology/molden
parentgraphics/mesa-devel: update to 22.1.b.4747 (diff)
biology/molden: Update 6.7 -> 7.1
PR: 265245 Approved by: jmd@ (maintainer)
Diffstat (limited to 'biology/molden')
-rw-r--r--biology/molden/Makefile4
-rw-r--r--biology/molden/distinfo6
-rw-r--r--biology/molden/files/patch-makefile19
3 files changed, 18 insertions, 11 deletions
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index 99d618f00a99..6cebb3bd3d3e 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -1,8 +1,8 @@
PORTNAME= molden
-DISTVERSION= 6.7
+DISTVERSION= 7.1
PORTEPOCH= 1
CATEGORIES= biology
-MASTER_SITES= ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/
+MASTER_SITES= https://ftp.science.ru.nl/Molden/
DISTNAME= ${PORTNAME}${DISTVERSION}
MAINTAINER= jmd@FreeBSD.org
diff --git a/biology/molden/distinfo b/biology/molden/distinfo
index b3c287258481..c661feebb345 100644
--- a/biology/molden/distinfo
+++ b/biology/molden/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639879141
-SHA256 (molden6.7.tar.gz) = ebd73e8d95271eb82a1464a7eab28a042662483bbff6e6dcc7db0d1c9b2e4432
-SIZE (molden6.7.tar.gz) = 11600372
+TIMESTAMP = 1657929531
+SHA256 (molden7.1.tar.gz) = 98a39f0aa1667c14c36f40c0251522984245e5ba282af8fbc8a2f06079e40d43
+SIZE (molden7.1.tar.gz) = 14645590
diff --git a/biology/molden/files/patch-makefile b/biology/molden/files/patch-makefile
index 4a086a6fdd57..b5cba7470955 100644
--- a/biology/molden/files/patch-makefile
+++ b/biology/molden/files/patch-makefile
@@ -1,6 +1,6 @@
- pass supplied FFLAGS to the build
---- makefile.orig 2021-01-28 14:05:10 UTC
+--- makefile.orig 2022-01-21 11:28:48 UTC
+++ makefile
@@ -107,7 +107,7 @@ ifneq ($(comgcc), $(empty))
EXTRAZ = -Wno-implicit-function-declaration
@@ -11,12 +11,13 @@
LIBS = -L/usr/X11R6/lib -lX11 -lm
ifeq ($(AFLAG),"-m64")
LIBS = -L/usr/X11R6/lib64 -lX11 -lm
-@@ -132,11 +132,11 @@ ifeq ($(uname), Darwin)
+@@ -132,12 +132,12 @@ ifeq ($(uname), Darwin)
#
CC=cc
CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -Wno-logical-op-parentheses
--FFLAGS=-O3 -funroll-loops
-+FFLAGS+=-O3 -funroll-loops
+-FFLAGS=-O3 -funroll-loops -fallow-argument-mismatch
++FFLAGS+=-O3 -funroll-loops -fallow-argument-mismatch
+
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}
@@ -24,8 +25,8 @@
+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 -Wno-implicit-function-declaration -Wno-tautological-pointer-compare -Wno-tautological-constant-out-of-range-compare
-@@ -306,11 +306,11 @@ gmolden: $(OBJS) src/mpdum.o src/xwingl.o
+ 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
+@@ -307,16 +307,16 @@ gmolden: $(OBJS) src/mpdum.o src/xwingl.o
mv gmolden bin/gmolden
ambfor/ambfor: src/ambfor/*.f src/ambfor/*.c
@@ -39,3 +40,9 @@
mv src/ambfor/ambmd bin/ambmd
surf/surf: src/surf/*.h src/surf/*.c
+ $(MAKE) -C src/surf depend
+- $(MAKE) -C src/surf EXT="${EXT}"
++ $(MAKE) -C src/surf EXT="${EXT}" FFLAGS="$(FFLAGS)"
+ mv src/surf/surf bin/surf
+
+ # noxwin will not work as long as the old ocglbck calls arent in dummys