aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-05-10 21:19:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-05-10 21:19:08 +0000
commit48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
treeb627baa77f19bb1eab2fa4dee08aab1908131cd0 /x11-toolkits
parentfbdf96410f8e803568c33397323dd9d8d3af995f (diff)
downloadports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.tar.gz
ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.zip
Notes
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/files/patch-eel_eel-background.c29
-rw-r--r--x11-toolkits/gai/Makefile4
-rw-r--r--x11-toolkits/gdl/Makefile5
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist6
-rw-r--r--x11-toolkits/gir-repository-gtk20/Makefile15
-rw-r--r--x11-toolkits/gir-repository-libwnck/Makefile15
-rw-r--r--x11-toolkits/gir-repository-pango/Makefile15
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/Makefile2
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile5
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile4
-rw-r--r--x11-toolkits/gtk20/Makefile9
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-ah6
-rw-r--r--x11-toolkits/gtk20/files/patch-configure14
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in9
-rw-r--r--x11-toolkits/gtk20/pkg-plist16
-rw-r--r--x11-toolkits/gtk30/Makefile9
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-ah6
-rw-r--r--x11-toolkits/gtk30/files/patch-configure14
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in9
-rw-r--r--x11-toolkits/gtk30/pkg-plist16
-rw-r--r--x11-toolkits/gtkdatabox/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile7
-rw-r--r--x11-toolkits/gtkmm24/Makefile6
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist13
-rw-r--r--x11-toolkits/gtksourceview2/Makefile10
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/gtksourceview2/pkg-plist22
-rw-r--r--x11-toolkits/libbonoboui/Makefile6
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist6
-rw-r--r--x11-toolkits/libgail-gnome/Makefile7
-rw-r--r--x11-toolkits/libgail-gnome/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile5
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist19
-rw-r--r--x11-toolkits/libgnomeui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist6
-rw-r--r--x11-toolkits/libwnck/Makefile8
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist8
-rw-r--r--x11-toolkits/pango/Makefile12
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/patch-64bit_safe48
-rw-r--r--x11-toolkits/pango/pkg-plist8
-rw-r--r--x11-toolkits/pangomm/Makefile6
-rw-r--r--x11-toolkits/pangomm/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile10
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome2/Makefile5
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/Makefile6
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist3
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile9
-rw-r--r--x11-toolkits/py-gtksourceview/distinfo6
-rw-r--r--x11-toolkits/py-vte/Makefile2
-rw-r--r--x11-toolkits/unique/Makefile10
-rw-r--r--x11-toolkits/unique/distinfo6
-rw-r--r--x11-toolkits/unique/pkg-plist1
-rw-r--r--x11-toolkits/vte/Makefile6
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/files/patch-configure14
-rw-r--r--x11-toolkits/vte/pkg-plist3
70 files changed, 341 insertions, 256 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index df89028d57d4..31b20c4c0763 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -42,10 +42,7 @@
SUBDIR += gauche-gtk
SUBDIR += gdl
SUBDIR += gigi
- SUBDIR += gir-repository-gtk20
SUBDIR += gir-repository-gtksourceview2
- SUBDIR += gir-repository-libwnck
- SUBDIR += gir-repository-pango
SUBDIR += gir-repository-vte
SUBDIR += gnocl
SUBDIR += gnome-desktop-sharp20
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index a9031e188338..d42958193944 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.84 2009/03/17 13:40:09 kwm Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.88 2010/05/10 04:21:20 marcus Exp $
#
PORTNAME= eel
PORTVERSION= 2.26.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/eel/files/patch-eel_eel-background.c b/x11-toolkits/eel/files/patch-eel_eel-background.c
new file mode 100644
index 000000000000..c7a21e7b8ad8
--- /dev/null
+++ b/x11-toolkits/eel/files/patch-eel_eel-background.c
@@ -0,0 +1,29 @@
+--- eel/eel-background.c.orig 2009-03-02 11:21:55.000000000 -0500
++++ eel/eel-background.c 2010-01-24 01:08:43.000000000 -0500
+@@ -368,7 +368,7 @@ eel_background_ensure_realized (EelBackg
+
+ set_image_properties (background);
+
+- background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg);
++ background->details->background_changes_with_size = gnome_bg_has_multiple_sizes (background->details->bg);
+ background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg,
+ window,
+ entire_width, entire_height,
+@@ -747,7 +747,7 @@ eel_background_set_up_widget (EelBackgro
+ }
+
+ background->details->background_changes_with_size =
+- gnome_bg_changes_with_size (background->details->bg);
++ gnome_bg_has_multiple_sizes (background->details->bg);
+
+ if (background->details->is_desktop && !in_fade) {
+ set_root_pixmap (background, window);
+@@ -1000,7 +1000,7 @@ eel_get_widget_background (GtkWidget *wi
+ gboolean
+ eel_background_is_dark (EelBackground *background)
+ {
+- return gnome_bg_is_dark (background->details->bg);
++ return gnome_bg_is_dark (background->details->bg, background->details->background_entire_width, background->details->background_entire_height);
+ }
+
+ /* handle dropped colors */
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 47f31b4a8d68..8701b3b56fb1 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gai
PORTVERSION= 0.5.10
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits gnome
MASTER_SITES= SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION}
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
USE_BZIP2= yes
USE_GL= gl
USE_SDL= sdl
-USE_GNOME= gnomepanel
+USE_GNOME= gnomepanel libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ENV= SDLCONF=${SDL_CONFIG} \
CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`"
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 61e6fa896468..ddeacf4c4f1b 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.31 2009/11/24 18:15:38 kwm Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.35 2010/03/30 09:44:18 avl Exp $
#
PORTNAME= gdl
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.30.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index 19f7a4702daf..e67756657d02 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-2.28.2.tar.bz2) = 8070b7effb3ca80e7f4f0c90924f6718
-SHA256 (gdl-2.28.2.tar.bz2) = c389c4fa623ce00b5a6da1103f4f4a913e4641e9787d13ba37854f17b9efdcf7
-SIZE (gdl-2.28.2.tar.bz2) = 543823
+MD5 (gdl-2.30.0.tar.bz2) = ce4eef03a36bf6abd9f8cbad4806d7b8
+SHA256 (gdl-2.30.0.tar.bz2) = c3ca19831384ae8570f1e6fc0e6be9b2a5ba0f14592b9f2bbb629be113791453
+SIZE (gdl-2.30.0.tar.bz2) = 535941
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 7e4dc41face9..134610452247 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -38,6 +38,7 @@ share/locale/ast/LC_MESSAGES/gdl-1.mo
share/locale/az/LC_MESSAGES/gdl-1.mo
share/locale/be/LC_MESSAGES/gdl-1.mo
share/locale/bg/LC_MESSAGES/gdl-1.mo
+share/locale/bn/LC_MESSAGES/gdl-1.mo
share/locale/ca/LC_MESSAGES/gdl-1.mo
share/locale/ca@valencia/LC_MESSAGES/gdl-1.mo
share/locale/cs/LC_MESSAGES/gdl-1.mo
@@ -47,6 +48,7 @@ share/locale/dz/LC_MESSAGES/gdl-1.mo
share/locale/el/LC_MESSAGES/gdl-1.mo
share/locale/en_CA/LC_MESSAGES/gdl-1.mo
share/locale/en_GB/LC_MESSAGES/gdl-1.mo
+share/locale/en@shaw/LC_MESSAGES/gdl-1.mo
share/locale/es/LC_MESSAGES/gdl-1.mo
share/locale/et/LC_MESSAGES/gdl-1.mo
share/locale/eu/LC_MESSAGES/gdl-1.mo
@@ -119,11 +121,11 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/ast
diff --git a/x11-toolkits/gir-repository-gtk20/Makefile b/x11-toolkits/gir-repository-gtk20/Makefile
deleted file mode 100644
index 1d064a3e6c23..000000000000
--- a/x11-toolkits/gir-repository-gtk20/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for: gir-repository-gtk20
-# Date created: 07 September 2009
-# Whom: Alexander Logvinov <avl@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/x11-toolkits/gir-repository-gtk20/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $
-#
-
-CATEGORIES= x11-toolkits
-
-MASTERDIR= ${.CURDIR}/../../devel/gir-repository
-
-PKGNAMESUFFIX= -gtk20
-
-.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gir-repository-libwnck/Makefile b/x11-toolkits/gir-repository-libwnck/Makefile
deleted file mode 100644
index d27921f60fea..000000000000
--- a/x11-toolkits/gir-repository-libwnck/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for: gir-repository-libwnck
-# Date created: 12 September 2009
-# Whom: Alexander Logvinov <avl@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/x11-toolkits/gir-repository-libwnck/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $
-#
-
-CATEGORIES= x11-toolkits
-
-MASTERDIR= ${.CURDIR}/../../devel/gir-repository
-
-PKGNAMESUFFIX= -libwnck
-
-.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gir-repository-pango/Makefile b/x11-toolkits/gir-repository-pango/Makefile
deleted file mode 100644
index 5b3a538b3f00..000000000000
--- a/x11-toolkits/gir-repository-pango/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for: gir-repository-pango
-# Date created: 07 September 2009
-# Whom: Alexander Logvinov <avl@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/x11-toolkits/gir-repository-pango/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $
-#
-
-CATEGORIES= x11-toolkits
-
-MASTERDIR= ${.CURDIR}/../../devel/gir-repository
-
-PKGNAMESUFFIX= -pango
-
-.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gnome-desktop-sharp20/Makefile b/x11-toolkits/gnome-desktop-sharp20/Makefile
index 02cbbc605456..da72e8ff552e 100644
--- a/x11-toolkits/gnome-desktop-sharp20/Makefile
+++ b/x11-toolkits/gnome-desktop-sharp20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-desktop-sharp
PORTVERSION= 2.26.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index d27777c86bfd..ba1e433a1384 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-sharp
PORTVERSION= 2.24.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
@@ -21,7 +21,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
-USE_GNOME= gnomehack gnomepanel gtksharp20 librsvg2 vte libgnomeprintui
+USE_GNOME= gnomehack gnomepanel gtksharp20 librsvg2 vte libgnomeprintui \
+ libgnomeui
MAKE_JOBS_UNSAFE= yes
post-patch:
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index ffe7c91a5279..a84eb13f6409 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-sharp
PORTVERSION= 1.0.10
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
USE_GNOME= gnomehack gtkhtml3 vte librsvg2 libgnomecanvas \
- libgnomeprintui libglade2
+ libgnomeprintui libglade2 libgnomeui
USE_AUTOTOOLS= libtool:22
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 2ced9e9b8555..5c3b740e994a 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.18.7
-PORTREVISION?= 1
+PORTVERSION= 2.20.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -29,6 +29,7 @@ LATEST_LINK= gtk20
.if !defined(REFERENCE_PORT)
+BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg \
@@ -37,7 +38,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_GMAKE= yes
-USE_PERL5= yes
+USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack atk pango ltverhack
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index b449668e45d2..cc3c94a0d656 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.18.7.tar.bz2) = e38d0b6801789b5b4c598e84b28fb215
-SHA256 (gnome2/gtk+-2.18.7.tar.bz2) = 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464
-SIZE (gnome2/gtk+-2.18.7.tar.bz2) = 18304767
+MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
+SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
+SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 4d2c63f0d2e2..b6a6a71721f5 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig 2010-01-18 01:13:15.000000000 -0500
-+++ docs/Makefile.in 2010-01-18 01:14:29.000000000 -0500
-@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100
++++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100
+@@ -241,7 +241,7 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure
new file mode 100644
index 000000000000..06a6f7b9fa22
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig 2009-12-26 21:41:27.000000000 +0100
++++ configure 2009-12-26 21:51:04.000000000 +0100
+@@ -33884,9 +33884,9 @@
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 348bb57b8fdb..25056ecf7e03 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig 2010-01-18 01:17:13.000000000 -0500
-+++ gtk/Makefile.in 2010-01-18 01:18:40.000000000 -0500
-@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100
++++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100
+@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
# gtk-update-icon-cache.exe doesn't require any special privileges.
@OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
@@ -10,8 +10,7 @@
gtk_update_icon_cache_LDADD = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(GDK_PIXBUF_DEP_LIBS)
-+ $(GDK_PIXBUF_DEP_LIBS) \
-+ $(GLIB_LIBS)
++ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
gtk_update_icon_cache_SOURCES = \
updateiconcache.c
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 9e9533c6e0f9..28d34b3b06ac 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -88,6 +88,7 @@ include/gtk-2.0/gtk/gtkcellrenderercombo.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrendererprogress.h
include/gtk-2.0/gtk/gtkcellrendererspin.h
+include/gtk-2.0/gtk/gtkcellrendererspinner.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
include/gtk-2.0/gtk/gtkcellrenderertoggle.h
include/gtk-2.0/gtk/gtkcellview.h
@@ -169,6 +170,7 @@ include/gtk-2.0/gtk/gtkmodules.h
include/gtk-2.0/gtk/gtkmountoperation.h
include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
+include/gtk-2.0/gtk/gtkoffscreenwindow.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
include/gtk-2.0/gtk/gtkorientable.h
@@ -213,6 +215,7 @@ include/gtk-2.0/gtk/gtksignal.h
include/gtk-2.0/gtk/gtksizegroup.h
include/gtk-2.0/gtk/gtksocket.h
include/gtk-2.0/gtk/gtkspinbutton.h
+include/gtk-2.0/gtk/gtkspinner.h
include/gtk-2.0/gtk/gtkstatusbar.h
include/gtk-2.0/gtk/gtkstatusicon.h
include/gtk-2.0/gtk/gtkstock.h
@@ -238,6 +241,8 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
include/gtk-2.0/gtk/gtktoolbar.h
include/gtk-2.0/gtk/gtktoolbutton.h
include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolitemgroup.h
+include/gtk-2.0/gtk/gtktoolpalette.h
include/gtk-2.0/gtk/gtktoolshell.h
include/gtk-2.0/gtk/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
@@ -272,6 +277,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h
include/gtk-unix-print-2.0/gtk/gtkprintjob.h
include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
include/gtk-unix-print-2.0/gtk/gtkunixprint.h
+lib/girepository-1.0/Gdk-2.0.typelib
+lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/Gtk-2.0.typelib
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
@@ -317,6 +325,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
@@ -400,6 +411,9 @@ libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-unix-print-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
+share/gir-1.0/Gdk-2.0.gir
+share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/appwindow.c
@@ -446,9 +460,11 @@ share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
share/gtk-2.0/demo/search_entry.c
share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/spinner.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textscroll.c
share/gtk-2.0/demo/textview.c
+share/gtk-2.0/demo/toolpalette.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
share/locale/af/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 2ced9e9b8555..5c3b740e994a 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.18.7
-PORTREVISION?= 1
+PORTVERSION= 2.20.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -29,6 +29,7 @@ LATEST_LINK= gtk20
.if !defined(REFERENCE_PORT)
+BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg \
@@ -37,7 +38,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_GMAKE= yes
-USE_PERL5= yes
+USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack atk pango ltverhack
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index b449668e45d2..cc3c94a0d656 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.18.7.tar.bz2) = e38d0b6801789b5b4c598e84b28fb215
-SHA256 (gnome2/gtk+-2.18.7.tar.bz2) = 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464
-SIZE (gnome2/gtk+-2.18.7.tar.bz2) = 18304767
+MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
+SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
+SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 4d2c63f0d2e2..b6a6a71721f5 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig 2010-01-18 01:13:15.000000000 -0500
-+++ docs/Makefile.in 2010-01-18 01:14:29.000000000 -0500
-@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100
++++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100
+@@ -241,7 +241,7 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
new file mode 100644
index 000000000000..06a6f7b9fa22
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig 2009-12-26 21:41:27.000000000 +0100
++++ configure 2009-12-26 21:51:04.000000000 +0100
+@@ -33884,9 +33884,9 @@
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 348bb57b8fdb..25056ecf7e03 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig 2010-01-18 01:17:13.000000000 -0500
-+++ gtk/Makefile.in 2010-01-18 01:18:40.000000000 -0500
-@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100
++++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100
+@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
# gtk-update-icon-cache.exe doesn't require any special privileges.
@OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
@@ -10,8 +10,7 @@
gtk_update_icon_cache_LDADD = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(GDK_PIXBUF_DEP_LIBS)
-+ $(GDK_PIXBUF_DEP_LIBS) \
-+ $(GLIB_LIBS)
++ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
gtk_update_icon_cache_SOURCES = \
updateiconcache.c
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 9e9533c6e0f9..28d34b3b06ac 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -88,6 +88,7 @@ include/gtk-2.0/gtk/gtkcellrenderercombo.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrendererprogress.h
include/gtk-2.0/gtk/gtkcellrendererspin.h
+include/gtk-2.0/gtk/gtkcellrendererspinner.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
include/gtk-2.0/gtk/gtkcellrenderertoggle.h
include/gtk-2.0/gtk/gtkcellview.h
@@ -169,6 +170,7 @@ include/gtk-2.0/gtk/gtkmodules.h
include/gtk-2.0/gtk/gtkmountoperation.h
include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
+include/gtk-2.0/gtk/gtkoffscreenwindow.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
include/gtk-2.0/gtk/gtkorientable.h
@@ -213,6 +215,7 @@ include/gtk-2.0/gtk/gtksignal.h
include/gtk-2.0/gtk/gtksizegroup.h
include/gtk-2.0/gtk/gtksocket.h
include/gtk-2.0/gtk/gtkspinbutton.h
+include/gtk-2.0/gtk/gtkspinner.h
include/gtk-2.0/gtk/gtkstatusbar.h
include/gtk-2.0/gtk/gtkstatusicon.h
include/gtk-2.0/gtk/gtkstock.h
@@ -238,6 +241,8 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
include/gtk-2.0/gtk/gtktoolbar.h
include/gtk-2.0/gtk/gtktoolbutton.h
include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolitemgroup.h
+include/gtk-2.0/gtk/gtktoolpalette.h
include/gtk-2.0/gtk/gtktoolshell.h
include/gtk-2.0/gtk/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
@@ -272,6 +277,9 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h
include/gtk-unix-print-2.0/gtk/gtkprintjob.h
include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
include/gtk-unix-print-2.0/gtk/gtkunixprint.h
+lib/girepository-1.0/Gdk-2.0.typelib
+lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/Gtk-2.0.typelib
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
@@ -317,6 +325,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
@@ -400,6 +411,9 @@ libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-unix-print-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
+share/gir-1.0/Gdk-2.0.gir
+share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/appwindow.c
@@ -446,9 +460,11 @@ share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
share/gtk-2.0/demo/search_entry.c
share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/spinner.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textscroll.c
share/gtk-2.0/demo/textview.c
+share/gtk-2.0/demo/toolpalette.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
share/locale/af/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index eaa90f9433b9..e6aaedfd0d83 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -54,6 +54,8 @@ post-patch:
's|@libglade_moduledir@|@prefix@/lib/libglade/2.0|g ; \
s|@glade_moduledir@|@prefix@/lib/glade3/modules|g ; \
s|@glade_catalogdir@|@prefix@/share/glade3/catalogs|g'
+ @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/gtk/Makefile.in ${WRKSRC}/examples/Makefile.in
post-install:
.if !defined(NOPORTEXAMPLES)
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index a784c10cb38b..f573ae8201cf 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 1.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= SF
DIST_SUBDIR= gnome2
@@ -23,4 +23,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
+ -e 's|-DGDK_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/examples/Makefile.in ${WRKSRC}/gtk/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index ded2d73a98dc..c1c10669a7e3 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,12 +3,12 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.55 2009/10/04 09:39:21 kwm Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.64 2010/05/04 14:03:00 kwm Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.18.2
-PORTREVISION?= 2
+PORTVERSION= 2.20.3
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index e0749a3452c3..2e84b722cd80 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.18.2.tar.bz2) = 3e43e9eef1da8988a76a2815d6b31c91
-SHA256 (gnome2/gtkmm-2.18.2.tar.bz2) = dfc003e22ecdc046cbae731b24e077ed87efa0f9ca57a0735dfe716c560b474e
-SIZE (gnome2/gtkmm-2.18.2.tar.bz2) = 12215352
+MD5 (gnome2/gtkmm-2.20.3.tar.bz2) = c35f236091b4f96fe45c53b4107400a9
+SHA256 (gnome2/gtkmm-2.20.3.tar.bz2) = 311d2156f15cdbdce22cb2af6e606a3f621d7dfebea6f7b1be0132e81af90585
+SIZE (gnome2/gtkmm-2.20.3.tar.bz2) = 12554334
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 93d068b38611..52ebe7996fe5 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -112,6 +112,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/aspectframe.h
include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h
include/gtkmm-%%API_VERSION%%/gtkmm/base.h
include/gtkmm-%%API_VERSION%%/gtkmm/bin.h
+include/gtkmm-%%API_VERSION%%/gtkmm/border.h
include/gtkmm-%%API_VERSION%%/gtkmm/box.h
include/gtkmm-%%API_VERSION%%/gtkmm/builder.h
include/gtkmm-%%API_VERSION%%/gtkmm/button.h
@@ -126,6 +127,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderercombo.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererpixbuf.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererprogress.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspin.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspinner.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertext.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertoggle.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellview.h
@@ -145,6 +147,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/dialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/drawingarea.h
include/gtkmm-%%API_VERSION%%/gtkmm/editable.h
include/gtkmm-%%API_VERSION%%/gtkmm/entry.h
+include/gtkmm-%%API_VERSION%%/gtkmm/entrybuffer.h
include/gtkmm-%%API_VERSION%%/gtkmm/entrycompletion.h
include/gtkmm-%%API_VERSION%%/gtkmm/enums.h
include/gtkmm-%%API_VERSION%%/gtkmm/eventbox.h
@@ -187,6 +190,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/messagedialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/misc.h
include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h
include/gtkmm-%%API_VERSION%%/gtkmm/object.h
+include/gtkmm-%%API_VERSION%%/gtkmm/offscreenwindow.h
include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h
include/gtkmm-%%API_VERSION%%/gtkmm/orientable.h
include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h
@@ -225,6 +229,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendereraccel_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderercombo_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererpixbuf_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererprogress_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspinner_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspin_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertext_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertoggle_p.h
@@ -243,6 +248,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/dialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/drawingarea_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/editable_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/entry_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/entrybuffer_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/entrycompletion_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/enums_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/eventbox_p.h
@@ -283,6 +289,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/messagedialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/offscreenwindow_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/orientable_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h
@@ -325,6 +332,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/settings_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/sizegroup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/spinner_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/stockitem_p.h
@@ -345,7 +353,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/togglebutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitemgroup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/toolpalette_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/toolshell_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h
@@ -397,6 +407,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/settings.h
include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h
include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
+include/gtkmm-%%API_VERSION%%/gtkmm/spinner.h
include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h
include/gtkmm-%%API_VERSION%%/gtkmm/statusicon.h
include/gtkmm-%%API_VERSION%%/gtkmm/stock.h
@@ -421,6 +432,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h
include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/toolitemgroup.h
+include/gtkmm-%%API_VERSION%%/gtkmm/toolpalette.h
include/gtkmm-%%API_VERSION%%/gtkmm/toolshell.h
include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h
include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index c203c523a2f2..46b6bc84632b 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.81 2009/09/28 23:56:18 avl Exp $
+# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.91 2010/04/26 20:58:21 kwm Exp $
#
PORTNAME= gtksourceview2
-PORTVERSION= 2.8.2
-PORTREVISION?= 2
+PORTVERSION= 2.10.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,9 +26,9 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
-USE_GNOME= gnomeprefix gnomehack gtk20 libxml2 intlhack \
+USE_GNOME= gnomeprefix gnomehack gtk20 gconf2 libxml2 intlhack \
ltverhack referencehack
-CONFIGURE_ARGS= --enable-compile-warnings=no
+CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 8295928c22a8..7563d67fe951 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.8.2.tar.bz2) = 5ce481d3aa7d639fe4508530b184158c
-SHA256 (gnome2/gtksourceview-2.8.2.tar.bz2) = 36521143b0c28def4fcc012b60392c58f8fea3b735d9f5b052772ec9b4001fd5
-SIZE (gnome2/gtksourceview-2.8.2.tar.bz2) = 1092117
+MD5 (gnome2/gtksourceview-2.10.1.tar.bz2) = 1ed3eae620ec95b82baae9de6600af22
+SHA256 (gnome2/gtksourceview-2.10.1.tar.bz2) = ac8bcb8a8e1c4cc2681de142750bf78daa3b877c19a53c3d1d8412ad4d01b387
+SIZE (gnome2/gtksourceview-2.10.1.tar.bz2) = 1240083
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index 7316c0d22815..df3b628d20eb 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -1,4 +1,11 @@
+include/gtksourceview-2.0/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h
+include/gtksourceview-2.0/gtksourceview/gtksourcecompletion.h
+include/gtksourceview-2.0/gtksourceview/gtksourcecompletioncontext.h
+include/gtksourceview-2.0/gtksourceview/gtksourcecompletioninfo.h
+include/gtksourceview-2.0/gtksourceview/gtksourcecompletionitem.h
+include/gtksourceview-2.0/gtksourceview/gtksourcecompletionproposal.h
+include/gtksourceview-2.0/gtksourceview/gtksourcecompletionprovider.h
include/gtksourceview-2.0/gtksourceview/gtksourcegutter.h
include/gtksourceview-2.0/gtksourceview/gtksourceiter.h
include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h
@@ -8,6 +15,7 @@ include/gtksourceview-2.0/gtksourceview/gtksourceprintcompositor.h
include/gtksourceview-2.0/gtksourceview/gtksourcestyle.h
include/gtksourceview-2.0/gtksourceview/gtksourcestylescheme.h
include/gtksourceview-2.0/gtksourceview/gtksourcestyleschememanager.h
+include/gtksourceview-2.0/gtksourceview/gtksourceundomanager.h
include/gtksourceview-2.0/gtksourceview/gtksourceview-typebuiltins.h
include/gtksourceview-2.0/gtksourceview/gtksourceview.h
lib/libgtksourceview-2.0.a
@@ -19,8 +27,10 @@ share/gtksourceview-2.0/language-specs/R.lang
share/gtksourceview-2.0/language-specs/ada.lang
share/gtksourceview-2.0/language-specs/asp.lang
share/gtksourceview-2.0/language-specs/awk.lang
+share/gtksourceview-2.0/language-specs/bibtex.lang
share/gtksourceview-2.0/language-specs/boo.lang
share/gtksourceview-2.0/language-specs/c.lang
+share/gtksourceview-2.0/language-specs/cg.lang
share/gtksourceview-2.0/language-specs/changelog.lang
share/gtksourceview-2.0/language-specs/chdr.lang
share/gtksourceview-2.0/language-specs/check.sh
@@ -41,8 +51,10 @@ share/gtksourceview-2.0/language-specs/dpatch.lang
share/gtksourceview-2.0/language-specs/dtd.lang
share/gtksourceview-2.0/language-specs/eiffel.lang
share/gtksourceview-2.0/language-specs/erlang.lang
+share/gtksourceview-2.0/language-specs/fcl.lang
share/gtksourceview-2.0/language-specs/forth.lang
share/gtksourceview-2.0/language-specs/fortran.lang
+share/gtksourceview-2.0/language-specs/fsharp.lang
share/gtksourceview-2.0/language-specs/gap.lang
share/gtksourceview-2.0/language-specs/glsl.lang
share/gtksourceview-2.0/language-specs/gtk-doc.lang
@@ -71,6 +83,7 @@ share/gtksourceview-2.0/language-specs/objc.lang
share/gtksourceview-2.0/language-specs/ocaml.lang
share/gtksourceview-2.0/language-specs/ocl.lang
share/gtksourceview-2.0/language-specs/octave.lang
+share/gtksourceview-2.0/language-specs/ooc.lang
share/gtksourceview-2.0/language-specs/pascal.lang
share/gtksourceview-2.0/language-specs/perl.lang
share/gtksourceview-2.0/language-specs/php.lang
@@ -82,6 +95,7 @@ share/gtksourceview-2.0/language-specs/rpmspec.lang
share/gtksourceview-2.0/language-specs/ruby.lang
share/gtksourceview-2.0/language-specs/scheme.lang
share/gtksourceview-2.0/language-specs/sh.lang
+share/gtksourceview-2.0/language-specs/sparql.lang
share/gtksourceview-2.0/language-specs/sql.lang
share/gtksourceview-2.0/language-specs/styles.rng
share/gtksourceview-2.0/language-specs/t2t.lang
@@ -102,6 +116,7 @@ share/gtksourceview-2.0/styles/styles.rng
share/gtksourceview-2.0/styles/tango.xml
share/locale/ar/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/as/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ast/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/az/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/be/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/bg/LC_MESSAGES/gtksourceview-2.0.mo
@@ -116,6 +131,7 @@ share/locale/da/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/de/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/dz/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/el/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/en_CA/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/en_GB/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/es/LC_MESSAGES/gtksourceview-2.0.mo
@@ -178,6 +194,8 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo
@dirrm share/gtksourceview-2.0/styles
@dirrm share/gtksourceview-2.0/language-specs
@dirrm share/gtksourceview-2.0
+@dirrm include/gtksourceview-2.0/gtksourceview/completion-providers/words
+@dirrm include/gtksourceview-2.0/gtksourceview/completion-providers
@dirrm include/gtksourceview-2.0/gtksourceview
@dirrm include/gtksourceview-2.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -200,11 +218,15 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo
@dirrmtry share/locale/mg
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 29ac5db0d67f..e50032d25152 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.71 2009/09/26 13:42:02 marcus Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.73 2010/04/02 17:56:10 kwm Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.24.2
-PORTREVISION?= 2
+PORTVERSION= 2.24.3
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 793d24c2a721..4953d1fe3e2c 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.24.2.tar.bz2) = 3c206eccc97730c02366a2f698c40ed2
-SHA256 (gnome/libbonoboui-2.24.2.tar.bz2) = aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00
-SIZE (gnome/libbonoboui-2.24.2.tar.bz2) = 961498
+MD5 (gnome/libbonoboui-2.24.3.tar.bz2) = 3a754b1df0a4d5fd4836a05020a0bb4a
+SHA256 (gnome/libbonoboui-2.24.3.tar.bz2) = 0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84
+SIZE (gnome/libbonoboui-2.24.3.tar.bz2) = 926983
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index b8c6f7506a5b..34ed3af15609 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -51,6 +51,7 @@ share/locale/af/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/as/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ast/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
@@ -65,6 +66,7 @@ share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/dz/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_CA/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
@@ -172,11 +174,15 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index e4fab031c875..c6a0391e57d5 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.21 2007/09/17 13:13:59 ahze Exp $
+# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.24 2010/04/01 13:23:49 kwm Exp $
#
PORTNAME= libgail-gnome
-PORTVERSION= 1.20.1
-PORTREVISION= 3
+PORTVERSION= 1.20.2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +20,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack gnomepanel atspi
+USE_GNOME= gnomeprefix gnomehack gnomepanel libgnomeui atspi
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
PLIST_FILES= lib/gtk-2.0/modules/libgail-gnome.la \
diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo
index 285f02a71b09..05d3a402416f 100644
--- a/x11-toolkits/libgail-gnome/distinfo
+++ b/x11-toolkits/libgail-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgail-gnome-1.20.1.tar.bz2) = 5c5b71af5a8ab2a9403bdae52b20e46c
-SHA256 (gnome2/libgail-gnome-1.20.1.tar.bz2) = 848485971628ff9be294e2b3ad5410b184e4bf99c1112a767f7ac78bdc0b5d5d
-SIZE (gnome2/libgail-gnome-1.20.1.tar.bz2) = 242952
+MD5 (gnome2/libgail-gnome-1.20.2.tar.bz2) = b58d4f6903e4d5c8b01c6694b41c5a22
+SHA256 (gnome2/libgail-gnome-1.20.2.tar.bz2) = 28efea7aaa7351735129b851214ffc6a8595fae9c4fd0967b1bbfb6553d27382
+SIZE (gnome2/libgail-gnome-1.20.2.tar.bz2) = 245266
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 27b8ffbdaa32..a56414b5374a 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.71 2008/09/22 14:00:52 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.73 2010/04/01 15:43:24 kwm Exp $
#
PORTNAME= libgnomeprintui
-PORTVERSION= 2.18.4
-PORTREVISION= 3
+PORTVERSION= 2.18.5
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index b279bd4d1776..f84fbf9c543d 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.18.4.tar.bz2) = e76d763f6279b900a63e5fb2909f8810
-SHA256 (gnome2/libgnomeprintui-2.18.4.tar.bz2) = 19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490
-SIZE (gnome2/libgnomeprintui-2.18.4.tar.bz2) = 722306
+MD5 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 66c1cf3a9ead428585c2c44e6110ebb7
+SHA256 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 48ef73621dc2d208f81031dc87d18757879761ca176df80f46fafcfd9af9449f
+SIZE (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 677362
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 1303f5421d10..4af223e8b72f 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -34,20 +34,25 @@ share/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml
share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/as/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ast/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/be@latin/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bn_IN/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/br/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/bs/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ca@valencia/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/dz/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/en@shaw/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -75,12 +80,14 @@ share/locale/la/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/mai/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/mr/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/nb/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/nds/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ne/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -133,15 +140,27 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/la/LC_MESSAGES
@dirrmtry share/locale/la
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index fed9c1a13151..968444c685ed 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.125 2009/09/26 13:42:02 marcus Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.127 2010/04/01 14:39:51 kwm Exp $
#
PORTNAME= libgnomeui
-PORTVERSION= 2.24.2
-PORTREVISION?= 2
+PORTVERSION= 2.24.3
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index b85a2bdc9b1e..f68637521994 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.24.2.tar.bz2) = d455674fa1a477903dbfcf603f060172
-SHA256 (gnome2/libgnomeui-2.24.2.tar.bz2) = ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910
-SIZE (gnome2/libgnomeui-2.24.2.tar.bz2) = 1526889
+MD5 (gnome2/libgnomeui-2.24.3.tar.bz2) = ceab6f4370581d1a03c09f15cc103099
+SHA256 (gnome2/libgnomeui-2.24.3.tar.bz2) = 04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803
+SIZE (gnome2/libgnomeui-2.24.3.tar.bz2) = 1401560
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 97a37fcbbee6..a22a6f1b05ff 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -79,6 +79,7 @@ share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/dz/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/eo/LC_MESSAGES/libgnomeui-2.0.mo
@@ -118,6 +119,7 @@ share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nb/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/nds/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
@@ -187,6 +189,8 @@ share/pixmaps/gnome-about-logo.png
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@@ -203,6 +207,8 @@ share/pixmaps/gnome-about-logo.png
@dirrmtry share/locale/hy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/crh/LC_MESSAGES
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 69b9164bf1cb..1c66cd1360c7 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.123 2009/09/22 09:04:57 kwm Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.128 2010/04/02 03:07:33 avl Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.28.0
-PORTREVISION?= 2
+PORTVERSION= 2.30.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +20,9 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
USE_GETTEXT= yes
USE_XORG= xres
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index df07325bdc85..31d17586a03a 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.28.0.tar.bz2) = a9311661aa954e7c918439b6dd578792
-SHA256 (gnome2/libwnck-2.28.0.tar.bz2) = d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947
-SIZE (gnome2/libwnck-2.28.0.tar.bz2) = 712289
+MD5 (gnome2/libwnck-2.30.0.tar.bz2) = ed79955dabb606ee0e6d112a291005ad
+SHA256 (gnome2/libwnck-2.30.0.tar.bz2) = d35bcc28548945915da4f5cafd0555606f972e236cc5f9dbb0186186dfbf5247
+SIZE (gnome2/libwnck-2.30.0.tar.bz2) = 705602
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 2c3e5ed5c403..3a2ee65c80ef 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -17,9 +17,11 @@ lib/libwnck-1.la
lib/libwnck-1.so
lib/libwnck-1.so.22
libdata/pkgconfig/libwnck-1.0.pc
+lib/girepository-1.0/Wnck-1.0.typelib
share/locale/am/LC_MESSAGES/libwnck.mo
share/locale/ar/LC_MESSAGES/libwnck.mo
share/locale/as/LC_MESSAGES/libwnck.mo
+share/locale/ast/LC_MESSAGES/libwnck.mo
share/locale/az/LC_MESSAGES/libwnck.mo
share/locale/be/LC_MESSAGES/libwnck.mo
share/locale/be@latin/LC_MESSAGES/libwnck.mo
@@ -36,6 +38,7 @@ share/locale/da/LC_MESSAGES/libwnck.mo
share/locale/de/LC_MESSAGES/libwnck.mo
share/locale/dz/LC_MESSAGES/libwnck.mo
share/locale/el/LC_MESSAGES/libwnck.mo
+share/locale/en@shaw/LC_MESSAGES/libwnck.mo
share/locale/en_CA/LC_MESSAGES/libwnck.mo
share/locale/en_GB/LC_MESSAGES/libwnck.mo
share/locale/eo/LC_MESSAGES/libwnck.mo
@@ -102,6 +105,7 @@ share/locale/xh/LC_MESSAGES/libwnck.mo
share/locale/zh_CN/LC_MESSAGES/libwnck.mo
share/locale/zh_HK/LC_MESSAGES/libwnck.mo
share/locale/zh_TW/LC_MESSAGES/libwnck.mo
+share/gir-1.0/Wnck-1.0.gir
@dirrm include/libwnck-1.0/libwnck
@dirrm include/libwnck-1.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -128,6 +132,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/crh/LC_MESSAGES
@@ -138,5 +144,7 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index e7e9efa4611c..f2a26a2dbd3c 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pango/Makefile,v 1.149 2009/11/18 11:00:12 kwm Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.154 2010/04/01 12:08:27 kwm Exp $
#
PORTNAME= pango
-PORTVERSION= 1.26.2
-PORTREVISION?= 2
+PORTVERSION= 1.28.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -21,10 +21,12 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
- ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
+ ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 5898a42f1887..10f84879f6ae 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.26.2.tar.bz2) = f30212b8833af3ce5c82121dc309e3d0
-SHA256 (gnome2/pango-1.26.2.tar.bz2) = 3b85879e5d8794555d10a2b79428071c99a93b7502ccbef50360ae44c77c3e08
-SIZE (gnome2/pango-1.26.2.tar.bz2) = 1536011
+MD5 (gnome2/pango-1.28.0.tar.bz2) = 545ae8becf7ed74008120f96f4b095f4
+SHA256 (gnome2/pango-1.28.0.tar.bz2) = 68480485b714e3570a58c270add9e9785fa78068f7410949b478e8a9d3f5bc40
+SIZE (gnome2/pango-1.28.0.tar.bz2) = 1500538
diff --git a/x11-toolkits/pango/files/patch-64bit_safe b/x11-toolkits/pango/files/patch-64bit_safe
deleted file mode 100644
index 54c00ddc82ea..000000000000
--- a/x11-toolkits/pango/files/patch-64bit_safe
+++ /dev/null
@@ -1,48 +0,0 @@
-From 952847a6e2d53b33cea39d13255fd0f7c8075942 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Tue, 23 Feb 2010 21:44:55 +0000
-Subject: Make blob unlocking 64bit-safe
-
-Bug 604128 - Applications crash when displaying Hebrew characters
----
-diff --git a/pango/opentype/hb-blob.c b/pango/opentype/hb-blob.c
-index 107cd43..3348a38 100644
---- pango.orig/opentype/hb-blob.c
-+++ pango/opentype/hb-blob.c
-@@ -243,18 +243,18 @@ static hb_bool_t
- _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
- {
- #if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT)
-- unsigned int pagesize = -1, mask, length;
-+ uintptr_t pagesize = -1, mask, length;
- const char *addr;
-
- #if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
-- pagesize = (unsigned int) sysconf (_SC_PAGE_SIZE);
-+ pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE);
- #elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
-- pagesize = (unsigned int) sysconf (_SC_PAGESIZE);
-+ pagesize = (uintptr_t) sysconf (_SC_PAGESIZE);
- #elif defined(HAVE_GETPAGESIZE)
-- pagesize = (unsigned int) getpagesize ();
-+ pagesize = (uintptr_t) getpagesize ();
- #endif
-
-- if ((unsigned int) -1 == pagesize) {
-+ if ((uintptr_t) -1L == pagesize) {
- #if HB_DEBUG_BLOB
- fprintf (stderr, "%p %s: failed to get pagesize: %s\n", blob, __FUNCTION__, strerror (errno));
- #endif
-@@ -265,8 +265,8 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
- #endif
-
- mask = ~(pagesize-1);
-- addr = (const char *) (((size_t) blob->data) & mask);
-- length = (const char *) (((size_t) blob->data + blob->length + pagesize-1) & mask) - addr;
-+ addr = (const char *) (((uintptr_t) blob->data) & mask);
-+ length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr;
- #if HB_DEBUG_BLOB
- fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n",
- blob, __FUNCTION__,
---
-cgit v0.8.3.1
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 1998b5ed4e6e..fc4b01635654 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -36,6 +36,10 @@ include/pango-1.0/pango/pangoft2.h
%%X11%%include/pango-1.0/pango/pangox.h
%%X11%%include/pango-1.0/pango/pangoxft-render.h
%%X11%%include/pango-1.0/pango/pangoxft.h
+lib/girepository-1.0/Pango-1.0.typelib
+lib/girepository-1.0/PangoCairo-1.0.typelib
+lib/girepository-1.0/PangoFT2-1.0.typelib
+lib/girepository-1.0/PangoXft-1.0.typelib
lib/libpango-1.0.a
lib/libpango-1.0.la
lib/libpango-1.0.so
@@ -97,6 +101,10 @@ libdata/pkgconfig/pangocairo.pc
libdata/pkgconfig/pangoft2.pc
%%X11%%libdata/pkgconfig/pangox.pc
%%X11%%libdata/pkgconfig/pangoxft.pc
+share/gir-1.0/Pango-1.0.gir
+share/gir-1.0/PangoCairo-1.0.gir
+share/gir-1.0/PangoFT2-1.0.gir
+share/gir-1.0/PangoXft-1.0.gir
@dirrm lib/pango/%%VERSION%%/modules
@dirrm lib/pango/%%VERSION%%
@dirrm lib/pango
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index 0fa6c91238b4..9702d6248d89 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.13 2009/09/21 17:22:55 kwm Exp $
+# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.16 2010/05/04 12:49:38 kwm Exp $
#
PORTNAME= pangomm
-PORTVERSION= 2.26.0
-PORTREVISION?= 1
+PORTVERSION= 2.26.2
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
index 2b1ff4ca292a..b6b07fba1ad4 100644
--- a/x11-toolkits/pangomm/distinfo
+++ b/x11-toolkits/pangomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pangomm-2.26.0.tar.bz2) = 37f54dc8e6cb73ed923b22f313352156
-SHA256 (gnome2/pangomm-2.26.0.tar.bz2) = bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e
-SIZE (gnome2/pangomm-2.26.0.tar.bz2) = 982857
+MD5 (gnome2/pangomm-2.26.2.tar.bz2) = b363b09faf884db8bf8d1458d719ff00
+SHA256 (gnome2/pangomm-2.26.2.tar.bz2) = 0d20fd80d35f7df01138e24b2ab4a70974c6652528a905605e3173a6955fa739
+SIZE (gnome2/pangomm-2.26.2.tar.bz2) = 979801
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index dfcb93050bf5..64dccee8dc70 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.91 2009/09/21 20:15:50 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.99 2010/04/04 09:58:25 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTVERSION= 2.30.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,11 +21,11 @@ COMMENT= A set of Python bindings used by modules in the GNOME Desktop
BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
- totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \
+ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
gnome-keyring:${PORTSDIR}/security/gnome-keyring \
brasero-media.2:${PORTSDIR}/sysutils/brasero \
- evdocument.1:${PORTSDIR}/graphics/evince
+ evdocument.2:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
USE_BZIP2= yes
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 162c4e063592..0bf947c661ae 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = d97bb3d8e1adc00505be060fbc832f44
-SHA256 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f
-SIZE (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 613169
+MD5 (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = a6d448d46a6b3062ce7a1b6a9fddfb48
+SHA256 (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = db997a3c81967d6dc7210dd83e06f18ac6417f804f672e42f15a1d68af371f49
+SIZE (gnome2/gnome-python-desktop-2.30.0.tar.bz2) = 621785
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index a9931c1e9fd2..1e950356c24f 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.58 2009/09/21 19:32:26 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.60 2010/04/02 20:22:15 kwm Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index ed7191ac1594..a9744d70773c 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.28.0.tar.bz2) = b627abbb0ed912e221cc072e3dd6f9d6
-SHA256 (gnome2/gnome-python-2.28.0.tar.bz2) = f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c
-SIZE (gnome2/gnome-python-2.28.0.tar.bz2) = 560872
+MD5 (gnome2/gnome-python-2.28.1.tar.bz2) = a17ad952813ed86f520de8e07194a2bf
+SHA256 (gnome2/gnome-python-2.28.1.tar.bz2) = 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8
+SIZE (gnome2/gnome-python-2.28.1.tar.bz2) = 562220
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 1cab1bd8b1c8..00c3338b34c0 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,12 +3,12 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.65 2009/08/23 18:58:07 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.69 2009/12/27 16:45:09 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.16.0
-PORTREVISION= 2
+PORTVERSION= 2.17.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 44b98e279e92..659add33eae8 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.16.0.tar.bz2) = bd0d437fefd6d5390f5d770a495cd50c
-SHA256 (gnome2/pygtk-2.16.0.tar.bz2) = 7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8
-SIZE (gnome2/pygtk-2.16.0.tar.bz2) = 2253202
+MD5 (gnome2/pygtk-2.17.0.tar.bz2) = 43d704343d7ca04a6e4ddd4fa73a3c55
+SHA256 (gnome2/pygtk-2.17.0.tar.bz2) = 6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400
+SIZE (gnome2/pygtk-2.17.0.tar.bz2) = 2260394
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 3644393e6a62..c48a984657e7 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -702,6 +702,7 @@ share/pygtk/2.0/defs/gdk-2.10.defs
share/pygtk/2.0/defs/gdk-2.12.defs
share/pygtk/2.0/defs/gdk-2.14.defs
share/pygtk/2.0/defs/gdk-2.16.defs
+share/pygtk/2.0/defs/gdk-2.18.defs
share/pygtk/2.0/defs/gdk-base-types.defs
share/pygtk/2.0/defs/gdk-base.defs
share/pygtk/2.0/defs/gdk-types.defs
@@ -714,6 +715,8 @@ share/pygtk/2.0/defs/gtk-2.14-types.defs
share/pygtk/2.0/defs/gtk-2.14.defs
share/pygtk/2.0/defs/gtk-2.16-types.defs
share/pygtk/2.0/defs/gtk-2.16.defs
+share/pygtk/2.0/defs/gtk-2.18-types.defs
+share/pygtk/2.0/defs/gtk-2.18.defs
share/pygtk/2.0/defs/gtk-base-types.defs
share/pygtk/2.0/defs/gtk-base.defs
share/pygtk/2.0/defs/gtk-extrafuncs.defs
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 645ee12dfa58..9d85d62bb8ee 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -3,12 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.20 2009/09/22 08:25:11 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.24 2010/04/19 11:30:28 kwm Exp $
#
PORTNAME= gtksourceview
-PORTVERSION= 2.8.0
-PORTREVISION= 2
+PORTVERSION= 2.10.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,8 +24,4 @@ USE_PYTHON= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docs
-post-patch:
- @${REINPLACE_CMD} -e 's| == x| = x|g' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo
index f0d42509325f..cc89b39df62f 100644
--- a/x11-toolkits/py-gtksourceview/distinfo
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygtksourceview-2.8.0.tar.bz2) = bc344044113a52026b4eb7e433a24c29
-SHA256 (pygtksourceview-2.8.0.tar.bz2) = 27f531270b46285982573089a58a19d622174ad9a4568e12d8fa4aedbfc174da
-SIZE (pygtksourceview-2.8.0.tar.bz2) = 269696
+MD5 (pygtksourceview-2.10.1.tar.bz2) = 2654354d61422fb79d8375fc3a3b5393
+SHA256 (pygtksourceview-2.10.1.tar.bz2) = b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974
+SIZE (pygtksourceview-2.10.1.tar.bz2) = 290249
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index f01d8b91e366..73993810c4bb 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.3 2009/02/24 19:42:18 kwm Exp $
#
-PORTREVISION= 5
+PORTREVISION= 0
CATEGORIES= x11-toolkits gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 4f20bb6dc93b..4876d901327d 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -3,24 +3,22 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/unique/Makefile,v 1.3 2009/10/03 02:27:43 marcus Exp $
+# $MCom: ports/x11-toolkits/unique/Makefile,v 1.7 2010/01/09 18:22:39 marcus Exp $
#
PORTNAME= unique
-PORTVERSION= 1.1.2
-PORTREVISION= 2
+PORTVERSION= 1.1.6
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
DISTNAME= lib${PORTNAME}-${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
-COMMENT= Library for single instance applications.
+COMMENT= Library for single instance applications
-BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
-RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
USE_XORG= ice
+USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/unique/distinfo b/x11-toolkits/unique/distinfo
index 445ab3a96808..da0ec5211baf 100644
--- a/x11-toolkits/unique/distinfo
+++ b/x11-toolkits/unique/distinfo
@@ -1,3 +1,3 @@
-MD5 (libunique-1.1.2.tar.gz) = a99799e72779baa98352fbac7f91c910
-SHA256 (libunique-1.1.2.tar.gz) = ccf73a90a66477d6d31e50aeabebad8e0035f80e98ac0e926157c3d7e229b31e
-SIZE (libunique-1.1.2.tar.gz) = 431459
+MD5 (libunique-1.1.6.tar.bz2) = 7955769ef31f1bc4f83446dbb3625e6d
+SHA256 (libunique-1.1.6.tar.bz2) = e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb
+SIZE (libunique-1.1.6.tar.bz2) = 335534
diff --git a/x11-toolkits/unique/pkg-plist b/x11-toolkits/unique/pkg-plist
index c82fa3a05818..37507d0570cf 100644
--- a/x11-toolkits/unique/pkg-plist
+++ b/x11-toolkits/unique/pkg-plist
@@ -1,6 +1,7 @@
include/unique-1.0/unique/unique.h
include/unique-1.0/unique/uniqueapp.h
include/unique-1.0/unique/uniquebackend.h
+include/unique-1.0/unique/uniqueenumtypes.h
include/unique-1.0/unique/uniquemessage.h
include/unique-1.0/unique/uniqueversion.h
lib/girepository-1.0/Unique-1.0.typelib
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 7eceda11a159..27e6fe1c8488 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.104 2009/11/17 21:15:44 kwm Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.110 2010/04/26 22:38:09 kwm Exp $
#
PORTNAME= vte
-PORTVERSION= 0.22.5
-PORTREVISION?= 2
+PORTVERSION= 0.24.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 786a0be68291..267035e24189 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.22.5.tar.bz2) = cbb17696e40ee175977bf165ef838da2
-SHA256 (gnome2/vte-0.22.5.tar.bz2) = c0987126347e12daf2bf9b772b6c58ddf8a922f5b8341470ed578d9fcea7b2f6
-SIZE (gnome2/vte-0.22.5.tar.bz2) = 1351975
+MD5 (gnome2/vte-0.24.1.tar.bz2) = 3b66116e930dde00e1ddbf8277066ea7
+SHA256 (gnome2/vte-0.24.1.tar.bz2) = a4b287881993602884db2c5be0ed9e4bed2265091ef91671fe43fc8d5921e00c
+SIZE (gnome2/vte-0.24.1.tar.bz2) = 1312731
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index e9fe9010769e..bfc8e7c5cdf5 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Tue Feb 13 16:22:38 2007
-+++ configure Tue Feb 13 16:23:19 2007
-@@ -24887,7 +24887,7 @@ fi
-
+--- configure.orig 2010-03-30 14:43:41.000000000 +0200
++++ configure 2010-03-30 14:47:26.000000000 +0200
+@@ -14102,7 +14102,7 @@
+ # Check for PTY handling functions.
-for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
+for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt posix_openpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 33a0070c4553..cd7b59f00ac3 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -20,6 +20,7 @@ share/locale/am/LC_MESSAGES/vte.mo
share/locale/ang/LC_MESSAGES/vte.mo
share/locale/ar/LC_MESSAGES/vte.mo
share/locale/as/LC_MESSAGES/vte.mo
+share/locale/ast/LC_MESSAGES/vte.mo
share/locale/az/LC_MESSAGES/vte.mo
share/locale/be/LC_MESSAGES/vte.mo
share/locale/be@latin/LC_MESSAGES/vte.mo
@@ -146,6 +147,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
@dirrmtry share/locale/ang/LC_MESSAGES