1 |
commit: cf853c0667449663b51414ce7db3914da2bb2b69 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 30 17:55:58 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 31 08:41:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf853c06 |
7 |
|
8 |
sci-chemistry/sparky: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3730 |
11 |
|
12 |
sci-chemistry/sparky/files/3.115-fpic.patch | 42 ---- |
13 |
sci-chemistry/sparky/files/3.115-wrapper.patch | 41 ---- |
14 |
sci-chemistry/sparky/files/fix-install.patch | 259 ------------------------- |
15 |
3 files changed, 342 deletions(-) |
16 |
|
17 |
diff --git a/sci-chemistry/sparky/files/3.115-fpic.patch b/sci-chemistry/sparky/files/3.115-fpic.patch |
18 |
deleted file mode 100644 |
19 |
index 37725aa..00000000 |
20 |
--- a/sci-chemistry/sparky/files/3.115-fpic.patch |
21 |
+++ /dev/null |
22 |
@@ -1,42 +0,0 @@ |
23 |
-diff --git a/c++/Makefile b/c++/Makefile |
24 |
-index 421ff77..7442ed3 100644 |
25 |
---- a/c++/Makefile |
26 |
-+++ b/c++/Makefile |
27 |
-@@ -158,7 +158,7 @@ winsystem-$(PLATFORM).o: winsystem-$(PLATFORM).cc |
28 |
- $(CXX) $(CXXFLAGS) $(TKFLAGS) -c $(SPARKY_SRC)/winsystem-$(PLATFORM).cc |
29 |
- |
30 |
- python.o: python.cc |
31 |
-- $(CXX) $(CXXFLAGS) $(PYFLAGS) $(TKFLAGS) -c $(SPARKY_SRC)/python.cc |
32 |
-+ $(CXX) $(CXXFLAGS) -fPIC $(PYFLAGS) $(TKFLAGS) -c $(SPARKY_SRC)/python.cc |
33 |
- |
34 |
- _tkinter.so: _tkinter.o |
35 |
- $(CXX) $(LDSHARED) $(LDFLAGS) -o $@ _tkinter.o $(TKLIBS) |
36 |
-diff --git a/c++/Makefile b/c++/Makefile |
37 |
-index 353122d..84b0c24 100644 |
38 |
---- a/c++/Makefile |
39 |
-+++ b/c++/Makefile |
40 |
-@@ -168,7 +168,7 @@ _tkinter.o: _tkinter.c |
41 |
- |
42 |
- Makefile.dep: force |
43 |
- cd $(SPARKY_SRC) ; \ |
44 |
-- $(CXX) $(DEPEND) $(CXXFLAGS) $(TKFLAGS) $(PYFLAGS) \ |
45 |
-+ $(CXX) $(DEPEND) $(CXXFLAGS) -fPIC $(TKFLAGS) $(PYFLAGS) \ |
46 |
- $(SPARKY_OBJS:.o=.cc) $(OTHER_OBJS:.o=.cc) > $@ |
47 |
- |
48 |
- TAGS: force |
49 |
-diff --git a/c++/Makefile b/c++/Makefile |
50 |
-index 84b0c24..933f347 100644 |
51 |
---- a/c++/Makefile |
52 |
-+++ b/c++/Makefile |
53 |
-@@ -30,9 +30,9 @@ TCL_LIBNAME = tcl$(TCLTK_VERSION) |
54 |
- PLATFORM = unix |
55 |
- |
56 |
- CXX = g++ |
57 |
--CXXFLAGS = |
58 |
-+CXXFLAGS += -fPIC |
59 |
- CC = gcc |
60 |
--CFLAGS = |
61 |
-+CFLAGS += -fPIC |
62 |
- PYFLAGS = -I$(PYTHON_INC) -I$(PYTHON_LIB)/config |
63 |
- TKFLAGS = -I$(TK_PREFIX)/include |
64 |
- TKLIBS = -L$(TK_PREFIX)/lib -l$(TK_LIBNAME) -l$(TCL_LIBNAME) -lX11 |
65 |
|
66 |
diff --git a/sci-chemistry/sparky/files/3.115-wrapper.patch b/sci-chemistry/sparky/files/3.115-wrapper.patch |
67 |
deleted file mode 100644 |
68 |
index 9498c0b..00000000 |
69 |
--- a/sci-chemistry/sparky/files/3.115-wrapper.patch |
70 |
+++ /dev/null |
71 |
@@ -1,41 +0,0 @@ |
72 |
-diff --git a/bin/sparky b/bin/sparky |
73 |
-index 8b51212..270723a 100644 |
74 |
---- a/bin/sparky |
75 |
-+++ b/bin/sparky |
76 |
-@@ -4,18 +4,6 @@ |
77 |
- # |
78 |
- |
79 |
- # ----------------------------------------------------------------------------- |
80 |
--# Figure out Sparky installation directory from $0. |
81 |
--# |
82 |
--set sparky_exe = "$0" |
83 |
--while (-l "$sparky_exe") |
84 |
-- set ls_sparky_exe = `ls -l "$sparky_exe"` |
85 |
-- set sparky_exe = `echo "$ls_sparky_exe" | sed 's/.* -> //'` |
86 |
--end |
87 |
--set sparky_bin = `dirname "$sparky_exe"` |
88 |
--set sparky_bin = `cd "$sparky_bin"; pwd` |
89 |
--set sparky_inst = `dirname "$sparky_bin"` |
90 |
-- |
91 |
--# ----------------------------------------------------------------------------- |
92 |
- # Sparky uses the SPARKY_INSTALL environment variable to find its |
93 |
- # application resource file and print prolog file. |
94 |
- # |
95 |
-@@ -25,7 +13,7 @@ setenv SPARKY_INSTALL "$sparky_inst" |
96 |
- # If Python is available start Sparky as a Python extension. |
97 |
- # Otherwise the standalone version of Sparky is started. |
98 |
- # |
99 |
--set PYTHON = "$SPARKY_INSTALL/python2.5/bin/python2.5" |
100 |
-+set PYTHON = "@GENTOO_PORTAGE_EPREFIX@/usr/bin/python" |
101 |
- if (! -e "$PYTHON") then |
102 |
- set PYTHON = python2.5 |
103 |
- endif |
104 |
-@@ -79,7 +67,7 @@ if ($status == 0) then |
105 |
- # --------------------------------------------------------------------------- |
106 |
- # Add the Sparky package and Tkinter to the Python path |
107 |
- # |
108 |
-- set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/lib-tk" |
109 |
-+ set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/sparky" |
110 |
- if ($?PYTHONPATH) then |
111 |
- setenv PYTHONPATH "${SPARKY_PYTHONPATH}:$PYTHONPATH" |
112 |
- else |
113 |
|
114 |
diff --git a/sci-chemistry/sparky/files/fix-install.patch b/sci-chemistry/sparky/files/fix-install.patch |
115 |
deleted file mode 100644 |
116 |
index 4eefaa8..00000000 |
117 |
--- a/sci-chemistry/sparky/files/fix-install.patch |
118 |
+++ /dev/null |
119 |
@@ -1,259 +0,0 @@ |
120 |
-diff -ur -x make-sparky sparky.orig/bin/sparky sparky/bin/sparky |
121 |
---- sparky.orig/bin/sparky 2004-03-05 11:32:10.000000000 -0800 |
122 |
-+++ sparky/bin/sparky 2005-12-17 17:36:51.000000000 -0800 |
123 |
-@@ -4,22 +4,10 @@ |
124 |
- # |
125 |
- |
126 |
- # ----------------------------------------------------------------------------- |
127 |
--# Figure out Sparky installation directory from $0. |
128 |
--# |
129 |
--set sparky_exe = $0 |
130 |
--while (-l $sparky_exe) |
131 |
-- set ls_sparky_exe = `ls -l "$sparky_exe"` |
132 |
-- set sparky_exe = `echo "$ls_sparky_exe" | sed 's/.* -> //'` |
133 |
--end |
134 |
--set sparky_bin = `dirname "$sparky_exe"` |
135 |
--set sparky_bin = `cd "$sparky_bin"; pwd` |
136 |
--set sparky_inst = `dirname "$sparky_bin"` |
137 |
-- |
138 |
--# ----------------------------------------------------------------------------- |
139 |
- # Sparky uses the SPARKY_INSTALL environment variable to find its |
140 |
- # application resource file and print prolog file. |
141 |
- # |
142 |
--setenv SPARKY_INSTALL $sparky_inst |
143 |
-+setenv SPARKY_INSTALL @GENTOO_PORTAGE_EPREFIX@/usr/lib/sparky |
144 |
- |
145 |
- # ----------------------------------------------------------------------------- |
146 |
- # If Python is available start Sparky as a Python extension. |
147 |
-diff -ur -x make-sparky sparky.orig/c++/Makefile sparky/c++/Makefile |
148 |
---- sparky.orig/c++/Makefile 2004-02-03 15:56:24.000000000 -0800 |
149 |
-+++ sparky/c++/Makefile 2005-12-18 10:49:08.000000000 -0800 |
150 |
-@@ -22,6 +22,7 @@ |
151 |
- PYTHON_PREFIX = /usr/local |
152 |
- PYTHON_LIB = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION) |
153 |
- PYTHON_INC = $(PYTHON_PREFIX)/include/python$(PYTHON_VERSION) |
154 |
-+PYDIR = $(SPARKY_INSTALL)/lib/python$(PYTHON_VERSION)/site-packages |
155 |
- TCLTK_VERSION = 8.4 |
156 |
- TCLTK_VER_WIN32 = 84 |
157 |
- TK_PREFIX = /usr/local |
158 |
-@@ -113,21 +114,20 @@ |
159 |
- |
160 |
- nopython: $(EXECUTABLES) |
161 |
- |
162 |
--install-python: $(SPY_PYMOD) $(TKINTER_PYMOD) $(SPARKY_INSTALL)/python \ |
163 |
-- $(SPARKY_INSTALL)/python/sparky $(SPARKY_INSTALL)/python/lib-tk |
164 |
-- $(INSTALL) $(SPY_PYMOD) $(SPARKY_INSTALL)/python/sparky |
165 |
-- chmod 755 $(SPARKY_INSTALL)/python/sparky/$(SPY_PYMOD) |
166 |
-- $(INSTALL) $(TKINTER_PYMOD) $(SPARKY_INSTALL)/python/lib-tk |
167 |
-- chmod 755 $(SPARKY_INSTALL)/python/lib-tk/$(TKINTER_PYMOD) |
168 |
-+install-python: $(SPY_PYMOD) $(TKINTER_PYMOD) $(PYDIR) \ |
169 |
-+ $(PYDIR)/sparky $(PYDIR)/lib-tk |
170 |
-+ $(INSTALL) $(SPY_PYMOD) $(PYDIR)/sparky |
171 |
-+ chmod 755 $(PYDIR)/sparky/$(SPY_PYMOD) |
172 |
-+ $(INSTALL) $(TKINTER_PYMOD) $(PYDIR)/lib-tk |
173 |
-+ chmod 755 $(PYDIR)/lib-tk/$(TKINTER_PYMOD) |
174 |
- |
175 |
- install-nopython: $(EXECUTABLES) $(SPARKY_INSTALL)/bin |
176 |
- $(INSTALL) $(EXECUTABLES) $(SPARKY_INSTALL)/bin |
177 |
- cd $(SPARKY_INSTALL)/bin ; \ |
178 |
- chmod 755 $(EXECUTABLES) |
179 |
- |
180 |
--$(SPARKY_INSTALL)/bin $(SPARKY_INSTALL)/python \ |
181 |
--$(SPARKY_INSTALL)/python/sparky $(SPARKY_INSTALL)/python/lib-tk: |
182 |
-- mkdir $@ |
183 |
-+$(SPARKY_INSTALL)/bin $(PYDIR) $(PYDIR)/sparky $(PYDIR)/lib-tk: |
184 |
-+ mkdir -p $@ |
185 |
- chmod 755 $@ |
186 |
- |
187 |
- sparky-no-python$(EXE_SUFFIX): main.o $(SPARKY_OBJS) |
188 |
-diff -ur -x make-sparky sparky.orig/c++/paths.h sparky/c++/paths.h |
189 |
---- sparky.orig/c++/paths.h 2002-01-17 19:15:06.000000000 -0800 |
190 |
-+++ sparky/c++/paths.h 2005-12-17 20:57:15.000000000 -0800 |
191 |
-@@ -19,7 +19,7 @@ |
192 |
- // Installation subdirectories and files |
193 |
- // |
194 |
- #define SPARKY_MANUAL "manual" |
195 |
--#define SPARKY_LIB "lib" |
196 |
-+#define SPARKY_LIB "" |
197 |
- #define SPARKY_PRINT "print-prolog.ps" // under lib directory |
198 |
- #define SPARKY_RESOURCE "Sparky" // under lib directory |
199 |
- #define SPARKY_SAMPLE_DATA "example" |
200 |
-diff -ur -x make-sparky sparky.orig/c++/system-unix.cc sparky/c++/system-unix.cc |
201 |
---- sparky.orig/c++/system-unix.cc 2004-02-26 10:57:54.000000000 -0800 |
202 |
-+++ sparky/c++/system-unix.cc 2005-12-17 20:56:58.000000000 -0800 |
203 |
-@@ -95,7 +95,7 @@ |
204 |
- // |
205 |
- Stringy default_sparky_install_path() |
206 |
- { |
207 |
-- return file_path(file_path(file_path("", "usr"), "local"), "sparky"); |
208 |
-+ return file_path(file_path(file_path("", "usr"), "lib"), "sparky"); |
209 |
- } |
210 |
- |
211 |
- // ---------------------------------------------------------------------------- |
212 |
-diff -ur -x make-sparky sparky.orig/lib/Makefile sparky/lib/Makefile |
213 |
---- sparky.orig/lib/Makefile 2004-02-18 10:53:29.000000000 -0800 |
214 |
-+++ sparky/lib/Makefile 2005-12-17 16:03:21.000000000 -0800 |
215 |
-@@ -18,9 +18,9 @@ |
216 |
- TCL_SHLIB = lib$(TCL_VERSION)$(TCLTK_SHLIB_SUFFIX) |
217 |
- TK_SHLIB = lib$(TK_VERSION)$(TCLTK_SHLIB_SUFFIX) |
218 |
- |
219 |
--install: $(SPARKY_INSTALL)/lib install-tcl-tk |
220 |
-- $(INSTALL) Sparky print-prolog.ps $(SPARKY_INSTALL)/lib |
221 |
-- cd $(SPARKY_INSTALL)/lib ; \ |
222 |
-+install: $(SPARKY_INSTALL)/lib |
223 |
-+ $(INSTALL) Sparky print-prolog.ps $(SPARKY_INSTALL)/lib/sparky |
224 |
-+ cd $(SPARKY_INSTALL)/lib/sparky ; \ |
225 |
- chmod 644 Sparky print-prolog.ps |
226 |
- |
227 |
- install-tcl-tk: $(SPARKY_INSTALL)/lib |
228 |
-diff -ur -x make-sparky sparky.orig/Makefile sparky/Makefile |
229 |
---- sparky.orig/Makefile 2004-02-18 10:40:04.000000000 -0800 |
230 |
-+++ sparky/Makefile 2005-12-17 19:40:48.000000000 -0800 |
231 |
-@@ -40,18 +40,22 @@ |
232 |
- |
233 |
- PYTHON_VERSION = 2.3 |
234 |
- PYTHON_DIR = |
235 |
-+PYDIR = $(SPARKY_INSTALL)/lib/python$(PYTHON_VERSION)/site-packages |
236 |
- |
237 |
- PYMOD_SUFFIX = .so |
238 |
- SPY_PYMOD = spy$(PYMOD_SUFFIX) |
239 |
- TKINTER_PYMOD = _tkinter$(PYMOD_SUFFIX) |
240 |
- |
241 |
-+PYDIR = $(SPARKY_INSTALL)/lib/sparky/python |
242 |
-+DOCDIR = $(SPARKY_INSTALL)/share/doc/sparky |
243 |
-+ |
244 |
- all nopython $(SPY_PYMOD) $(TKINTER_PYMOD) $(EXECUTABLES) debug-sparky clean: force |
245 |
- cd $(SPARKY_OBJ) && $(MAKE) -f $(SPARKY_SRC)/Makefile -e $@ |
246 |
- |
247 |
- Makefile.dep TAGS: force |
248 |
- cd $(SPARKY_SRC) && $(MAKE) -f Makefile -e $@ |
249 |
- |
250 |
--install: install-nopython $(SPARKY_INSTALL) install-python |
251 |
-+install: install-nopython $(SPARKY_INSTALL) |
252 |
- cd $(SPARKY_OBJ) && \ |
253 |
- $(MAKE) -f $(SPARKY_SRC)/Makefile -e install-python |
254 |
- cd $(SPARKY)/python && $(MAKE) -f Makefile -e install |
255 |
-@@ -67,7 +71,8 @@ |
256 |
- chmod 755 sparky$(SCRIPT_SUFFIX) |
257 |
- |
258 |
- install-example: $(SPARKY_INSTALL) |
259 |
-- cd $(SPARKY) ; $(INSTALLDIR) example $(SPARKY_INSTALL) |
260 |
-+ mkdir -p $(DOCDIR)/example |
261 |
-+ cd $(SPARKY) ; $(INSTALLDIR) example $(DOCDIR) |
262 |
- |
263 |
- install-lib: $(SPARKY_INSTALL) |
264 |
- cd $(SPARKY)/lib && $(MAKE) -f Makefile -e install |
265 |
-@@ -76,21 +81,14 @@ |
266 |
- cd $(SPARKY)/manual && $(MAKE) -f Makefile -e install |
267 |
- |
268 |
- install-misc: $(SPARKY_INSTALL) |
269 |
-- cd $(SPARKY) ; $(INSTALL) LICENSE README $(SPARKY_INSTALL) |
270 |
-- cd $(SPARKY_INSTALL) ; chmod 644 LICENSE README |
271 |
-- |
272 |
--install-python: $(SPARKY_INSTALL) $(SPARKY_INSTALL)/python$(PYTHON_VERSION) |
273 |
--ifdef PYTHON_DIR |
274 |
-- $(INSTALLDIR) $(PYTHON_DIR)/* $(SPARKY_INSTALL)/python$(PYTHON_VERSION) |
275 |
--else |
276 |
-- echo "Not packaging Python with Sparky." |
277 |
--endif |
278 |
-+ cd $(SPARKY) ; $(INSTALL) LICENSE README $(DOCDIR) |
279 |
-+ cd $(DOCDIR) ; chmod 644 LICENSE README |
280 |
- |
281 |
- install-mac: |
282 |
- cd $(SPARKY)/mac && $(MAKE) -f Makefile -e install |
283 |
- |
284 |
--$(SPARKY_INSTALL) $(SPARKY_INSTALL)/bin $(SPARKY_INSTALL)/python$(PYTHON_VERSION): |
285 |
-- mkdir $@ |
286 |
-+$(SPARKY_INSTALL) $(SPARKY_INSTALL)/bin $(PYDIR): |
287 |
-+ mkdir -p $@ |
288 |
- chmod 755 $@ |
289 |
- |
290 |
- force: |
291 |
-diff -ur -x make-sparky sparky.orig/manual/Makefile sparky/manual/Makefile |
292 |
---- sparky.orig/manual/Makefile 2004-03-08 15:40:06.000000000 -0800 |
293 |
-+++ sparky/manual/Makefile 2005-12-17 19:37:45.000000000 -0800 |
294 |
-@@ -13,6 +13,8 @@ |
295 |
- |
296 |
- SPARKY_INSTALL = /usr/local/sparky |
297 |
- MANUAL_WWW = /usr/local/html/cgl/sparky/manual |
298 |
-+DOCDIR = $(SPARKY_INSTALL)/share/doc/sparky |
299 |
-+MANUAL_LOC = $(DOCDIR)/manual |
300 |
- |
301 |
- MANUAL_SECTIONS = overview.html intro.html views.html peaks.html \ |
302 |
- extensions.html autoassign.html misc.html \ |
303 |
-@@ -45,17 +47,17 @@ |
304 |
- |
305 |
- all: $(MANUAL_FILES) |
306 |
- |
307 |
--install: $(MANUAL_FILES) $(SPARKY_INSTALL)/manual \ |
308 |
-- $(SPARKY_INSTALL)/manual/images |
309 |
-- $(INSTALL) $(MANUAL_FILES) $(SPARKY_INSTALL)/manual |
310 |
-- cd $(SPARKY_INSTALL)/manual ; \ |
311 |
-+install: $(MANUAL_FILES) $(MANUAL_LOC) \ |
312 |
-+ $(MANUAL_LOC)/images |
313 |
-+ $(INSTALL) $(MANUAL_FILES) $(MANUAL_LOC) |
314 |
-+ cd $(MANUAL_LOC) ; \ |
315 |
- chmod 644 $(MANUAL_FILES) |
316 |
- cd images ; \ |
317 |
-- $(INSTALL) $(IMAGE_FILES) $(SPARKY_INSTALL)/manual/images |
318 |
-- cd $(SPARKY_INSTALL)/manual/images ; \ |
319 |
-+ $(INSTALL) $(IMAGE_FILES) $(MANUAL_LOC)/images |
320 |
-+ cd $(MANUAL_LOC)/images ; \ |
321 |
- chmod 644 $(IMAGE_FILES) |
322 |
- |
323 |
--$(SPARKY_INSTALL)/manual $(SPARKY_INSTALL)/manual/images: |
324 |
-+$(MANUAL_LOC) $(MANUAL_LOC)/images: |
325 |
- mkdir $@ |
326 |
- chmod 755 $@ |
327 |
- |
328 |
-Only in sparky/manual: manual-postscript.gz |
329 |
-diff -ur -x make-sparky sparky.orig/python/Makefile sparky/python/Makefile |
330 |
---- sparky.orig/python/Makefile 2004-02-18 10:51:06.000000000 -0800 |
331 |
-+++ sparky/python/Makefile 2005-12-17 19:43:06.000000000 -0800 |
332 |
-@@ -9,6 +9,8 @@ |
333 |
- PYTHON_VERSION = 2.3 |
334 |
- PYTHON = $(PYTHON_PREFIX)/bin/python$(PYTHON_VERSION) |
335 |
- PYTHON_LIB = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION) |
336 |
-+PYDIR = $(SPARKY_INSTALL)/lib/python$(PYTHON_VERSION)/site-packages |
337 |
-+DOCDIR = $(SPARKY_INSTALL)/share/doc/sparky |
338 |
- |
339 |
- PYTHON_CODE = __init__.py align.py assigngraph.py atomnames.py \ |
340 |
- atoms.py autoassign.py axes.py \ |
341 |
-@@ -27,18 +29,13 @@ |
342 |
- sputil.py start_in_chimera.py strips.py subprocess.py \ |
343 |
- tkutil.py volumeerror.py xeasy.py xplor.py |
344 |
- |
345 |
--install: $(SPARKY_INSTALL)/python $(SPARKY_INSTALL)/python/sparky \ |
346 |
-- $(SPARKY_INSTALL)/python/lib-tk |
347 |
-- $(INSTALL) README $(SPARKY_INSTALL)/python |
348 |
-- $(INSTALL) $(PYTHON_CODE) $(SPARKY_INSTALL)/python/sparky |
349 |
-- $(INSTALL) lib-tk/*.py $(SPARKY_INSTALL)/python/lib-tk |
350 |
-- chmod 644 $(SPARKY_INSTALL)/python/README |
351 |
-- cd $(SPARKY_INSTALL)/python/sparky ; chmod 644 $(PYTHON_CODE) |
352 |
-- chmod 644 $(SPARKY_INSTALL)/python/lib-tk/*.py |
353 |
-- $(PYTHON) $(PYTHON_LIB)/compileall.py $(SPARKY_INSTALL)/python/sparky |
354 |
-- $(PYTHON) $(PYTHON_LIB)/compileall.py $(SPARKY_INSTALL)/python/lib-tk |
355 |
-+install: $(PYDIR) $(PYDIR)/sparky $(DOCDIR)/python |
356 |
-+ $(INSTALL) README $(DOCDIR)/python |
357 |
-+ $(INSTALL) $(PYTHON_CODE) $(PYDIR)/sparky |
358 |
-+ chmod 644 $(DOCDIR)/python/README |
359 |
-+ cd $(PYDIR)/sparky ; chmod 644 $(PYTHON_CODE) |
360 |
- |
361 |
--$(SPARKY_INSTALL)/python $(SPARKY_INSTALL)/python/sparky \ |
362 |
-- $(SPARKY_INSTALL)/python/lib-tk: |
363 |
-+$(PYDIR) $(PYDIR)/sparky \ |
364 |
-+ $(PYDIR)/lib-tk $(DOCDIR)/python: |
365 |
- mkdir $@ |
366 |
- chmod 755 $@ |
367 |
-diff -ur -x make-sparky sparky.orig/python/spingraph.py sparky/python/spingraph.py |
368 |
---- sparky.orig/python/spingraph.py 2001-12-17 10:51:10.000000000 -0800 |
369 |
-+++ sparky/python/spingraph.py 2005-12-17 22:09:17.000000000 -0800 |
370 |
-@@ -831,7 +831,7 @@ |
371 |
- 'by creating a file specifying atom positions, colors,\n' + |
372 |
- 'sizes, and text label positions. Sparky provides a\n' + |
373 |
- 'default layout file\n' + |
374 |
-- '\n\t/usr/local/sparky/python/spinlayout.py\n\n' + |
375 |
-+ '\n\t/usr/lib/python*/site-packages/sparky/python/spinlayout.py\n\n' + |
376 |
- 'You override this file by making your own copy\n' + |
377 |
- '\n\t~/Sparky/Python/spinlayout.py\n\n' + |
378 |
- 'You can create the desired template on the screen\n' |