[gentoo-commits] gentoo-x86 commit in dev-tcltk/tkTheme/files: 1.0-Makefile.in.diff 1.0-cflags.patch

[gentoo-commits] gentoo-x86 commit in dev-tcltk/tkTheme/files: 1.0-Makefile.in.diff 1.0-cflags.patch

[Justin Lecher (jlec)]

jlec        12/01/02 23:30:17

  Modified:             1.0-Makefile.in.diff
  Added:                1.0-cflags.patch
  Log:
  Moved to EAPI=4 and autotools-utils.eclass, handle examples static-libs and threading support correctly, added missing deps
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-tcltk/tkTheme/files/1.0-Makefile.in.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff?r1=1.1&r2=1.2

Index: 1.0-Makefile.in.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.0-Makefile.in.diff	1 Feb 2003 22:17:08 -0000	1.1
+++ 1.0-Makefile.in.diff	2 Jan 2012 23:30:17 -0000	1.2
@@ -1,11 +1,16 @@
---- Makefile.in.orig	2003-02-01 16:56:40.000000000 -0500
-+++ Makefile.in	2003-02-01 17:04:07.000000000 -0500
-@@ -428,16 +428,16 @@
+ Makefile.in |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7cf8b1e..c2c7d3b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -428,16 +428,15 @@ mostlyclean distclean maintainer-clean
  
  
  install-exec-hook:
 -	$(mkinstalldirs) @PKG_TCL@ @PKG_TCL@/demo
-+	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@ $(DESTDIR)@PKG_TCL@/demo
++	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
  	echo	"package ifneeded tkTheme"				   \
  		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
 -		"[list load $(DESTDIR)$(libdir)/libtkTheme.so]"	   \
@@ -13,12 +18,12 @@
 +		"[list load $(libdir)/libtkTheme.so]"	   \
 +	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
  	sed -e 's%load .libs/libtkTheme.so%package require tkTheme%' \
- 	    < test.tcl      					     \
+-	    < test.tcl      					     \
++	    < $(srcdir)/test.tcl      					     \
  	    | sed -e 's%cd demo/%cd @PKG_TCL@/demo/%'                \
 -	    > @PKG_TCL@/test.tcl
 -	cp demo/* @PKG_TCL@/demo
 +	    > $(DESTDIR)@PKG_TCL@/test.tcl
-+	cp demo/* $(DESTDIR)@PKG_TCL@/demo
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.



1.1                  dev-tcltk/tkTheme/files/1.0-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkTheme/files/1.0-cflags.patch?rev=1.1&content-type=text/plain

Index: 1.0-cflags.patch
===================================================================
 configure |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 373c332..6fc1a14 100755
--- a/configure
+++ b/configure
@@ -3341,9 +3341,7 @@ fi
 
 
 if test "${SHARED_BUILD}" = "1" ; then
-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
-else
-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
+    CFLAGS+=' ${SHLIB_CFLAGS}'
 fi
 
 #--------------------------------------------------------------------