1 |
jlec 12/01/02 23:30:17 |
2 |
|
3 |
Modified: 1.0-Makefile.in.diff |
4 |
Added: 1.0-cflags.patch |
5 |
Log: |
6 |
Moved to EAPI=4 and autotools-utils.eclass, handle examples static-libs and threading support correctly, added missing deps |
7 |
|
8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 dev-tcltk/tkTheme/files/1.0-Makefile.in.diff |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: 1.0-Makefile.in.diff |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- 1.0-Makefile.in.diff 1 Feb 2003 22:17:08 -0000 1.1 |
24 |
+++ 1.0-Makefile.in.diff 2 Jan 2012 23:30:17 -0000 1.2 |
25 |
@@ -1,11 +1,16 @@ |
26 |
---- Makefile.in.orig 2003-02-01 16:56:40.000000000 -0500 |
27 |
-+++ Makefile.in 2003-02-01 17:04:07.000000000 -0500 |
28 |
-@@ -428,16 +428,16 @@ |
29 |
+ Makefile.in | 11 +++++------ |
30 |
+ 1 files changed, 5 insertions(+), 6 deletions(-) |
31 |
+ |
32 |
+diff --git a/Makefile.in b/Makefile.in |
33 |
+index 7cf8b1e..c2c7d3b 100644 |
34 |
+--- a/Makefile.in |
35 |
++++ b/Makefile.in |
36 |
+@@ -428,16 +428,15 @@ mostlyclean distclean maintainer-clean |
37 |
|
38 |
|
39 |
install-exec-hook: |
40 |
- $(mkinstalldirs) @PKG_TCL@ @PKG_TCL@/demo |
41 |
-+ $(mkinstalldirs) $(DESTDIR)@PKG_TCL@ $(DESTDIR)@PKG_TCL@/demo |
42 |
++ $(mkinstalldirs) $(DESTDIR)@PKG_TCL@ |
43 |
echo "package ifneeded tkTheme" \ |
44 |
`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \ |
45 |
- "[list load $(DESTDIR)$(libdir)/libtkTheme.so]" \ |
46 |
@@ -13,12 +18,12 @@ |
47 |
+ "[list load $(libdir)/libtkTheme.so]" \ |
48 |
+ > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl |
49 |
sed -e 's%load .libs/libtkTheme.so%package require tkTheme%' \ |
50 |
- < test.tcl \ |
51 |
+- < test.tcl \ |
52 |
++ < $(srcdir)/test.tcl \ |
53 |
| sed -e 's%cd demo/%cd @PKG_TCL@/demo/%' \ |
54 |
- > @PKG_TCL@/test.tcl |
55 |
- cp demo/* @PKG_TCL@/demo |
56 |
+ > $(DESTDIR)@PKG_TCL@/test.tcl |
57 |
-+ cp demo/* $(DESTDIR)@PKG_TCL@/demo |
58 |
|
59 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
60 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
61 |
|
62 |
|
63 |
|
64 |
1.1 dev-tcltk/tkTheme/files/1.0-cflags.patch |
65 |
|
66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-cflags.patch?rev=1.1&view=markup |
67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-cflags.patch?rev=1.1&content-type=text/plain |
68 |
|
69 |
Index: 1.0-cflags.patch |
70 |
=================================================================== |
71 |
configure | 4 +--- |
72 |
1 files changed, 1 insertions(+), 3 deletions(-) |
73 |
|
74 |
diff --git a/configure b/configure |
75 |
index 373c332..6fc1a14 100755 |
76 |
--- a/configure |
77 |
+++ b/configure |
78 |
@@ -3341,9 +3341,7 @@ fi |
79 |
|
80 |
|
81 |
if test "${SHARED_BUILD}" = "1" ; then |
82 |
- CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}' |
83 |
-else |
84 |
- CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}' |
85 |
+ CFLAGS+=' ${SHLIB_CFLAGS}' |
86 |
fi |
87 |
|
88 |
#-------------------------------------------------------------------- |