[60819] trunk/dports/science/rasmol
jmr at macports.org
jmr at macports.org
Tue Nov 24 19:40:15 PST 2009
Revision: 60819
http://trac.macports.org/changeset/60819
Author: jmr at macports.org
Date: 2009-11-24 19:40:14 -0800 (Tue, 24 Nov 2009)
Log Message:
-----------
rasmol: update to 2.7.4.2
Modified Paths:
--------------
trunk/dports/science/rasmol/Portfile
trunk/dports/science/rasmol/files/patch-Imakefile.diff
Added Paths:
-----------
trunk/dports/science/rasmol/files/longlong.diff
trunk/dports/science/rasmol/files/rasmol.h.diff
Modified: trunk/dports/science/rasmol/Portfile
===================================================================
--- trunk/dports/science/rasmol/Portfile 2009-11-25 00:54:26 UTC (rev 60818)
+++ trunk/dports/science/rasmol/Portfile 2009-11-25 03:40:14 UTC (rev 60819)
@@ -3,33 +3,56 @@
PortSystem 1.0
name rasmol
-version 2.7.1.1
-revision 3
+version 2.7.4.2
+set releasedate 10Apr08
description Molecular graphics visualisation tool
categories science graphics
platforms darwin
maintainers nomaintainer
+license GPLv2/RASLIC
+homepage http://www.rasmol.org/
+
distname RasMol_${version}
-master_sites http://www.bernstein-plus-sons.com/software/
-checksums md5 0d5c99eeda079d8cbf413944d284740b
-depends_build port:imake
+master_sites ${homepage}software/ \
+ http://www.bernstein-plus-sons.com/software/
+checksums md5 80e4514c2522101a65fa109b85f748d5 \
+ sha1 2e8d15f430971379ad5d1930f3ecd4c0f7ede3f5 \
+ rmd160 c8480e36ca758601cc2341049ff2ca72ee64c629
+
depends_lib port:xorg-libXi
-patchfiles patch-Imakefile.diff
-post-patch { reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Imakefile }
-worksrcdir ${distname}/src
-configure.cmd xmkmf
-configure.pre_args
+
+patchfiles patch-Imakefile.diff \
+ rasmol.h.diff
+if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+ patchfiles-append longlong.diff
+}
+post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Imakefile
+}
+
+worksrcdir ${distname}_${releasedate}/src
+use_xmkmf yes
build.target rasmol
-destroot { xinstall -d ${destroot}${prefix}/share/man/man1
- xinstall -W ${workpath}/${distname} doc/rasmol.1.gz ${destroot}${prefix}/share/man/man1
- xinstall -W ${workpath}/${distname} src/rasmol ${destroot}${prefix}/bin
- xinstall -d ${destroot}${prefix}/lib/rasmol
- xinstall -W ${workpath}/${distname} doc/rasmol.hlp ${destroot}${prefix}/lib/rasmol
- file copy ${workpath}/${distname}/data ${destroot}${prefix}/lib/rasmol
+destroot {
+ xinstall -W ${worksrcpath}/../doc rasmol.1.gz ${destroot}${prefix}/share/man/man1
+ xinstall -W ${worksrcpath} rasmol ${destroot}${prefix}/bin
+ xinstall -d ${destroot}${prefix}/share/${name}
+ delete ${worksrcpath}/../data/CVS
+ copy ${worksrcpath}/../data ${destroot}${prefix}/share/${name}
+ xinstall -d ${destroot}${prefix}/share/doc/${name}
+ delete ${worksrcpath}/../ChangeLog/CVS
+ delete ${worksrcpath}/../html_graphics/CVS
+ foreach f {ChangeLog ChangeLog.html ChangeLog.txt GPL NOTICE PROJECTS RASLIC README.html README.shtml README.txt TODO.html TODO.txt history.html html_graphics} {
+ copy ${worksrcpath}/../${f} ${destroot}${prefix}/share/doc/${name}
+ }
+ foreach f {Licenses.txt NOTICE.html manualA4.pdf.gz manualUS.pdf.gz rasmol.doc rasmol.html refcardA4.pdf.gz refcardUS.pdf.gz} {
+ copy ${worksrcpath}/../doc/${f} ${destroot}${prefix}/share/doc/${name}
+ }
+ xinstall -W ${worksrcpath}/../doc rasmol.hlp ${destroot}${prefix}/share/${name}
}
long_description \
RasMol is a molecular graphics program intended for the \
visualisation of proteins, nucleic acids and small \
molecules. The program is aimed at display, teaching and \
-generation of publication quality images.
+generation of publication quality images.
Added: trunk/dports/science/rasmol/files/longlong.diff
===================================================================
--- trunk/dports/science/rasmol/files/longlong.diff (rev 0)
+++ trunk/dports/science/rasmol/files/longlong.diff 2009-11-25 03:40:14 UTC (rev 60819)
@@ -0,0 +1,10 @@
+--- rasmol.h.orig 2009-11-25 13:03:12.000000000 +1100
++++ rasmol.h 2009-11-25 13:07:29.000000000 +1100
+@@ -198,6 +198,7 @@
+ typedef char Char;
+ #endif
+
++#define _LONGLONG
+ #ifdef _LONGLONG
+ typedef unsigned int Card;
+ typedef int Long;
Modified: trunk/dports/science/rasmol/files/patch-Imakefile.diff
===================================================================
--- trunk/dports/science/rasmol/files/patch-Imakefile.diff 2009-11-25 00:54:26 UTC (rev 60818)
+++ trunk/dports/science/rasmol/files/patch-Imakefile.diff 2009-11-25 03:40:14 UTC (rev 60819)
@@ -1,20 +1,53 @@
- diff -ru Imakefile RasMol_2.7.1.1-patched/src/Imakefile
---- Imakefile Fri Jan 5 06:56:41 2001
-+++ Imakefile Sat Apr 21 20:59:07 2001
-@@ -58,13 +58,13 @@
- # Herbert J. Bernstein, March 1999
- # yaya at bernstein-plus-sons.com
+--- Imakefile.orig 2008-03-23 06:23:09.000000000 +1100
++++ Imakefile 2009-11-25 14:27:47.000000000 +1100
+@@ -141,21 +141,14 @@
+ #endif
+ #endif
--# DEPTHDEF = -DTHIRTYTWOBIT
-+DEPTHDEF = -DTHIRTYTWOBIT
- # DEPTHDEF = -DSIXTEENBIT
--DEPTHDEF = -DEIGHTBIT
-+# DEPTHDEF = -DEIGHTBIT
+-# Definitions for CBFLIB
+-#
+-CBFLIB_VERSION = 0.7.9
+-CBFLIB_TARBALL = CBFlib_$(CBFLIB_VERSION).tar.gz
+-CBFLIB_TARBALLDIR = ../
+-CBFLIB_TARBALL_URL = http://www.bernstein-plus-sons.com/software/$(CBFLIB_TARBALL)
+-CBFLIBDIR = $(CBFLIB_TARBALLDIR)/CBFlib_$(CBFLIB_VERSION)
# RasMol's on-line help direcory
# e.g. /usr/local/lib/rasmol/rasmol.hlp
-RASMOLDIR = $(USRLIBDIR)/rasmol/
-+RASMOLDIR = @PREFIX@/lib/rasmol/
++RASMOLDIR = @PREFIX@/share/rasmol/
+ DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
+- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIBDIR)/include
++ -D_USE_RASMOL_H_ $(GUIOPTION)
+ SRCS = rasmol.c rasmol.h molecule.c molecule.h abstree.c abstree.h \
+ cmndline.c cmndline.h command.c command.h tokens.h transfor.c \
+@@ -177,8 +170,7 @@
+ # Additional RS6000 AIX MITSHM Library
+ # LDLIBS = -lm -lXi -lXextSam $(XLIB)
+
+-LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
+- -L$(CBFLIBDIR)/lib -lcbf
++LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS)
+
+
+
+@@ -232,16 +224,6 @@
+ ../doc/rasmol.1: ../doc/rasmol.1.gz
+ gunzip <../doc/rasmol.1.gz > ../doc/rasmol.1
+
+-$(CBFLIBDIR):
+- (cd $(CBFLIB_TARBALLDIR);\
+- wget $(CBFLIB_TARBALL_URL);\
+- gunzip < $(CBFLIB_TARBALL) | tar xvf -)
+-
+-$(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR)
+- (cd $(CBFLIBDIR); make lib/libcbf.a)
+-
+-
+-$(OBJS): $(CBFLIBDIR)/lib/libcbf.a
+
+ gtkwin.c: gtkui.h
+
Added: trunk/dports/science/rasmol/files/rasmol.h.diff
===================================================================
--- trunk/dports/science/rasmol/files/rasmol.h.diff (rev 0)
+++ trunk/dports/science/rasmol/files/rasmol.h.diff 2009-11-25 03:40:14 UTC (rev 60819)
@@ -0,0 +1,34 @@
+--- rasmol.h.orig 2008-03-23 06:23:10.000000000 +1100
++++ rasmol.h 2009-11-25 13:26:27.000000000 +1100
+@@ -83,17 +83,17 @@
+ /* #define X11WIN */ /* X11WIN or GTKWIN defined in Imakefile */
+ #define UNIX
+
+-/* #define DIALBOX */
++#define DIALBOX
+ #ifndef GTKWIN
+ #define SOCKETS
+ #endif
+ #define TERMIOS
+-#define PROFILE
++/*#define PROFILE*/
+ #define MITSHM
+
+-/* #define HAVEZLIB */
+-/* #define HAVELIBJPEG */
+-/* #define HAVELIBPNG */
++#define HAVEZLIB
++#define HAVELIBJPEG
++#define HAVELIBPNG
+
+ /* #define HPUX_LEGACY */ /* define this for old-style hpux select */
+
+@@ -109,7 +109,7 @@
+ /* #define XPROCARCH */
+ #define USE_UNAME
+
+-#define USE_CBFLIB
++/* #define USE_CBFLIB */
+
+
+ /*========================*/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091124/725eaffc/attachment.html>
More information about the macports-changes
mailing list