summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2008-12-29 14:57:32 +0000
committerhasso <hasso>2008-12-29 14:57:32 +0000
commit4afccbbfed8f42f76694f4bbd5a521d9acfcf329 (patch)
treecb39caa9c1cdfed36184e9bcd88e38a74b073ebb
parent079c22510039eb585d7c6476ea5ce80a74805112 (diff)
downloadpkgsrc-4afccbbfed8f42f76694f4bbd5a521d9acfcf329.tar.gz
* Use bash for autogen.sh (the package already depends on it)
* Make it build on DragonFly
-rw-r--r--www/webkit-gtk/Makefile4
-rw-r--r--www/webkit-gtk/distinfo4
-rw-r--r--www/webkit-gtk/patches/patch-ad15
3 files changed, 16 insertions, 7 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 42cf9190102..2d89c210193 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/13 02:35:15 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/29 14:57:32 hasso Exp $
#
# pkg-config says 1.0.3, let's combine it with the revision
# to give a sane version number.
@@ -43,7 +43,7 @@ REPLACE_PERL+= JavaScriptCore/kjs/create_hash_table \
WebKitTools/Scripts/*
pre-configure:
- cd ${WRKSRC} && ${SHELL} autogen.sh
+ cd ${WRKSRC} && ${BASH} autogen.sh
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 6707ba9933c..dc4cf48fd72 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/12/13 02:35:16 jmcneill Exp $
+$NetBSD: distinfo,v 1.4 2008/12/29 14:57:32 hasso Exp $
SHA1 (WebKit-r39230.tar.bz2) = dd253c9f350519c6e0da9280491a1a7ebf59ae52
RMD160 (WebKit-r39230.tar.bz2) = f13f083c42ac8e0cd2bbe3782019479b453281de
@@ -6,5 +6,5 @@ Size (WebKit-r39230.tar.bz2) = 9897435 bytes
SHA1 (patch-aa) = a89653a6cee06a6573fd8111c0dd35f887782337
SHA1 (patch-ab) = 19d9ac9a362a8c41025775bc60634dc1e5c3c28c
SHA1 (patch-ac) = 85b8bd43f4198daebbd9ae91ccd45d1237d3fa8b
-SHA1 (patch-ad) = 2cb5d09435fa7f2b82f4bc26dc1ed2e7f1792804
+SHA1 (patch-ad) = a37c8987f7f729db40606f7a266515aeab4c1580
SHA1 (patch-ae) = dc873da0b7555fec1ccad382ee776e6a7e0fe0b6
diff --git a/www/webkit-gtk/patches/patch-ad b/www/webkit-gtk/patches/patch-ad
index b88ee59e2a5..efdbbec144d 100644
--- a/www/webkit-gtk/patches/patch-ad
+++ b/www/webkit-gtk/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.2 2008/12/13 02:35:16 jmcneill Exp $
+$NetBSD: patch-ad,v 1.3 2008/12/29 14:57:32 hasso Exp $
---- JavaScriptCore/wtf/Platform.h.orig 2008-12-04 23:38:13.000000000 -0500
-+++ JavaScriptCore/wtf/Platform.h 2008-12-11 20:49:35.000000000 -0500
+--- JavaScriptCore/wtf/Platform.h.orig 2008-12-12 08:58:12 +0200
++++ JavaScriptCore/wtf/Platform.h 2008-12-26 14:02:38 +0200
+@@ -60,7 +60,7 @@
+ /* PLATFORM(FREEBSD) */
+ /* Operating system level dependencies for FreeBSD-like systems that */
+ /* should be used regardless of operating environment */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #define WTF_PLATFORM_FREEBSD 1
+ #endif
+
@@ -71,6 +71,13 @@
#define WTF_PLATFORM_OPENBSD 1
#endif