head	1.2;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.05.23.06.55.07;	author beech;	state Exp;
branches;
next	1.1;

1.1
date	2011.07.20.16.41.43;	author jlaffaye;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to the version as of 2012/05/14
- Release notes see http://www.uzbl.org/news.php?id=40

PR:		ports/168206
Submitted by:	Klaus Aehlig <aehlig@@linta.de> (maintainer)
@
text
@--- Makefile.orig	2012-04-28 20:27:17.000000000 +0200
+++ Makefile	2012-05-21 21:18:51.000000000 +0200
@@@@ -7,13 +7,14 @@@@
 RUN_PREFIX?=$(PREFIX)
 
 # use GTK3-based webkit when it is available
-USE_GTK3 = $(shell pkg-config --exists gtk+-3.0 webkitgtk-3.0 && echo 1)
+# USE_GTK3 = $(shell pkg-config --exists gtk+-3.0 webkitgtk-3.0 && echo 1)
+USE_GTK3 = 0
 
 ifeq ($(USE_GTK3),1)
 	REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0
 	CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
 else
-	REQ_PKGS += gtk+-2.0 webkit-1.0 javascriptcoregtk-1.0
+	REQ_PKGS += gtk+-2.0 webkit-1.0
 	CPPFLAGS =
 endif
 
@@@@ -25,7 +26,7 @@@@
 
 COMMIT_HASH:=$(shell ./misc/hash.sh)
 
-CPPFLAGS += -D_BSD_SOURCE -D_POSIX_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
+CPPFLAGS += -D_BSD_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
 
 PKG_CFLAGS:=$(shell pkg-config --cflags $(REQ_PKGS))
 
@


1.1
log
@Add forgotten patch
@
text
@d1 3
a3 3
--- Makefile.orig	2011-07-20 11:12:34.000000000 +0100
+++ Makefile	2011-07-20 11:14:15.000000000 +0100
@@@@ -7,7 +7,8 @@@@
d12 17
a28 1
 	REQ_PKGS += gtk+-3.0 webkitgtk-3.0
@

