Hi,
here's the usual webkit update needed by the next version of midori..
this time, as they decided to make regular releases of webkit, let's
switch to it instead of blindly updating to a random svn snapshot.
This cleans makefile from autohell dependency, and should be a bit
more sane.
Midori seems to work fine @amd64, still building @sparc64 (but i have
few hope webkit will work there without much work.. and i still have ppc
to test).
Plz test & comment.
Landry
? bigbuild.log
? webkit-115-nmout
? webkit-svn-nmout
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 6 Apr 2009 07:40:30 -0000 1.11
+++ Makefile 22 Apr 2009 22:26:40 -0000
@@ -2,19 +2,17 @@
COMMENT = open source web browser engine
-V = 41894
-DISTNAME = WebKit-r${V}
-PKGNAME = webkit-${V}p0
+V = 1.1.5
+DISTNAME = webkit-${V}
+PKGNAME = webkit-${V}v0
CATEGORIES = www
-EXTRACT_SUFX = .tar.bz2
-HOMEPAGE = http://webkit.org/
-MASTER_SITES = http://builds.nightly.webkit.org/files/trunk/src/
+HOMEPAGE = http://webkitgtk.org/
+MASTER_SITES = ${HOMEPAGE}
MAINTAINER = Landry Breuil <[email protected]>
-SHARED_LIBS = webkit-1.0 0.0 \
- testnetscapeplugin 0.0
+SHARED_LIBS = webkit-1.0 0.1
# LGPLv2 / BSD
PERMIT_PACKAGE_CDROM = Yes
@@ -35,8 +33,6 @@
MODGCC4_ARCHES =*
MODGCC4_LANGS = c c++
-AUTOMAKE_VERSION = 1.9
-AUTOCONF_VERSION = 2.59
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-video
@@ -61,12 +57,6 @@
BUILD_DEPENDS = ::devel/bison \
- ::devel/gperf \
- ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
-pre-configure:
- cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
+ ::devel/gperf
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 4 Apr 2009 10:35:26 -0000 1.5
+++ distinfo 22 Apr 2009 22:26:40 -0000
@@ -1,5 +1,5 @@
-MD5 (WebKit-r41894.tar.bz2) = zklaQuxP6+RPYEcIE06k5Q==
-RMD160 (WebKit-r41894.tar.bz2) = wG6e+dLXFUsCb8lYPIssWh+BbZg=
-SHA1 (WebKit-r41894.tar.bz2) = 0AWry+MFwqeoAM9yIgG1Sw1WttM=
-SHA256 (WebKit-r41894.tar.bz2) = MN1Ngi5iiuBiexeLm5ACaS8kv7voOQPqiUUzAKJd3Iw=
-SIZE (WebKit-r41894.tar.bz2) = 10553068
+MD5 (webkit-1.1.5.tar.gz) = XKfELIMBDUufXu0Vq7XvQg==
+RMD160 (webkit-1.1.5.tar.gz) = aSUVZicaj2R1jHB09p7tYG1HyWg=
+SHA1 (webkit-1.1.5.tar.gz) = CYfOSplQG+nlsv8jNiXkZCMdy1M=
+SHA256 (webkit-1.1.5.tar.gz) = iZ0lmyTzsnwNT6ziwW47+l5lbGgql4AHOTB36KuYnU8=
+SIZE (webkit-1.1.5.tar.gz) = 5878572
Index: patches/patch-GNUmakefile_am
===================================================================
RCS file: patches/patch-GNUmakefile_am
diff -N patches/patch-GNUmakefile_am
--- patches/patch-GNUmakefile_am 4 Apr 2009 10:35:26 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-GNUmakefile_am,v 1.3 2009/04/04 10:35:26 landry Exp $
---- GNUmakefile.am.orig Sun Mar 22 03:21:11 2009
-+++ GNUmakefile.am Mon Mar 23 23:08:39 2009
-@@ -123,9 +123,10 @@ libJavaScriptCore_la_SOURCES = \
-
- libJavaScriptCore_la_LIBADD = \
- $(UNICODE_LIBS) \
-- $(GLIB_LIBS) \
-- -lpthread
-+ $(GLIB_LIBS)
-
-+libJavaScriptCore_la_LDFLAGS = -pthread
-+
- libJavaScriptCore_la_CXXFLAGS = \
- $(global_cxxflags) \
- $(libJavaScriptCore_la_CFLAGS)
-@@ -211,8 +212,9 @@ libWebCore_la_LIBADD = \
- $(HILDON_LIBS) \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
-- $(GEOCLUE_LIBS) \
-- -lpthread
-+ $(GEOCLUE_LIBS)
-+
-+libWebCore_la_LDFLAGS = -pthread
-
- # WebKit
- webkitgtk_h_api :=
Index: patches/patch-GNUmakefile_in
===================================================================
RCS file: patches/patch-GNUmakefile_in
diff -N patches/patch-GNUmakefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-GNUmakefile_in 22 Apr 2009 22:26:40 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- GNUmakefile.in.orig Tue Apr 21 22:29:07 2009
++++ GNUmakefile.in Tue Apr 21 22:30:46 2009
+@@ -5966,9 +5966,10 @@ libJavaScriptCore_la_SOURCES = \
+
+ libJavaScriptCore_la_LIBADD = \
+ $(UNICODE_LIBS) \
+- $(GLIB_LIBS) \
+- -lpthread
++ $(GLIB_LIBS)
+
++libJavaScriptCore_la_LDFLAGS = -pthread
++
+ libJavaScriptCore_la_CXXFLAGS = \
+ $(global_cxxflags) \
+ $(libJavaScriptCore_la_CFLAGS)
+@@ -7481,9 +7482,9 @@ libWebCore_la_LIBADD = \
+ $(HILDON_LIBS) \
+ $(JPEG_LIBS) \
+ $(PNG_LIBS) \
+- $(GEOCLUE_LIBS) \
+- -lpthread
++ $(GEOCLUE_LIBS)
+
++libWebCore_la_LDFLAGS = -pthread
+
+ # WebKit
+ webkitgtk_h_api := WebKit/gtk/webkit/webkit.h \
Index: patches/patch-JavaScriptCore_GNUmakefile_am
===================================================================
RCS file: patches/patch-JavaScriptCore_GNUmakefile_am
diff -N patches/patch-JavaScriptCore_GNUmakefile_am
--- patches/patch-JavaScriptCore_GNUmakefile_am 4 Apr 2009 10:35:26 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.5 2009/04/04 10:35:26 landry
Exp $
---- JavaScriptCore/GNUmakefile.am.orig Thu Feb 26 07:17:57 2009
-+++ JavaScriptCore/GNUmakefile.am Mon Mar 23 23:08:39 2009
-@@ -495,7 +495,7 @@ Programs_minidom_CFLAGS = \
- Programs_minidom_LDADD = \
- libJavaScriptCore.la \
- -lm \
-- -lstdc++
-+ -lestdc++
-
- # jsc
- Programs_jsc_SOURCES = \
Index: patches/patch-autogen_sh
===================================================================
RCS file: patches/patch-autogen_sh
diff -N patches/patch-autogen_sh
--- patches/patch-autogen_sh 8 Mar 2009 20:00:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-autogen_sh,v 1.1 2009/03/08 20:00:41 landry Exp $
---- autogen.sh.orig Sun Feb 15 09:48:56 2009
-+++ autogen.sh Mon Feb 23 19:21:15 2009
-@@ -46,8 +46,6 @@ if test "$DIE" -eq 1; then
- exit 1
- fi
-
--rm -rf $top_srcdir/autom4te.cache
--
- touch README INSTALL
-
- aclocal $ACLOCAL_FLAGS || exit $?
-@@ -57,5 +55,3 @@ automake $AUTOMAKE_FLAGS || exit $?
- autoconf || exit $?
-
- cd $ORIGDIR || exit 1
--
--$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/webkit/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 4 Apr 2009 10:35:26 -0000 1.5
+++ pkg/PLIST 22 Apr 2009 22:26:40 -0000
@@ -34,6 +34,13 @@
lib/libwebkit-1.0.la
lib/pkgconfig/
lib/pkgconfig/webkit-1.0.pc
+share/locale/
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/webkit.mo
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
+share/locale/pt_BR/LC_MESSAGES/webkit.mo
share/webkit-1.0/
share/webkit-1.0/webinspector/
share/webkit-1.0/webinspector/Breakpoint.js
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/midori/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 4 Apr 2009 11:05:08 -0000 1.7
+++ Makefile 23 Apr 2009 20:00:48 -0000
@@ -2,7 +2,7 @@
COMMENT = lightweight web browser
-XFCE_VERSION = 0.1.5
+XFCE_VERSION = 0.1.6
XFCE_GOODIE = midori
MAINTAINER = Landry Breuil <[email protected]>
@@ -20,7 +20,7 @@
DESKTOP_FILES = Yes
NO_REGRESS = Yes
-LIB_DEPENDS = webkit-1.0::www/webkit \
+LIB_DEPENDS = webkit-1.0:webkit->=1.1.5:www/webkit \
idn::devel/libidn \
sqlite3::databases/sqlite3 \
unique-1.0::devel/libunique \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/midori/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 4 Apr 2009 11:05:08 -0000 1.5
+++ distinfo 23 Apr 2009 20:00:48 -0000
@@ -1,5 +1,5 @@
-MD5 (midori-0.1.5.tar.bz2) = 3Mrd60nX3vihnPSXy36r+A==
-RMD160 (midori-0.1.5.tar.bz2) = Wd2/0hM+AT8aBZes/e7ZbN0voI0=
-SHA1 (midori-0.1.5.tar.bz2) = WoPs0UBzWrYyP7Ic13cfvf4gt/g=
-SHA256 (midori-0.1.5.tar.bz2) = zqOEgAZjGAFwlYi4rmgI28do9ittpAhQcwdfJ2MJ/Q0=
-SIZE (midori-0.1.5.tar.bz2) = 371500
+MD5 (midori-0.1.6.tar.bz2) = r+1kB0su0ZWq4XGyF4ZQ4Q==
+RMD160 (midori-0.1.6.tar.bz2) = nPOYG0q+zPLnwYMcrEoK82QQSXY=
+SHA1 (midori-0.1.6.tar.bz2) = QkDsrVIFEP2gAs09oeP09cwfoYQ=
+SHA256 (midori-0.1.6.tar.bz2) = 5swbbainr5m6kpjgy0qseQWV8E4ESX6owrtLSMRP618=
+SIZE (midori-0.1.6.tar.bz2) = 390115
Index: patches/patch-wscript
===================================================================
RCS file: /cvs/ports/www/midori/patches/patch-wscript,v
retrieving revision 1.4
diff -u -r1.4 patch-wscript
--- patches/patch-wscript 4 Apr 2009 11:05:08 -0000 1.4
+++ patches/patch-wscript 23 Apr 2009 20:00:48 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-wscript,v 1.4 2009/04/04 11:05:08 landry Exp $
We don't need those files installed..
---- wscript.orig Sun Mar 22 22:49:18 2009
-+++ wscript Sat Apr 4 12:45:44 2009
-@@ -268,12 +268,8 @@ def build (bld):
+--- wscript.orig Sun Apr 19 22:16:33 2009
++++ wscript Thu Apr 23 21:42:19 2009
+@@ -267,12 +267,8 @@ def build (bld):
if option_enabled ('addons'):
bld.add_subdirs ('extensions')
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/midori/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 4 Apr 2009 11:05:08 -0000 1.5
+++ pkg/PLIST 23 Apr 2009 20:00:48 -0000
@@ -2,10 +2,10 @@
@bin bin/midori
lib/midori/
lib/midori/libcolorful-tabs.so
+lib/midori/libcookie-manager.so
lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
lib/midori/libstatusbar-features.so
-lib/midori/libtab-panel.so
share/applications/midori.desktop
share/doc/midori/
share/doc/midori/user/
@@ -36,6 +36,7 @@
share/locale/fi/LC_MESSAGES/midori.mo
share/locale/fr/LC_MESSAGES/midori.mo
share/locale/gl/LC_MESSAGES/midori.mo
+share/locale/he/LC_MESSAGES/midori.mo
share/locale/hu/LC_MESSAGES/midori.mo
share/locale/id/LC_MESSAGES/midori.mo
share/locale/it/LC_MESSAGES/midori.mo
