[117813] trunk/dports/science/ce
mmoll at macports.org
mmoll at macports.org
Thu Mar 13 10:04:32 PDT 2014
Revision: 117813
https://trac.macports.org/changeset/117813
Author: mmoll at macports.org
Date: 2014-03-13 10:04:32 -0700 (Thu, 13 Mar 2014)
Log Message:
-----------
science/ce: use patches instead of reinplace to fix code
Modified Paths:
--------------
trunk/dports/science/ce/Portfile
Added Paths:
-----------
trunk/dports/science/ce/files/patch-Makefiles.diff
trunk/dports/science/ce/files/patch-nonstandardcode.diff
Removed Paths:
-------------
trunk/dports/science/ce/files/patch-Makefile.diff
trunk/dports/science/ce/files/patch-ce.C.diff
trunk/dports/science/ce/files/patch-pom.h.diff
Modified: trunk/dports/science/ce/Portfile
===================================================================
--- trunk/dports/science/ce/Portfile 2014-03-13 16:02:35 UTC (rev 117812)
+++ trunk/dports/science/ce/Portfile 2014-03-13 17:04:32 UTC (rev 117813)
@@ -3,6 +3,7 @@
PortSystem 1.0
name ce
version 2004-07-06
+revision 1
categories science
maintainers mmoll
description Combinatorial Extension (CE) Method for 3D protein \
@@ -16,11 +17,12 @@
sha1 cb1d7507a931e2635f302cad523c3082ba63596b \
rmd160 5475e00ff66d95fbe61e433d85067f5830259d0d
worksrcdir ${name}_distr_${version}
-patchfiles patch-ce.C.diff patch-Makefile.diff patch-pom.h.diff
+#patchfiles patch-ce.C.diff patch-Makefile.diff patch-pom.h.diff
+patchfiles patch-Makefiles.diff patch-nonstandardcode.diff
post-patch {
- reinplace "s|g++|${configure.cxx}|g" ${worksrcpath}/ce/Makefile ${worksrcpath}/pom/Makefile
- reinplace "s|main(int argc|int main(int argc|g" ${worksrcpath}/ce/ce.C ${worksrcpath}/pom/ipdb.C
- reinplace "s|iostream.h|iostream|g" ${worksrcpath}/pom/calc.C
+ reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/ce/Makefile ${worksrcpath}/pom/Makefile
+# reinplace "s|main(int argc|int main(int argc|g" ${worksrcpath}/ce/ce.C ${worksrcpath}/pom/ipdb.C
+# reinplace "s|iostream.h|iostream|g" ${worksrcpath}/pom/calc.C
}
use_configure no
destroot.env-append PREFIX=${prefix}
Deleted: trunk/dports/science/ce/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/ce/files/patch-Makefile.diff 2014-03-13 16:02:35 UTC (rev 117812)
+++ trunk/dports/science/ce/files/patch-Makefile.diff 2014-03-13 17:04:32 UTC (rev 117813)
@@ -1,16 +0,0 @@
---- Makefile.orig 2000-05-25 20:26:03.000000000 -0500
-+++ Makefile 2010-01-13 08:49:40.000000000 -0600
-@@ -1,4 +1,4 @@
--all: make_pom make_ce make_copy
-+all: make_pom make_ce
-
- make_ce:
- $(MAKE) -C ce
-@@ -16,3 +16,7 @@
- use_exe_sgi:
- cp ce/ce_sgi ./CE
- cp pom/mkDB_sgi pom/mkDB
-+
-+install:
-+ cp ce/ce ${DESTDIR}/${PREFIX}/bin/ce
-+ cp pom/mkDB ${DESTDIR}/${PREFIX}/bin/mkDB
Added: trunk/dports/science/ce/files/patch-Makefiles.diff
===================================================================
--- trunk/dports/science/ce/files/patch-Makefiles.diff (rev 0)
+++ trunk/dports/science/ce/files/patch-Makefiles.diff 2014-03-13 17:04:32 UTC (rev 117813)
@@ -0,0 +1,38 @@
+--- Makefile.orig 2000-05-25 20:26:03.000000000 -0500
++++ Makefile 2010-01-13 08:49:40.000000000 -0600
+@@ -1,4 +1,4 @@
+-all: make_pom make_ce make_copy
++all: make_pom make_ce
+
+ make_ce:
+ $(MAKE) -C ce
+@@ -16,3 +16,7 @@
+ use_exe_sgi:
+ cp ce/ce_sgi ./CE
+ cp pom/mkDB_sgi pom/mkDB
++
++install:
++ cp ce/ce ${DESTDIR}/${PREFIX}/bin/ce
++ cp pom/mkDB ${DESTDIR}/${PREFIX}/bin/mkDB
+--- ce/Makefile.orig 2014-03-13 11:48:06.000000000 -0500
++++ ce/Makefile 2014-03-13 11:52:06.000000000 -0500
+@@ -7,7 +7,7 @@
+ LINTFILES=$(SOURCES:.C=.ln)
+ INCLUDE_DIR=
+
+-CC = g++ ${INCLUDE_DIR} -DREAD_WRITE
++CC = @CXX@ ${INCLUDE_DIR} -DREAD_WRITE
+ CFLAGS = -DFUNCPROTO
+
+
+--- pom/Makefile.orig 2014-03-13 11:49:41.000000000 -0500
++++ pom/Makefile 2014-03-13 11:52:06.000000000 -0500
+@@ -23,7 +23,7 @@
+ calc.h \
+ linkedid.h
+
+-CC = g++
++CC = @CXX@
+
+ MKOBJS = $(MKSRCS:.C=.o)
+
Deleted: trunk/dports/science/ce/files/patch-ce.C.diff
===================================================================
--- trunk/dports/science/ce/files/patch-ce.C.diff 2014-03-13 16:02:35 UTC (rev 117812)
+++ trunk/dports/science/ce/files/patch-ce.C.diff 2014-03-13 17:04:32 UTC (rev 117813)
@@ -1,20 +0,0 @@
---- ce/ce.C.orig 2003-03-13 18:42:38.000000000 -0600
-+++ ce/ce.C 2010-01-07 12:12:40.000000000 -0600
-@@ -79,7 +79,7 @@
- char *user_file1, *entity_id1;
- setText(&user_file1, pdb_file1);
-
-- setText(&mkdb_command, "pom/mkDB");
-+ setText(&mkdb_command, "mkDB");
- addText(&mkdb_command, " scratch ");
- addText(&mkdb_command, db_tmp_path);
- addText(&mkdb_command, " ");
-@@ -96,7 +96,7 @@
- setText(&user_file2, pdb_file2);
-
-
-- setText(&mkdb_command, "pom/mkDB");
-+ setText(&mkdb_command, "mkDB");
- addText(&mkdb_command, " scratch ");
- addText(&mkdb_command, db_tmp_path);
- addText(&mkdb_command, " ");
Added: trunk/dports/science/ce/files/patch-nonstandardcode.diff
===================================================================
--- trunk/dports/science/ce/files/patch-nonstandardcode.diff (rev 0)
+++ trunk/dports/science/ce/files/patch-nonstandardcode.diff 2014-03-13 17:04:32 UTC (rev 117813)
@@ -0,0 +1,90 @@
+--- ce/ce.C.orig 2014-03-13 11:50:40.000000000 -0500
++++ ce/ce.C 2014-03-13 11:52:06.000000000 -0500
+@@ -47,7 +47,7 @@
+ };
+ double vecDist(XYZ *o1, XYZ *e1, XYZ *o2, XYZ *e2);
+ ////////////////////////////////////////////////////////////////////
+-main(int argc, char **argv) {
++int main(int argc, char **argv) {
+ if(argc<2) exit(0);
+
+ CE ce;
+@@ -79,7 +79,7 @@
+ char *user_file1, *entity_id1;
+ setText(&user_file1, pdb_file1);
+
+- setText(&mkdb_command, "pom/mkDB");
++ setText(&mkdb_command, "mkDB");
+ addText(&mkdb_command, " scratch ");
+ addText(&mkdb_command, db_tmp_path);
+ addText(&mkdb_command, " ");
+@@ -96,7 +96,7 @@
+ setText(&user_file2, pdb_file2);
+
+
+- setText(&mkdb_command, "pom/mkDB");
++ setText(&mkdb_command, "mkDB");
+ addText(&mkdb_command, " scratch ");
+ addText(&mkdb_command, db_tmp_path);
+ addText(&mkdb_command, " ");
+--- pom/ipdb.C.orig 2014-03-13 11:50:14.000000000 -0500
++++ pom/ipdb.C 2014-03-13 11:52:06.000000000 -0500
+@@ -2947,7 +2947,7 @@
+ //////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////
+ int main(int, char**, char **env=NULL);
+-main(int argc, char **argv, char **env)
++int main(int argc, char **argv, char **env)
+ {
+
+ Tlpdb tlpdb;
+--- pom/calc.C.orig 2014-03-13 11:50:30.000000000 -0500
++++ pom/calc.C 2014-03-13 11:52:06.000000000 -0500
+@@ -1,5 +1,5 @@
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ #include "contour.h"
+ #include "calc.h"
+
+--- pom/pom.h.orig 2000-05-25 16:38:55.000000000 -0500
++++ pom/pom.h 2010-01-07 12:04:24.000000000 -0600
+@@ -410,11 +410,11 @@
+ };
+ ////////////////////////////////////////////////////////////////////
+ class Entities {
+- friend IEntity;
+- friend ISubentity;
+- friend IAtom;
+- friend IMonomer;
+- friend IBond;
++ friend class IEntity;
++ friend class ISubentity;
++ friend class IAtom;
++ friend class IMonomer;
++ friend class IBond;
+ public:
+ static DB *db_default;
+ DB *db;
+@@ -502,7 +502,7 @@
+ };
+ ////////////////////////////////////////////////////////////////////
+ class ISubentity {
+- friend IMonomer;
++ friend class IMonomer;
+ int iE;
+ int iS;
+ int iM;
+@@ -576,9 +576,9 @@
+ };
+ ////////////////////////////////////////////////////////////////////
+ class IAtom {
+- friend ISubentity;
+- friend IMonomer;
+- friend IBond;
++ friend class ISubentity;
++ friend class IMonomer;
++ friend class IBond;
+ int iE;
+ int iS;
+ int iA;
Deleted: trunk/dports/science/ce/files/patch-pom.h.diff
===================================================================
--- trunk/dports/science/ce/files/patch-pom.h.diff 2014-03-13 16:02:35 UTC (rev 117812)
+++ trunk/dports/science/ce/files/patch-pom.h.diff 2014-03-13 17:04:32 UTC (rev 117813)
@@ -1,41 +0,0 @@
---- pom/pom.h.orig 2000-05-25 16:38:55.000000000 -0500
-+++ pom/pom.h 2010-01-07 12:04:24.000000000 -0600
-@@ -410,11 +410,11 @@
- };
- ////////////////////////////////////////////////////////////////////
- class Entities {
-- friend IEntity;
-- friend ISubentity;
-- friend IAtom;
-- friend IMonomer;
-- friend IBond;
-+ friend class IEntity;
-+ friend class ISubentity;
-+ friend class IAtom;
-+ friend class IMonomer;
-+ friend class IBond;
- public:
- static DB *db_default;
- DB *db;
-@@ -502,7 +502,7 @@
- };
- ////////////////////////////////////////////////////////////////////
- class ISubentity {
-- friend IMonomer;
-+ friend class IMonomer;
- int iE;
- int iS;
- int iM;
-@@ -576,9 +576,9 @@
- };
- ////////////////////////////////////////////////////////////////////
- class IAtom {
-- friend ISubentity;
-- friend IMonomer;
-- friend IBond;
-+ friend class ISubentity;
-+ friend class IMonomer;
-+ friend class IBond;
- int iE;
- int iS;
- int iA;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140313/00860cbe/attachment.html>
More information about the macports-changes
mailing list