Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
molden: Update to 5.7-20170131093400
  • Loading branch information
ryandesign committed Feb 2, 2017
1 parent c2c0a13 commit 6944325
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
6 changes: 3 additions & 3 deletions science/molden/Portfile
Expand Up @@ -9,7 +9,7 @@ PortGroup xcodeversion 1.0
PortGroup compilers 1.0

name molden
version 5.7-20161202092300
version 5.7-20170131093400
set version_number [lindex [split ${version} -] 0]
set branch [join [lrange [split ${version_number} .] 0 1] .]
categories science graphics chemistry
Expand All @@ -24,8 +24,8 @@ master_sites ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
# This project regularly makes "stealth updates". The version (with date)
# as well as checksums should be updated each time this happens.
# See https://trac.macports.org/wiki/PortfileRecipes#stealth-updates
checksums rmd160 d30a3b92c7abab373baa9d084cd747df8d27a538 \
sha256 8c52229f1762e987995c53936f0dc2cfd086277ec777bf9083d76c0bf0483887
checksums rmd160 885a880db878c1ac0f0fba54c82d1b6e7e0f345a \
sha256 5e7b3a8bf9251626d362b1d1dd8e4362054e6bce505c43e10254265857bb6e7d

description Molecular graphics visualisation tool
long_description Molden is a package for displaying Molecular Density from \
Expand Down
26 changes: 16 additions & 10 deletions science/molden/files/patch-makefile.diff
@@ -1,5 +1,5 @@
--- makefile.orig 2015-12-17 06:31:00.000000000 -0600
+++ makefile 2015-12-18 04:59:41.000000000 -0600
--- makefile.orig 2017-01-26 08:47:21.000000000 -0600
+++ makefile 2017-02-02 03:02:58.000000000 -0600
@@ -16,7 +16,7 @@
CC = cc
LIBS = -lX11 -lm
Expand All @@ -9,7 +9,7 @@
ARCH := $(shell getconf LONG_BIT)
AFLAG= -m$(ARCH)
EXTEN=
@@ -33,10 +33,10 @@
@@ -34,10 +34,10 @@
ifeq ($(os), Ubuntu)
EXTEN = exten
EXTENZ = exten2
Expand All @@ -22,9 +22,15 @@
endif

choosefc := 'yes'
@@ -90,19 +90,12 @@
@@ -91,25 +91,13 @@

ifeq ($(uname), Linux)
CC = gcc
-comgcc := $(shell gcc --version | grep 5.4)
-ifneq ($(comgcc), $(empty))
- EXTRAZ = -Wno-implicit-function-declaration
- EXT = ${EXTRAZ}
-endif
FFLAGS = -g ${AFLAG}
-LIBS = -L/usr/X11R6/lib -lX11 -lm
+LIBS = -L@PREFIX@/lib -lX11 -lm
Expand All @@ -33,25 +39,25 @@
+LIBS = -L@PREFIX@/lib64 -lX11 -lm
endif
LDR = ${FC} -g ${AFLAG}
-CFLAGS = ${AFLAG} -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-CFLAGS = ${AFLAG} ${EXTRAZ} -c -g -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
- ifeq ($(os), Debian)
- CFLAGS = ${AFLAG} -c -I/usr/include/X11 -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
- CFLAGS = ${AFLAG} ${EXTRAZ} -c -I/usr/include/X11 -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
- LIBS = -L/usr/lib/X11 -lX11 -lm
- ifeq ($(AFLAG),"-m64")
- LIBS = -L/usr/X11R6/lib64 -lX11 -lm
- endif
- endif
+CFLAGS = ${AFLAG} -c -I@PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+CFLAGS = ${AFLAG} ${EXTRAZ} -c -g -I@PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
ifeq ($(os), FreeBSD)
CFLAGS = ${CFLAGS} -DFREEBSD
endif
@@ -113,11 +106,11 @@
@@ -120,11 +108,11 @@
# Mac OS X g77
#
CC=cc
-CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I@PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
EXT= -std=gnu89 -Wno-return-type -DDARWIN
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
Expand All @@ -60,7 +66,7 @@
LDR = ${FC}
endif

@@ -248,7 +241,7 @@
@@ -255,7 +243,7 @@
# and the full opengl version of molden 'gmolden', (does not need glut)
# (make gmolden)
#
Expand Down

0 comments on commit 6944325

Please sign in to comment.