diff --git a/biology/molden/Makefile b/biology/molden/Makefile index 99d618f00a99..6cebb3bd3d3e 100644 --- a/biology/molden/Makefile +++ b/biology/molden/Makefile @@ -1,77 +1,77 @@ 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 COMMENT= Display molecular orbitals and electron densities in 2D and 3D LICENSE= Molden LICENSE_NAME= Molden License LICENSE_FILE= ${WRKSRC}/CopyRight LICENSE_PERMS= auto-accept dist-mirror pkg-mirror # free for academic, non profit use BUILD_DEPENDS= makedepend:devel/makedepend USES= fortran gl gmake xorg USE_XORG= x11 xmu USE_GL= gl glu MAKEFILE= makefile CFLAGS+= -D${OPSYS:tu} -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 \ -I${LOCALBASE}/include -Wno-return-type PORTDOCS= * PORTDATA= * PLIST_FILES= bin/ambfor \ bin/ambmd \ bin/gmolden \ bin/molden \ bin/surf PORTSCOUT= limit:^5\.0\. OPTIONS_DEFINE= DATA DOCS OPTIONS_DEFAULT= DATA post-extract: # remove object modules @${FIND} ${WRKSRC} -name "*.o" | ${XARGS} ${RM} # remove pre-built executables @${RM} ${WRKSRC}/bin/* post-configure: @${ECHO_MSG} "********************" @${ECHO_MSG} "** If you want to use a larger MOLDEN," @${ECHO_MSG} "** edit change_parameter.sh and run it," @${ECHO_MSG} "** before \'make build\'." @${ECHO_MSG} "********************" do-install: .for e in molden gmolden ambfor ambmd surf ${INSTALL_PROGRAM} ${WRKSRC}/bin/${e} ${STAGEDIR}${PREFIX}/bin .endfor do-install-DATA-on: @${MKDIR} ${STAGEDIR}${DATADIR}/test (cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/test) ${MKDIR} ${STAGEDIR}${DATADIR}/utils (cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils) do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include .if ${GCC_DEFAULT} >= 10 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(4)/REAL(4)). # in theory, this should set FCFLAGS, but the port does not conform FFLAGS+= -fallow-argument-mismatch .endif .include 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,41 +1,48 @@ - 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 EXT = ${EXTRAZ} endif -FFLAGS = -g ${AFLAG} +FFLAGS += -g ${AFLAG} 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} -FFLAGS=-O3 -funroll-loops +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 - $(MAKE) -C src/ambfor FC=${FC} LDR="${LDR}" EXT="${EXT}" + $(MAKE) -C src/ambfor FC=${FC} LDR="${LDR}" EXT="${EXT}" FFLAGS="$(FFLAGS)" mv src/ambfor/ambfor bin/ambfor ambfor/ambmd: src/ambfor/*.f src/ambfor/*.c - $(MAKE) -C src/ambfor ambmd FC=${FC} LDR="${LDR}" EXT="${EXT}" + $(MAKE) -C src/ambfor ambmd FC=${FC} LDR="${LDR}" EXT="${EXT}" FFLAGS="$(FFLAGS)" FFLAGS="$(FFLAGS)" 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