1 |
dberkholz 10/04/24 00:02:02 |
2 |
|
3 |
Added: namd-2.7_beta2-gentoo.patch |
4 |
Log: |
5 |
Bump to 2.7_beta2. The previous 2.7 ebuild was actually 2.7 beta 1 but was not named as such, so rename it to allow people to upgrade to beta 2. |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sci-chemistry/namd/files/namd-2.7_beta2-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/namd/files/namd-2.7_beta2-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/namd/files/namd-2.7_beta2-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: namd-2.7_beta2-gentoo.patch |
15 |
=================================================================== |
16 |
diff -ur NAMD_2.7b2_Source.orig//arch/Linux-x86_64.fftw NAMD_2.7b2_Source//arch/Linux-x86_64.fftw |
17 |
--- NAMD_2.7b2_Source.orig//arch/Linux-x86_64.fftw 2010-04-23 14:40:54.566510874 -0500 |
18 |
+++ NAMD_2.7b2_Source//arch/Linux-x86_64.fftw 2010-04-23 14:41:08.106528893 -0500 |
19 |
@@ -1,7 +1,7 @@ |
20 |
|
21 |
-FFTDIR=/Projects/namd2/fftw/linux-x86_64 |
22 |
+FFTDIR=/usr |
23 |
FFTINCL=-I$(FFTDIR)/include |
24 |
-FFTLIB=-L$(FFTDIR)/lib -lsrfftw -lsfftw |
25 |
+FFTLIB=-L$(FFTDIR)/gentoo-libdir -lsrfftw -lsfftw |
26 |
FFTFLAGS=-DNAMD_FFTW |
27 |
FFT=$(FFTINCL) $(FFTFLAGS) |
28 |
|
29 |
diff -ur NAMD_2.7b2_Source.orig//arch/Linux-x86_64.tcl NAMD_2.7b2_Source//arch/Linux-x86_64.tcl |
30 |
--- NAMD_2.7b2_Source.orig//arch/Linux-x86_64.tcl 2010-04-23 14:40:54.566510874 -0500 |
31 |
+++ NAMD_2.7b2_Source//arch/Linux-x86_64.tcl 2010-04-23 14:41:08.106528893 -0500 |
32 |
@@ -1,7 +1,7 @@ |
33 |
|
34 |
-TCLDIR=/Projects/namd2/tcl/linux-x86_64 |
35 |
+TCLDIR=/usr |
36 |
TCLINCL=-I$(TCLDIR)/include |
37 |
-TCLLIB=-L$(TCLDIR)/lib -ltcl8.3 -ldl |
38 |
+TCLLIB=-L$(TCLDIR)/gentoo-libdir -ltcl8.5 -ldl |
39 |
TCLFLAGS=-DNAMD_TCL |
40 |
TCL=$(TCLINCL) $(TCLFLAGS) |
41 |
|
42 |
diff -ur NAMD_2.7b2_Source.orig//Make.charm NAMD_2.7b2_Source//Make.charm |
43 |
--- NAMD_2.7b2_Source.orig//Make.charm 2010-04-23 14:40:54.556517020 -0500 |
44 |
+++ NAMD_2.7b2_Source//Make.charm 2010-04-23 14:42:16.026530011 -0500 |
45 |
@@ -2,5 +2,5 @@ |
46 |
# The config script will override this setting if there is a directory |
47 |
# called charm-6.1 or charm in the NAMD base directory. |
48 |
|
49 |
-CHARMBASE = /Projects/namd2/charm-6.1.3 |
50 |
+CHARMBASE = /usr/include/charm-6.1.3 |
51 |
|
52 |
Only in NAMD_2.7b2_Source/: Make.charm.~1~ |
53 |
Only in NAMD_2.7b2_Source/: Make.charm.porig |
54 |
diff -ur NAMD_2.7b2_Source.orig//Makefile NAMD_2.7b2_Source//Makefile |
55 |
--- NAMD_2.7b2_Source.orig//Makefile 2010-04-23 14:40:54.556517020 -0500 |
56 |
+++ NAMD_2.7b2_Source//Makefile 2010-04-23 14:42:59.446523306 -0500 |
57 |
@@ -300,10 +300,10 @@ |
58 |
$(DSTDIR)/stringhash.o |
59 |
|
60 |
# definitions for Charm routines |
61 |
-CHARMC = $(CHARM)/bin/charmc |
62 |
-CHARMXI = $(CHARM)/bin/charmc |
63 |
-CHARMINC = $(CHARM)/include $(COPTD)CMK_OPTIMIZE=1 |
64 |
-CHARMLIB = $(CHARM)/lib |
65 |
+CHARMC = /usr/bin/charmc |
66 |
+CHARMXI = /usr/bin/charmc |
67 |
+CHARMINC = /usr/include/gentoo-charm $(COPTD)CMK_OPTIMIZE=1 |
68 |
+CHARMLIB = /usr/gentoo-libdir |
69 |
|
70 |
# Libraries we may have changed |
71 |
LIBS = $(CUDAOBJS) $(PLUGINLIB) $(DPMTALIBS) $(DPMELIBS) $(TCLDLL) |
72 |
@@ -323,7 +323,7 @@ |
73 |
|
74 |
# Add new executables here. |
75 |
|
76 |
-BINARIES = namd2 psfgen charmrun flipdcd flipbinpdb |
77 |
+BINARIES = namd2 psfgen flipdcd flipbinpdb |
78 |
|
79 |
# This should be rebuilt at every compile, but not on Win32. |
80 |
BUILDINFO = $(DSTDIR)/buildinfo |
81 |
@@ -354,9 +354,6 @@ |
82 |
$(CHARMOPTS) \ |
83 |
-lm -o namd2 |
84 |
|
85 |
-charmrun: $(CHARM)/bin/charmrun # XXX |
86 |
- $(COPY) $(CHARM)/bin/charmrun $@ |
87 |
- |
88 |
$(LIBCUDARTSO): |
89 |
if [ -r $(CUDADIR)/lib64/$(LIBCUDARTSO) ]; then \ |
90 |
$(COPY) $(CUDADIR)/lib64/$(LIBCUDARTSO) $@; \ |
91 |
@@ -364,10 +361,6 @@ |
92 |
$(COPY) $(CUDADIR)/lib/$(LIBCUDARTSO) $@; \ |
93 |
fi |
94 |
|
95 |
-WINDOWSBINARIES = namd2.exe psfgen.exe |
96 |
-# WINDOWSBINARIES = namd2.exe psfgen.exe charmd.exe charmd_faceless.exe charmrun.exe |
97 |
-windowsbinaries: $(WINDOWSBINARIES) |
98 |
- |
99 |
namd2.exe: $(INCDIR) $(DSTDIR) $(OBJS) $(LIBS) $(TCLDLL) |
100 |
$(MAKEBUILDINFO) |
101 |
$(CHARMC) -verbose \ |
102 |
@@ -390,9 +383,6 @@ |
103 |
charmd_faceless.exe: |
104 |
$(COPY) $(CHARM)/bin/charmd_faceless.exe charmd_faceless.exe |
105 |
|
106 |
-charmrun.exe: |
107 |
- $(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe |
108 |
- |
109 |
psfgen: $(DSTDIR) $(SBOBJS) $(PLUGINOBJS) |
110 |
$(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
111 |
|
112 |
@@ -716,9 +706,7 @@ |
113 |
|
114 |
DOC_FILES = README.txt announce.txt license.txt notes.txt |
115 |
|
116 |
-RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb psfgen charmrun namd2 |
117 |
- |
118 |
-WINDOWS_RELEASE_FILES = $(WINDOWSBINARIES) $(TCLDLL) |
119 |
+RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb psfgen namd2 |
120 |
|
121 |
release: all |
122 |
$(ECHO) Creating release $(RELEASE_DIR_NAME) |
123 |
@@ -727,17 +715,9 @@ |
124 |
for f in $(DOC_FILES); do cp .rootdir/$$f $(RELEASE_DIR_NAME); done |
125 |
cp -r .rootdir/lib $(RELEASE_DIR_NAME) |
126 |
/bin/rm -rf $(RELEASE_DIR_NAME)/lib/CVS $(RELEASE_DIR_NAME)/lib/*/CVS |
127 |
- if [ -r $(CHARM)/bin/charmd ]; then \ |
128 |
- $(COPY) $(CHARM)/bin/charmd $(RELEASE_DIR_NAME); \ |
129 |
- fi |
130 |
- if [ -r $(CHARM)/bin/charmd_faceless ]; then \ |
131 |
- $(COPY) $(CHARM)/bin/charmd_faceless $(RELEASE_DIR_NAME); \ |
132 |
- fi |
133 |
chmod -R a+rX $(RELEASE_DIR_NAME) |
134 |
tar cf $(RELEASE_DIR_NAME).tar $(RELEASE_DIR_NAME) |
135 |
gzip $(RELEASE_DIR_NAME).tar |
136 |
- echo $(CHARM) |
137 |
- ls -l $(CHARM)/lib |
138 |
-for f in $(RELEASE_FILES); do echo $$f; $(LDD) $$f; done |
139 |
|
140 |
winrelease: winall |
141 |
Only in NAMD_2.7b2_Source/: Makefile.porig |