[143588] trunk/dports/science/molden
ryandesign at macports.org
ryandesign at macports.org
Tue Dec 15 06:34:08 PST 2015
Revision: 143588
https://trac.macports.org/changeset/143588
Author: ryandesign at macports.org
Date: 2015-12-15 06:34:08 -0800 (Tue, 15 Dec 2015)
Log Message:
-----------
molden: update to 5.4-20151211134500 (#50034)
Modified Paths:
--------------
trunk/dports/science/molden/Portfile
trunk/dports/science/molden/files/patch-makefile.diff
Modified: trunk/dports/science/molden/Portfile
===================================================================
--- trunk/dports/science/molden/Portfile 2015-12-15 13:18:03 UTC (rev 143587)
+++ trunk/dports/science/molden/Portfile 2015-12-15 14:34:08 UTC (rev 143588)
@@ -10,7 +10,7 @@
PortGroup compilers 1.0
name molden
-version 5.4-20151203142800
+version 5.4-20151211134500
set version_number [lindex [split ${version} -] 0]
set branch [join [lrange [split ${version_number} .] 0 1] .]
categories science graphics chemistry
@@ -22,8 +22,8 @@
dist_subdir ${name}/${version}
master_sites ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
-checksums rmd160 baee668b1dd06532b5dc70182c85675724e6c5b2 \
- sha256 deecc785363015f556b899af17f38766806e53fefee9322bed6fe997aba6dcf7
+checksums rmd160 24de5a26229bb955d64f1aa279de30e37b424828 \
+ sha256 4b298b816f6f91b68e2a1a0149d8bc10d1c9fe7e497ed51cbbb9258119ba5b9e
description Molecular graphics visualisation tool
long_description Molden is a package for displaying Molecular Density from \
Modified: trunk/dports/science/molden/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/molden/files/patch-makefile.diff 2015-12-15 13:18:03 UTC (rev 143587)
+++ trunk/dports/science/molden/files/patch-makefile.diff 2015-12-15 14:34:08 UTC (rev 143588)
@@ -1,18 +1,18 @@
---- makefile.orig 2015-05-02 14:48:14.000000000 -0500
-+++ makefile 2015-05-06 02:12:58.000000000 -0500
-@@ -17,7 +17,7 @@
- FC = gfortran
+--- makefile.orig 2015-12-11 07:35:45.000000000 -0600
++++ makefile 2015-12-15 08:30:25.000000000 -0600
+@@ -16,7 +16,7 @@
+ CC = cc
LIBS = -lX11 -lm
LDR = ${FC}
-LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
+LIBSG = -L at PREFIX@/lib -lGLU -lGL -lXmu -lX11 -lm
-
- empty :=
- choosefc :=
-@@ -28,10 +28,10 @@
- ifeq ($(uname), Linux)
+ ARCH := $(shell getconf LONG_BIT)
+ AFLAG= -m$(ARCH)
+ EXTEN=
+@@ -31,10 +31,10 @@
os := $(shell head -n 1 /etc/issue | cut -d" " -f1)
ifeq ($(os), Ubuntu)
+ EXTEN = exten
- LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
+ LIBSG = -L at PREFIX@/lib -lGLU -lGL -lX11 -lm
endif
@@ -22,23 +22,30 @@
endif
choosefc := 'yes'
-@@ -83,13 +83,9 @@
+@@ -88,19 +88,12 @@
ifeq ($(uname), Linux)
- FFLAGS =
+ FFLAGS = -g ${AFLAG}
-LIBS = -L/usr/X11R6/lib -lX11 -lm
+LIBS = -L at PREFIX@/lib -lX11 -lm
- LDR = ${FC}
--CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+ ifeq ($(AFLAG),"-m64")
+-LIBS = -L/usr/X11R6/lib64 -lX11 -lm
++LIBS = -L at PREFIX@/lib64 -lX11 -lm
+ endif
+ LDR = ${FC} -g ${AFLAG}
+-CFLAGS = ${AFLAG} -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
- ifeq ($(os), Debian)
-- CFLAGS = -c -I/usr/include/X11 -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+- CFLAGS = ${AFLAG} -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 = -c -I at PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
++CFLAGS = ${AFLAG} -c -I at PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
ifeq ($(os), FreeBSD)
CFLAGS = ${CFLAGS} -DFREEBSD
endif
-@@ -104,11 +100,11 @@
+@@ -111,11 +104,11 @@
# Mac OS X g77
#
CC=cc
@@ -53,7 +60,7 @@
LDR = ${FC}
endif
-@@ -239,7 +235,7 @@
+@@ -246,7 +239,7 @@
# and the full opengl version of molden 'gmolden', (does not need glut)
# (make gmolden)
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151215/12c29df3/attachment.html>
More information about the macports-changes
mailing list