On Sat, Jul 17, 2010 at 06:28:16PM -0400, Brad wrote:
> On Saturday 17 July 2010 18:12:58 Marco Peereboom wrote:
> > WebKit 1.3.1 is out ;-)
>
> 1.3.3 is too, but those are development releases.
And here's a diff for 1.2.3, tested @amd64/sparc64.
Landry
? libwebkit-1.0.so.2.1
? libwebkit-1.0.so.2.2
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile 3 Jul 2010 07:53:04 -0000 1.30
+++ Makefile 16 Jul 2010 23:27:55 -0000
@@ -2,10 +2,8 @@
COMMENT = open source web browser engine
-V = 1.2.1
-DISTNAME = webkit-${V}
-# XXX do not remove v0. pX comes before vX.
-PKGNAME = webkit-${V}v0
+DISTNAME = webkit-1.2.3
+EPOCH = 0
CATEGORIES = www
HOMEPAGE = http://webkitgtk.org/
@@ -13,7 +11,7 @@
MAINTAINER = Landry Breuil <[email protected]>
-SHARED_LIBS = webkit-1.0 2.1 #.19.2
+SHARED_LIBS = webkit-1.0 2.2 #.19.5
# LGPLv2 / BSD
PERMIT_PACKAGE_CDROM = Yes
@@ -56,17 +54,20 @@
Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c xcb-render \
expat fontconfig freetype gcrypt gio-2.0 glib-2.0 glitz
gmodule-2.0 \
gnutls gobject-2.0 gpg-error gthread-2.0 intl jpeg m \
+ gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 gailutil \
+ gstreamer-0.10 gstbase-0.10 gstvideo-0.10 gstapp-0.10
gstpbutils-0.10 \
+ icudata icui18n icuuc sqlite3 xslt enchant soup-2.4 \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pthread
xcb-render-util \
tasn1 z cairo pixman-1 png pthread-stubs xcb xml2 ${STDCPPLIB}
-LIB_DEPENDS =
gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0,gailutil::x11/gtk+2,-main \
- gstreamer-0.10,gstbase-0.10::multimedia/gstreamer-0.10/core \
-
gstvideo-0.10,gstapp-0.10,gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base
\
- icudata,icui18n,icuuc:icu4c->=4.4:textproc/icu4c \
- sqlite3::databases/sqlite3 \
- xslt::textproc/libxslt \
- enchant::textproc/enchant \
- soup-2.4:libsoup->=2.28:devel/libsoup
+LIB_DEPENDS = ::x11/gtk+2,-main \
+ ::multimedia/gstreamer-0.10/core \
+ ::multimedia/gstreamer-0.10/plugins-base \
+ :icu4c->=4.4:textproc/icu4c \
+ ::databases/sqlite3 \
+ ::textproc/libxslt \
+ ::textproc/enchant \
+ :libsoup->=2.28:devel/libsoup
BUILD_DEPENDS = ::devel/bison \
::devel/flex \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 3 Jul 2010 07:53:04 -0000 1.13
+++ distinfo 16 Jul 2010 23:27:55 -0000
@@ -1,5 +1,5 @@
-MD5 (webkit-1.2.1.tar.gz) = 629HPY175W7NIm591V3Lmw==
-RMD160 (webkit-1.2.1.tar.gz) = +MFYtn+839mXft1TDV+MFeQC2m0=
-SHA1 (webkit-1.2.1.tar.gz) = ztVkUU8L4KiMaW56/WkC2WfVMqI=
-SHA256 (webkit-1.2.1.tar.gz) = ye5VHqtOmHMPoGqqSTzpWCjmxmYewUNh5iVLwjeVot0=
-SIZE (webkit-1.2.1.tar.gz) = 7577236
+MD5 (webkit-1.2.3.tar.gz) = CrXEeKb1t0oa6WvxOkVmYg==
+RMD160 (webkit-1.2.3.tar.gz) = QfoZTeKGWGfb99EVbQlip1gPInU=
+SHA1 (webkit-1.2.3.tar.gz) = iMOOvroYegYicrKqjKK70Lu4YwY=
+SHA256 (webkit-1.2.3.tar.gz) = /3CyXqje3AAx8p8uqNmqImv6ZevS8SdyOQ9OKEUwb+E=
+SIZE (webkit-1.2.3.tar.gz) = 6740030
Index: patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in 3 Jul 2010 07:53:04 -0000 1.8
+++ patches/patch-GNUmakefile_in 16 Jul 2010 23:27:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-GNUmakefile_in,v 1.8 2010/07/03 07:53:04 landry Exp $
install GtkLauncher, remove silent build lines, fix lpthread/pthread
---- GNUmakefile.in.orig Fri May 7 23:03:21 2010
-+++ GNUmakefile.in Thu Jun 24 18:04:00 2010
+--- GNUmakefile.in.orig Thu Jul 15 22:47:03 2010
++++ GNUmakefile.in Fri Jul 16 15:53:17 2010
@@ -82,9 +82,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
@@ -14,7 +14,7 @@
$(am__EXEEXT_1)
# For the Gtk port we want to use XP_UNIX both in X11 and Mac
-@@ -5895,7 +5895,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -5901,7 +5901,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_$(V))
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
@@ -23,7 +23,7 @@
AM_V_at = $(am__v_at_$(V))
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
-@@ -5905,22 +5905,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
+@@ -5911,22 +5911,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_$(V))
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
@@ -50,7 +50,7 @@
SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \
$(libJavaScriptCore_la_SOURCES) \
$(nodist_libJavaScriptCore_la_SOURCES) \
-@@ -8976,9 +8976,10 @@ libJavaScriptCore_la_SOURCES = \
+@@ -8986,9 +8986,10 @@ libJavaScriptCore_la_SOURCES = \
libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \
@@ -63,7 +63,7 @@
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
$(libJavaScriptCore_la_CFLAGS)
-@@ -9027,12 +9028,12 @@ libwebkit_1_0_la_CPPFLAGS = \
+@@ -9037,12 +9038,12 @@ libwebkit_1_0_la_CPPFLAGS = \
$(HILDON_CPPFLAGS)
libwebkit_1_0_la_LDFLAGS = \
@@ -77,7 +77,7 @@
libJavaScriptCore.la \
libWebCoreJS.la \
$(webcore_ldflags) \
-@@ -9094,7 +9095,7 @@ Programs_minidom_CFLAGS = \
+@@ -9104,7 +9105,7 @@ Programs_minidom_CFLAGS = \
Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lm \
