[127154] trunk/dports/science/rasmol

[ryandesign at macports.org]

Revision: 127154
          https://trac.macports.org/changeset/127154
Author:   ryandesign at macports.org
Date:     2014-10-21 19:19:00 -0700 (Tue, 21 Oct 2014)
Log Message:
-----------
rasmol: rewrite the patch so that it can be applied in all cases, rather than being conditional on the build_arch

Modified Paths:
--------------
    trunk/dports/science/rasmol/Portfile

Added Paths:
-----------
    trunk/dports/science/rasmol/files/patch-rasmol.h.diff

Removed 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	2014-10-22 02:14:55 UTC (rev 127153)
+++ trunk/dports/science/rasmol/Portfile	2014-10-22 02:19:00 UTC (rev 127154)
@@ -22,10 +22,8 @@
 depends_lib         port:xorg-libXi
 
 patchfiles          patch-Imakefile.diff \
-                    rasmol.h.diff
-if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
-    patchfiles-append longlong.diff
-}
+                    patch-rasmol.h.diff
+
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Imakefile
 }

Deleted: trunk/dports/science/rasmol/files/longlong.diff
===================================================================
--- trunk/dports/science/rasmol/files/longlong.diff	2014-10-22 02:14:55 UTC (rev 127153)
+++ trunk/dports/science/rasmol/files/longlong.diff	2014-10-22 02:19:00 UTC (rev 127154)
@@ -1,10 +0,0 @@
---- 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;

Copied: trunk/dports/science/rasmol/files/patch-rasmol.h.diff (from rev 126429, trunk/dports/science/rasmol/files/rasmol.h.diff)
===================================================================
--- trunk/dports/science/rasmol/files/patch-rasmol.h.diff	                        (rev 0)
+++ trunk/dports/science/rasmol/files/patch-rasmol.h.diff	2014-10-22 02:19:00 UTC (rev 127154)
@@ -0,0 +1,44 @@
+--- rasmol.h.orig	2008-03-22 14:23:10.000000000 -0500
++++ rasmol.h	2014-10-09 23:52:00.000000000 -0500
+@@ -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 */
+ 
+ 
+ /*========================*/
+@@ -198,6 +198,9 @@
+ typedef char Char;
+ #endif
+ 
++#ifdef __LP64__
++#define _LONGLONG
++#endif
+ #ifdef _LONGLONG
+ typedef unsigned int Card;
+ typedef int Long;

Deleted: trunk/dports/science/rasmol/files/rasmol.h.diff
===================================================================
--- trunk/dports/science/rasmol/files/rasmol.h.diff	2014-10-22 02:14:55 UTC (rev 127153)
+++ trunk/dports/science/rasmol/files/rasmol.h.diff	2014-10-22 02:19:00 UTC (rev 127154)
@@ -1,34 +0,0 @@
---- 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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141021/f6761770/attachment.html>