[www-client/uzbl] updated makefile patch and sent it upstream - fixes bug #309159. fixed bug 309163. removed old version

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 30 insertions, 95 deletions

diff --git a/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
deleted file mode 100644
index dc1f0a89f057..000000000000
--- a/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	2010-02-03 11:20:21.616804753 +0200
-+++ Makefile	2010-02-03 11:21:17.385747630 +0200
-@@ -1,7 +1,7 @@
- # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
- 
--CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
--CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
- 
- LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
- LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
-@@ -100,14 +100,10 @@
- 
- install-uzbl-core: all
- 	install -d $(INSTALLDIR)/bin
--	install -d $(INSTALLDIR)/share/uzbl/docs
- 	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs         $(INSTALLDIR)/share/uzbl/
--	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
-+	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/
- 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
- 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
--	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
--	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
- 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
- 
- install-uzbl-browser:
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
deleted file mode 100644
index 129baddd2ead..000000000000
--- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.old	2010-02-17 09:13:50.139343494 +0200
-+++ Makefile	2010-02-17 09:15:03.711341985 +0200
-@@ -1,7 +1,7 @@
- # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
- 
--CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
--CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
- 
- LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
- LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
-@@ -100,14 +100,10 @@
- 
- install-uzbl-core: all
- 	install -d $(INSTALLDIR)/bin
--	install -d $(INSTALLDIR)/share/uzbl/docs
- 	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs         $(INSTALLDIR)/share/uzbl/
--	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
-+	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/
- 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
- 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
--	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
--	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
- 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
- 
- install-uzbl-browser:
diff --git a/www-client/uzbl/files/uzbl-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
deleted file mode 100644
index 73561349986d..000000000000
--- a/www-client/uzbl/files/uzbl-makefile-cleanup.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.old	2009-12-05 19:22:12.079131232 +0200
-+++ Makefile	2009-12-05 19:24:51.863115587 +0200
-@@ -1,7 +1,7 @@
- # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
- 
--CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
--CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic 
-+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
- 
- LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
- LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
-@@ -32,10 +32,6 @@
- 	@echo LINKING object files
- 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
- 	@echo ... done.
--	@echo Stripping binary
--	@strip $@
--	@echo ... done.
--
- 
- uzbl-browser: uzbl-core
- 
-@@ -88,14 +84,10 @@
- 
- install-uzbl-core: all
- 	install -d $(INSTALLDIR)/bin
--	install -d $(INSTALLDIR)/share/uzbl/docs
- 	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs     $(INSTALLDIR)/share/uzbl/
--	cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/
-+	cp -rp config.h $(INSTALLDIR)/share/uzbl/
- 	cp -rp examples $(INSTALLDIR)/share/uzbl/
- 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
--	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
--	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
- 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
- 
- install-uzbl-browser: all
diff --git a/www-client/uzbl/files/uzbl-makefile-docdir.patch b/www-client/uzbl/files/uzbl-makefile-docdir.patch
new file mode 100644
index 000000000000..ae1c4c6e39b8
--- /dev/null
+++ b/www-client/uzbl/files/uzbl-makefile-docdir.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2010-03-14 15:31:02.685612392 +0200
++++ Makefile	2010-03-14 15:34:02.224647749 +0200
+@@ -43,6 +43,7 @@
+ # RUN_PREFIX : what the prefix is when the software is run. usually the same as PREFIX
+ PREFIX?=/usr/local
+ INSTALLDIR?=$(DESTDIR)$(PREFIX)
++DOCDIR?=$(INSTALLDIR)/share/uzbl/docs
+ RUN_PREFIX?=$(PREFIX)
+ 
+ # the 'tests' target can never be up to date
+@@ -100,14 +101,14 @@
+ 
+ install-uzbl-core: all
+ 	install -d $(INSTALLDIR)/bin
+-	install -d $(INSTALLDIR)/share/uzbl/docs
++	install -d $(DOCDIR)
+ 	install -d $(INSTALLDIR)/share/uzbl/examples
+-	cp -rp docs         $(INSTALLDIR)/share/uzbl/
+-	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
++	cp -rp docs/*       $(DOCDIR)/
++	cp -rp src/config.h $(DOCDIR)/
+ 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
+ 	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
+-	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
+-	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
++	install -m644 AUTHORS      $(DOCDIR)
++	install -m644 README       $(DOCDIR)
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+ 
+ install-uzbl-browser: