summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-10-24 23:37:25 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-10-24 23:37:25 +0000
commit4acc6fb2a411b291c9c210d82bafe7c62e71c77d (patch)
treebc16420eb52d65511ceb520c00171d219210a473 /x11-toolkits
parentMark as broken on amd64-7 (and, presumably, sparc64-7). (diff)
Presenting GNOME 2.20.1 and all related works for FreeBSD. The official
GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338
Notes
Notes: svn path=/head/; revision=201947
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/distinfo6
-rw-r--r--x11-toolkits/eel/pkg-plist6
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gal/pkg-plist70
-rw-r--r--x11-toolkits/gal2/Makefile4
-rw-r--r--x11-toolkits/gal2/pkg-plist70
-rw-r--r--x11-toolkits/gauche-gtk/Makefile2
-rw-r--r--x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub13
-rw-r--r--x11-toolkits/gdl/Makefile3
-rw-r--r--x11-toolkits/gdl/pkg-plist10
-rw-r--r--x11-toolkits/gtk20/Makefile20
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-ak2
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c2
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h31
-rw-r--r--x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c24
-rw-r--r--x11-toolkits/gtk20/pkg-plist34
-rw-r--r--x11-toolkits/gtk30/Makefile20
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-ak2
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c2
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h31
-rw-r--r--x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c24
-rw-r--r--x11-toolkits/gtk30/pkg-plist34
-rw-r--r--x11-toolkits/gtkmm24/Makefile4
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist10
-rw-r--r--x11-toolkits/gtksourceview-sharp/Makefile1
-rw-r--r--x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in2
-rw-r--r--x11-toolkits/gtksourceview/Makefile4
-rw-r--r--x11-toolkits/gtksourceview/pkg-plist94
-rw-r--r--x11-toolkits/gtksourceview2-reference/Makefile11
-rw-r--r--x11-toolkits/gtksourceview2-reference/pkg-descr1
-rw-r--r--x11-toolkits/gtksourceview2/Makefile38
-rw-r--r--x11-toolkits/gtksourceview2/distinfo3
-rw-r--r--x11-toolkits/gtksourceview2/pkg-descr2
-rw-r--r--x11-toolkits/gtksourceview2/pkg-plist177
-rw-r--r--x11-toolkits/guile-gnome/Makefile4
-rw-r--r--x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in3
-rw-r--r--x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in3
-rw-r--r--x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs3
-rw-r--r--x11-toolkits/guile-gnome/pkg-plist42
-rw-r--r--x11-toolkits/inti/Makefile8
-rw-r--r--x11-toolkits/libbonoboui/Makefile6
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/files/patch-Makefile.in6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist13
-rw-r--r--x11-toolkits/libgail-gnome/Makefile5
-rw-r--r--x11-toolkits/libgail-gnome/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile6
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist12
-rw-r--r--x11-toolkits/libgnomeui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c28
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist12
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile5
-rw-r--r--x11-toolkits/libgnomeuimm26/distinfo6
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist9
-rw-r--r--x11-toolkits/pango/Makefile16
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/pkg-plist1
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile7
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile8
-rw-r--r--x11-toolkits/py-gnome-extras/distinfo6
-rw-r--r--x11-toolkits/py-gnome-extras/pkg-plist8
-rw-r--r--x11-toolkits/py-gnome2/Makefile5
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/Makefile4
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist4
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile31
-rw-r--r--x11-toolkits/py-gtksourceview/distinfo3
-rw-r--r--x11-toolkits/py-gtksourceview/pkg-descr4
-rw-r--r--x11-toolkits/py-gtksourceview/pkg-plist4
-rw-r--r--x11-toolkits/ruby-gtk2/Makefile2
-rw-r--r--x11-toolkits/ruby-gtk2/pkg-plist4
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/pkg-plist6
85 files changed, 694 insertions, 448 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index dd6d82b2d04f..d0303fce74d4 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -81,6 +81,8 @@
SUBDIR += gtksourceview
SUBDIR += gtksourceview-reference
SUBDIR += gtksourceview-sharp
+ SUBDIR += gtksourceview2
+ SUBDIR += gtksourceview2-reference
SUBDIR += gtkunique
SUBDIR += gtoolkit
SUBDIR += guile-gnome
@@ -193,6 +195,7 @@
SUBDIR += py-gtkextra
SUBDIR += py-gtkglext
SUBDIR += py-gtkscintilla
+ SUBDIR += py-gtksourceview
SUBDIR += py-gui
SUBDIR += py-kde
SUBDIR += py-kiwi
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 3fc6812d74ba..41f8f44c5f63 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.51 2007/03/12 15:59:00 ahze Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.60 2007/09/18 14:12:45 ahze Exp $
#
PORTNAME= eel
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index e0ec62e7ef0b..24738bf2d84b 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.18.3.tar.bz2) = c51fea61eb99eaa7995754b8acf787ff
-SHA256 (gnome2/eel-2.18.3.tar.bz2) = ff84e4947638fa24e02aebb2d12d1f29c045e3a5384fbc346919a1558a016b6f
-SIZE (gnome2/eel-2.18.3.tar.bz2) = 643862
+MD5 (gnome2/eel-2.20.0.tar.bz2) = 691734dc1078e05e726b4f5b8646dadf
+SHA256 (gnome2/eel-2.20.0.tar.bz2) = ba35db646ce069ee66a92fa95d10aff583e00e6039b1b5bb0fa6036742fddd70
+SIZE (gnome2/eel-2.20.0.tar.bz2) = 647919
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index cdffed51de80..fac1807dce3c 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -100,6 +100,7 @@ share/locale/nb/LC_MESSAGES/eel-2.0.mo
share/locale/ne/LC_MESSAGES/eel-2.0.mo
share/locale/nl/LC_MESSAGES/eel-2.0.mo
share/locale/nn/LC_MESSAGES/eel-2.0.mo
+share/locale/oc/LC_MESSAGES/eel-2.0.mo
share/locale/or/LC_MESSAGES/eel-2.0.mo
share/locale/pa/LC_MESSAGES/eel-2.0.mo
share/locale/pl/LC_MESSAGES/eel-2.0.mo
@@ -108,6 +109,7 @@ share/locale/pt_BR/LC_MESSAGES/eel-2.0.mo
share/locale/ro/LC_MESSAGES/eel-2.0.mo
share/locale/ru/LC_MESSAGES/eel-2.0.mo
share/locale/rw/LC_MESSAGES/eel-2.0.mo
+share/locale/si/LC_MESSAGES/eel-2.0.mo
share/locale/sk/LC_MESSAGES/eel-2.0.mo
share/locale/sl/LC_MESSAGES/eel-2.0.mo
share/locale/sq/LC_MESSAGES/eel-2.0.mo
@@ -133,8 +135,12 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/ky/LC_MESSAGES
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 82f0f6d4ef80..e97e654c05ec 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.24
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.24
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index 69860b6edeb3..b46b4d3bafb0 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -149,33 +149,33 @@ libdata/pkgconfig/gal.pc
%%DOCSDIR%%/gal.hierarchy
%%DOCSDIR%%/gal.signals
%%DOCSDIR%%/gal.types
-share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
-share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/etable/%%VERSION%%/glade/e-table-group.glade
-share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
-share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/gal/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+share/etable/%%VERSION%%/glade/e-table-config-no-group.glade
+share/etable/%%VERSION%%/glade/e-table-config.glade
+share/etable/%%VERSION%%/glade/e-table-field-chooser.glade
+share/etable/%%VERSION%%/glade/e-table-group.glade
+%%DATADIR%%/%%VERSION%%/glade/e-categories-master-list-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-categories.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+%%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_birthday_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_business_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_favorites_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_gifts_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_goals_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_holiday_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_ideas_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_international_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_personal_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_status_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_strategies_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
+%%DATADIR%%/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
share/locale/az/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo
@@ -208,14 +208,14 @@ share/locale/tr/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
-@dirrm share/gnome/gal/%%VERSION%%/pixmaps/categories
-@dirrm share/gnome/gal/%%VERSION%%/pixmaps
-@dirrm share/gnome/gal/%%VERSION%%/glade
-@dirrm share/gnome/gal/%%VERSION%%
-@dirrm share/gnome/gal
-@dirrm share/gnome/etable/%%VERSION%%/glade
-@dirrm share/gnome/etable/%%VERSION%%
-@dirrm share/gnome/etable
+@dirrm %%DATADIR%%/%%VERSION%%/pixmaps/categories
+@dirrm %%DATADIR%%/%%VERSION%%/pixmaps
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
+@dirrm share/etable/%%VERSION%%/glade
+@dirrm share/etable/%%VERSION%%
+@dirrm share/etable
@dirrm %%DOCSDIR%%/gal
@dirrm %%DOCSDIR%%
@dirrm include/gal-1.0/gal/widgets
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index f865d412d9c8..135a82205632 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gal2/Makefile,v 1.52 2005/08/19 13:26:41 marcus Exp $
+# $MCom: ports/x11-toolkits/gal2/Makefile,v 1.54 2007/05/23 14:37:18 ahze Exp $
#
PORTNAME= gal2
PORTVERSION= 2.5.3
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index ee4b7e591fd4..77571357565d 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -158,32 +158,32 @@ lib/libgal-a11y-%%SHLIBVERSION%%.la
lib/libgal-a11y-%%SHLIBVERSION%%.so
lib/libgal-a11y-%%SHLIBVERSION%%.so.0
libdata/pkgconfig/gal-%%VERSION%%.pc
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-field-chooser.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-categories.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-define-views.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-categories-master-list-dialog.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config-no-group.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-config.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/e-table-field-chooser.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-categories.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-define-views.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/glade/gal-view-new-dialog.glade
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_birthday_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_business_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_favorites_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_gifts_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_goals_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday-cards_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_holiday_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_hot-contacts_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_ideas_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_international_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_key-customer_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_miscellaneous_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_personal_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_phonecalls_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_status_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_strategies_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_suppliers_16.png
+share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories/category_time-and-expenses_16.png
share/locale/am/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gal-%%VERSION%%.mo
@@ -245,15 +245,11 @@ share/locale/vi/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gal-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%/glade
-@dirrm share/gnome/gal-%%VERSION%%/%%PORTVERSION%%
-@dirrm share/gnome/gal-%%VERSION%%
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps/categories
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%/pixmaps
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%/glade
+@dirrm share/gal-%%VERSION%%/%%PORTVERSION%%
+@dirrm share/gal-%%VERSION%%
@dirrm include/gal-%%VERSION%%/gal/widgets
@dirrm include/gal-%%VERSION%%/gal/util
@dirrm include/gal-%%VERSION%%/gal/shortcut-bar
@@ -265,3 +261,7 @@ share/locale/zh_TW/LC_MESSAGES/gal-%%VERSION%%.mo
@dirrm include/gal-%%VERSION%%/gal/a11y
@dirrm include/gal-%%VERSION%%/gal
@dirrm include/gal-%%VERSION%%
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 3709c5d55f2f..895001a62f21 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gauche
PORTVERSION= 0.4.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits scheme
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gauche
diff --git a/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub b/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub
index 346af66453d1..03d0ba0d4336 100644
--- a/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub
+++ b/x11-toolkits/gauche-gtk/files/patch-src_gtktexttag.stub
@@ -1,14 +1,15 @@
---- src/gtktexttag.stub.orig Sat Dec 10 22:21:57 2005
-+++ src/gtktexttag.stub Sat Dec 10 22:22:07 2005
-@@ -36,7 +36,6 @@
+--- src/gtktexttag.stub.orig 2004-06-26 23:59:48.000000000 -0400
++++ src/gtktexttag.stub 2007-10-24 15:07:15.000000000 -0400
+@@ -35,8 +35,6 @@
+ (editable-set :type <uint>)
(language-set :type <uint>)
(pad1 :type <uint>)
- (pad2 :type <uint>)
+- (pad2 :type <uint>)
- (pad3 :type <uint>)
)
(allocator (c "Scm_GtkObjectAllocate"))
)
-@@ -85,8 +84,6 @@
+@@ -85,8 +83,6 @@
(is-text :type <uint>)
(pad1 :type <uint>)
(pad2 :type <uint>)
@@ -17,7 +18,7 @@
)
(allocator "return Scm_MakeGtkTextAppearance(NULL);")
)
-@@ -128,8 +125,6 @@
+@@ -128,8 +124,6 @@
(realized :type <uint>)
(pad1 :type <uint>)
(pad2 :type <uint>)
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 9ae98081fa23..19bb58cbca37 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.8 2007/02/16 18:14:27 mezz Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.15 2007/09/09 22:45:27 mezz Exp $
#
PORTNAME= gdl
PORTVERSION= 0.7.7
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index e7690f48fc00..db77788e39ee 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -24,7 +24,7 @@ lib/libgdl-gnome-1.so
lib/libgdl-gnome-1.so.0
libdata/pkgconfig/gdl-1.0.pc
libdata/pkgconfig/gdl-gnome-1.0.pc
-share/gnome/gdl/glade/layout.glade
+share/gdl/glade/layout.glade
share/locale/am/LC_MESSAGES/gdl-1.mo
share/locale/ar/LC_MESSAGES/gdl-1.mo
share/locale/az/LC_MESSAGES/gdl-1.mo
@@ -64,11 +64,11 @@ share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo
share/locale/sv/LC_MESSAGES/gdl-1.mo
share/locale/vi/LC_MESSAGES/gdl-1.mo
share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
+@dirrm share/gdl/glade
+@dirrm share/gdl
+@dirrm include/libgdl-1.0/gdl
+@dirrm include/libgdl-1.0
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrm share/gnome/gdl/glade
-@dirrm share/gnome/gdl
-@dirrm include/libgdl-1.0/gdl
-@dirrm include/libgdl-1.0
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 02f312ec599d..14da84939ea3 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,21 +3,21 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.120 2007/10/17 07:12:55 mezz Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.10.14
-PORTREVISION?= 3
+PORTVERSION= 2.12.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/v2.10/ \
+ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -41,11 +41,11 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
-USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 xaw8 xbitmaps \
- xcomposite xcursor xdamage xdmcp xevie xext xfixes xfont xfontcache xft xi \
- xinerama xkbfile xkbui xmu xmuu xp xpm xprintapputil xprintutil \
- xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc \
- xxf86vm
+USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \
+ xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \
+ xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \
+ xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \
+ xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 266f7458bd20..636864095eb5 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.14.tar.bz2) = 018d7dd0fa7de01cfdb77c7c55e7ba26
-SHA256 (gnome2/gtk+-2.10.14.tar.bz2) = d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-SIZE (gnome2/gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gnome2/gtk+-2.12.1.tar.bz2) = c46f34addc2fe3ea6756055d59fb8856
+SHA256 (gnome2/gtk+-2.12.1.tar.bz2) = 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
+SIZE (gnome2/gtk+-2.12.1.tar.bz2) = 15856678
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index 27156d238e58..f8dda5cbffaf 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,6 +1,6 @@
$FreeBSD$
- $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+ $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.21 2007/04/26 17:22:32 marcus Exp $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
index c33fc40e8264..e0fd02d4fbac 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -5,7 +5,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/";
ptr = xdg_data_dirs;
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
index 266d74c22365..b64106809ef6 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -1,25 +1,12 @@
---- gtk/xdgmime/xdgmimecache.h.orig Mon May 29 20:04:24 2006
-+++ gtk/xdgmime/xdgmimecache.h Mon May 29 20:11:42 2006
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
+--- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400
++++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
-+#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents)
#endif
- extern XdgMimeCache **_caches;
diff --git a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
deleted file mode 100644
index 612f57b60af0..000000000000
--- a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig 2007-07-16 15:45:18.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c 2007-10-01 14:27:17.000000000 -0400
-@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
- httpClearFields(request->http);
- httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
- httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
-- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+ httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
-
- if (httpPost(request->http, request->resource))
- {
-@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
- }
-
- httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
-- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
-
- if (httpGet(request->http, request->resource))
- {
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 05b3430cf44f..462c4c459bfa 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,10 +1,12 @@
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -68,6 +70,8 @@ include/gtk-2.0/gtk/gtkbbox.h
include/gtk-2.0/gtk/gtkbin.h
include/gtk-2.0/gtk/gtkbindings.h
include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
include/gtk-2.0/gtk/gtkbutton.h
include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
@@ -177,6 +181,7 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
include/gtk-2.0/gtk/gtkrecentchooser.h
include/gtk-2.0/gtk/gtkrecentchooserdialog.h
include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -185,6 +190,7 @@ include/gtk-2.0/gtk/gtkrecentfilter.h
include/gtk-2.0/gtk/gtkrecentmanager.h
include/gtk-2.0/gtk/gtkruler.h
include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
include/gtk-2.0/gtk/gtkscrollbar.h
include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
@@ -220,6 +226,7 @@ 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/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
@@ -239,6 +246,7 @@ include/gtk-2.0/gtk/gtkvbbox.h
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
include/gtk-2.0/gtk/gtkvpaned.h
include/gtk-2.0/gtk/gtkvruler.h
include/gtk-2.0/gtk/gtkvscale.h
@@ -268,6 +276,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
@@ -363,11 +374,13 @@ share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/appwindow.c
share/gtk-2.0/demo/assistant.c
share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/changedisplay.c
share/gtk-2.0/demo/clipboard.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
@@ -481,6 +494,8 @@ share/locale/ia/LC_MESSAGES/gtk20-properties.mo
share/locale/ia/LC_MESSAGES/gtk20.mo
share/locale/id/LC_MESSAGES/gtk20-properties.mo
share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
share/locale/is/LC_MESSAGES/gtk20-properties.mo
share/locale/is/LC_MESSAGES/gtk20.mo
share/locale/it/LC_MESSAGES/gtk20-properties.mo
@@ -521,6 +536,8 @@ share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
share/locale/or/LC_MESSAGES/gtk20-properties.mo
share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -537,8 +554,6 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo
share/locale/ru/LC_MESSAGES/gtk20.mo
share/locale/rw/LC_MESSAGES/gtk20-properties.mo
share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
share/locale/sk/LC_MESSAGES/gtk20-properties.mo
share/locale/sk/LC_MESSAGES/gtk20.mo
share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -571,8 +586,8 @@ share/locale/ur/LC_MESSAGES/gtk20-properties.mo
share/locale/ur/LC_MESSAGES/gtk20.mo
share/locale/uz/LC_MESSAGES/gtk20-properties.mo
share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
share/locale/wa/LC_MESSAGES/gtk20-properties.mo
@@ -597,6 +612,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm share/themes/Emacs/gtk-2.0-key
@dirrm share/themes/Emacs
@dirrm share/themes/Default/gtk-2.0-key
+@dirrm share/themes/Default
@dirrm share/gtk-2.0/demo
@dirrm share/gtk-2.0
@dirrm include/gtk-unix-print-2.0/gtk
@@ -624,8 +640,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@Latn/LC_MESSAGES
-@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
@dirrmtry share/locale/tt/LC_MESSAGES
@@ -634,10 +650,10 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -646,6 +662,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/mi
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
@dirrmtry share/locale/ia
@dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 02f312ec599d..14da84939ea3 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,21 +3,21 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.120 2007/10/17 07:12:55 mezz Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.10.14
-PORTREVISION?= 3
+PORTVERSION= 2.12.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/v2.10/ \
+ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -41,11 +41,11 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
-USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 xaw8 xbitmaps \
- xcomposite xcursor xdamage xdmcp xevie xext xfixes xfont xfontcache xft xi \
- xinerama xkbfile xkbui xmu xmuu xp xpm xprintapputil xprintutil \
- xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc \
- xxf86vm
+USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \
+ xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \
+ xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \
+ xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \
+ xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 266f7458bd20..636864095eb5 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.14.tar.bz2) = 018d7dd0fa7de01cfdb77c7c55e7ba26
-SHA256 (gnome2/gtk+-2.10.14.tar.bz2) = d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-SIZE (gnome2/gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gnome2/gtk+-2.12.1.tar.bz2) = c46f34addc2fe3ea6756055d59fb8856
+SHA256 (gnome2/gtk+-2.12.1.tar.bz2) = 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
+SIZE (gnome2/gtk+-2.12.1.tar.bz2) = 15856678
diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak
index 27156d238e58..f8dda5cbffaf 100644
--- a/x11-toolkits/gtk30/files/patch-ak
+++ b/x11-toolkits/gtk30/files/patch-ak
@@ -1,6 +1,6 @@
$FreeBSD$
- $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+ $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.21 2007/04/26 17:22:32 marcus Exp $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
index c33fc40e8264..e0fd02d4fbac 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
+++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c
@@ -5,7 +5,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/";
ptr = xdg_data_dirs;
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
index 266d74c22365..b64106809ef6 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
+++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -1,25 +1,12 @@
---- gtk/xdgmime/xdgmimecache.h.orig Mon May 29 20:04:24 2006
-+++ gtk/xdgmime/xdgmimecache.h Mon May 29 20:11:42 2006
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
+--- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400
++++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
-+#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents)
#endif
- extern XdgMimeCache **_caches;
diff --git a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
deleted file mode 100644
index 612f57b60af0..000000000000
--- a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig 2007-07-16 15:45:18.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c 2007-10-01 14:27:17.000000000 -0400
-@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
- httpClearFields(request->http);
- httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
- httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
-- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+ httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
-
- if (httpPost(request->http, request->resource))
- {
-@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
- }
-
- httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
-- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
-
- if (httpGet(request->http, request->resource))
- {
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 05b3430cf44f..462c4c459bfa 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,10 +1,12 @@
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -68,6 +70,8 @@ include/gtk-2.0/gtk/gtkbbox.h
include/gtk-2.0/gtk/gtkbin.h
include/gtk-2.0/gtk/gtkbindings.h
include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
include/gtk-2.0/gtk/gtkbutton.h
include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
@@ -177,6 +181,7 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
include/gtk-2.0/gtk/gtkrecentchooser.h
include/gtk-2.0/gtk/gtkrecentchooserdialog.h
include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -185,6 +190,7 @@ include/gtk-2.0/gtk/gtkrecentfilter.h
include/gtk-2.0/gtk/gtkrecentmanager.h
include/gtk-2.0/gtk/gtkruler.h
include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
include/gtk-2.0/gtk/gtkscrollbar.h
include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
@@ -220,6 +226,7 @@ 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/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
@@ -239,6 +246,7 @@ include/gtk-2.0/gtk/gtkvbbox.h
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
include/gtk-2.0/gtk/gtkvpaned.h
include/gtk-2.0/gtk/gtkvruler.h
include/gtk-2.0/gtk/gtkvscale.h
@@ -268,6 +276,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
@@ -363,11 +374,13 @@ share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/appwindow.c
share/gtk-2.0/demo/assistant.c
share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/changedisplay.c
share/gtk-2.0/demo/clipboard.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
@@ -481,6 +494,8 @@ share/locale/ia/LC_MESSAGES/gtk20-properties.mo
share/locale/ia/LC_MESSAGES/gtk20.mo
share/locale/id/LC_MESSAGES/gtk20-properties.mo
share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
share/locale/is/LC_MESSAGES/gtk20-properties.mo
share/locale/is/LC_MESSAGES/gtk20.mo
share/locale/it/LC_MESSAGES/gtk20-properties.mo
@@ -521,6 +536,8 @@ share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
share/locale/or/LC_MESSAGES/gtk20-properties.mo
share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -537,8 +554,6 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo
share/locale/ru/LC_MESSAGES/gtk20.mo
share/locale/rw/LC_MESSAGES/gtk20-properties.mo
share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
share/locale/sk/LC_MESSAGES/gtk20-properties.mo
share/locale/sk/LC_MESSAGES/gtk20.mo
share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -571,8 +586,8 @@ share/locale/ur/LC_MESSAGES/gtk20-properties.mo
share/locale/ur/LC_MESSAGES/gtk20.mo
share/locale/uz/LC_MESSAGES/gtk20-properties.mo
share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
share/locale/wa/LC_MESSAGES/gtk20-properties.mo
@@ -597,6 +612,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm share/themes/Emacs/gtk-2.0-key
@dirrm share/themes/Emacs
@dirrm share/themes/Default/gtk-2.0-key
+@dirrm share/themes/Default
@dirrm share/gtk-2.0/demo
@dirrm share/gtk-2.0
@dirrm include/gtk-unix-print-2.0/gtk
@@ -624,8 +640,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@Latn/LC_MESSAGES
-@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
@dirrmtry share/locale/tt/LC_MESSAGES
@@ -634,10 +650,10 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -646,6 +662,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/mi
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
@dirrmtry share/locale/ia
@dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 4357cb06eba6..6cf4f3eb3f92 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.20 2006/08/22 03:45:28 marcus Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.30 2007/10/06 21:55:43 mezz Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.10.11
+PORTVERSION= 2.12.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index e89aeb38c3d4..565d0a270cb4 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.10.11.tar.bz2) = 999e1b6f23bcc69c9effbeaf71686adc
-SHA256 (gnome2/gtkmm-2.10.11.tar.bz2) = 7d935422776f4a6de266f327d8d087df35352ea58ee6ff7a89b52533414e31af
-SIZE (gnome2/gtkmm-2.10.11.tar.bz2) = 8173151
+MD5 (gnome2/gtkmm-2.12.1.tar.bz2) = b2dbd8c9d69062c51dfd2835faef9cf1
+SHA256 (gnome2/gtkmm-2.12.1.tar.bz2) = 6b26d4e0d614bee8285c299d7550cb58799e6fba19a5db4a5e3d83258c24f610
+SIZE (gnome2/gtkmm-2.12.1.tar.bz2) = 13325799
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 62028444fdcd..e405a27dcd87 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -110,6 +110,7 @@ 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/box.h
+include/gtkmm-%%API_VERSION%%/gtkmm/builder.h
include/gtkmm-%%API_VERSION%%/gtkmm/button.h
include/gtkmm-%%API_VERSION%%/gtkmm/buttonbox.h
include/gtkmm-%%API_VERSION%%/gtkmm/calendar.h
@@ -208,6 +209,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/aspectframe_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/assistant_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/bin_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/box_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/builder_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/button_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/buttonbox_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/calendar_p.h
@@ -296,6 +298,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/radiomenuitem_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/radiotoolbutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/range_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/rc_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentaction_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooser_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchoosermenu_p.h
@@ -305,6 +308,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/recentinfo_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/recentmanager_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/ruler_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/scale_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/scalebutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/scrolledwindow_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/selectiondata_p.h
@@ -336,6 +340,7 @@ 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/toolitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragdest_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragsource_p.h
@@ -352,6 +357,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/treeview_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/treeviewcolumn_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/uimanager_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/viewport_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/volumebutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/widget_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/window_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/progressbar.h
@@ -362,6 +368,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/radiomenuitem.h
include/gtkmm-%%API_VERSION%%/gtkmm/radiotoolbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/range.h
include/gtkmm-%%API_VERSION%%/gtkmm/rc.h
+include/gtkmm-%%API_VERSION%%/gtkmm/recentaction.h
include/gtkmm-%%API_VERSION%%/gtkmm/recentchooser.h
include/gtkmm-%%API_VERSION%%/gtkmm/recentchooserdialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/recentchoosermenu.h
@@ -371,6 +378,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/recentinfo.h
include/gtkmm-%%API_VERSION%%/gtkmm/recentmanager.h
include/gtkmm-%%API_VERSION%%/gtkmm/ruler.h
include/gtkmm-%%API_VERSION%%/gtkmm/scale.h
+include/gtkmm-%%API_VERSION%%/gtkmm/scalebutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
include/gtkmm-%%API_VERSION%%/gtkmm/scrolledwindow.h
include/gtkmm-%%API_VERSION%%/gtkmm/selectiondata.h
@@ -406,6 +414,7 @@ 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/tooltip.h
include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h
include/gtkmm-%%API_VERSION%%/gtkmm/treedragdest.h
include/gtkmm-%%API_VERSION%%/gtkmm/treedragsource.h
@@ -424,6 +433,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/treeview_private.h
include/gtkmm-%%API_VERSION%%/gtkmm/treeviewcolumn.h
include/gtkmm-%%API_VERSION%%/gtkmm/uimanager.h
include/gtkmm-%%API_VERSION%%/gtkmm/viewport.h
+include/gtkmm-%%API_VERSION%%/gtkmm/volumebutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/widget.h
include/gtkmm-%%API_VERSION%%/gtkmm/window.h
include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index 05123ae08745..16d0becb2e7c 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtksourceview-sharp
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://go-mono.com/sources/gtksourceview-sharp-2.0/
DISTNAME= ${PORTNAME}-2.0-${PORTVERSION}
diff --git a/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in b/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
index 4f842eb419c4..d36422d0ca56 100644
--- a/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
+++ b/x11-toolkits/gtksourceview-sharp/files/patch-Makefile.in
@@ -5,7 +5,7 @@
DISTCLEANFILES = gtksourceview-sharp-2.0.pc
EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp-2.0.pc.in gtk-sharp.snk
-extra_langdir = $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
-+extra_langdir = $(prefix)/share/gnome/gtksourceview-1.0/language-specs
++extra_langdir = $(prefix)/share/gtksourceview-1.0/language-specs
extra_lang_DATA = nemerle.lang vbnet.lang
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index b4f7705b9694..2c769257c55c 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.43 2006/10/02 00:40:29 ahze Exp $
+# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.46 2007/05/19 21:36:33 marcus Exp $
#
PORTNAME= gtksourceview
PORTVERSION= 1.8.5
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index fc1b38d8b2bb..910a7199dd6d 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -15,51 +15,51 @@ lib/libgtksourceview-1.0.la
lib/libgtksourceview-1.0.so
lib/libgtksourceview-1.0.so.0
libdata/pkgconfig/gtksourceview-1.0.pc
-share/gnome/gtksourceview-1.0/language-specs/R.lang
-share/gnome/gtksourceview-1.0/language-specs/ada.lang
-share/gnome/gtksourceview-1.0/language-specs/boo.lang
-share/gnome/gtksourceview-1.0/language-specs/c.lang
-share/gnome/gtksourceview-1.0/language-specs/changelog.lang
-share/gnome/gtksourceview-1.0/language-specs/cpp.lang
-share/gnome/gtksourceview-1.0/language-specs/csharp.lang
-share/gnome/gtksourceview-1.0/language-specs/css.lang
-share/gnome/gtksourceview-1.0/language-specs/d.lang
-share/gnome/gtksourceview-1.0/language-specs/desktop.lang
-share/gnome/gtksourceview-1.0/language-specs/diff.lang
-share/gnome/gtksourceview-1.0/language-specs/docbook.lang
-share/gnome/gtksourceview-1.0/language-specs/fortran.lang
-share/gnome/gtksourceview-1.0/language-specs/gtkrc.lang
-share/gnome/gtksourceview-1.0/language-specs/haskell.lang
-share/gnome/gtksourceview-1.0/language-specs/html.lang
-share/gnome/gtksourceview-1.0/language-specs/idl.lang
-share/gnome/gtksourceview-1.0/language-specs/ini.lang
-share/gnome/gtksourceview-1.0/language-specs/java.lang
-share/gnome/gtksourceview-1.0/language-specs/javascript.lang
-share/gnome/gtksourceview-1.0/language-specs/language.dtd
-share/gnome/gtksourceview-1.0/language-specs/language.rng
-share/gnome/gtksourceview-1.0/language-specs/latex.lang
-share/gnome/gtksourceview-1.0/language-specs/lua.lang
-share/gnome/gtksourceview-1.0/language-specs/makefile.lang
-share/gnome/gtksourceview-1.0/language-specs/msil.lang
-share/gnome/gtksourceview-1.0/language-specs/nemerle.lang
-share/gnome/gtksourceview-1.0/language-specs/ocaml.lang
-share/gnome/gtksourceview-1.0/language-specs/octave.lang
-share/gnome/gtksourceview-1.0/language-specs/pascal.lang
-share/gnome/gtksourceview-1.0/language-specs/perl.lang
-share/gnome/gtksourceview-1.0/language-specs/php.lang
-share/gnome/gtksourceview-1.0/language-specs/po.lang
-share/gnome/gtksourceview-1.0/language-specs/python.lang
-share/gnome/gtksourceview-1.0/language-specs/ruby.lang
-share/gnome/gtksourceview-1.0/language-specs/scheme.lang
-share/gnome/gtksourceview-1.0/language-specs/sh.lang
-share/gnome/gtksourceview-1.0/language-specs/spec.lang
-share/gnome/gtksourceview-1.0/language-specs/sql.lang
-share/gnome/gtksourceview-1.0/language-specs/tcl.lang
-share/gnome/gtksourceview-1.0/language-specs/texinfo.lang
-share/gnome/gtksourceview-1.0/language-specs/vbnet.lang
-share/gnome/gtksourceview-1.0/language-specs/verilog.lang
-share/gnome/gtksourceview-1.0/language-specs/vhdl.lang
-share/gnome/gtksourceview-1.0/language-specs/xml.lang
+share/gtksourceview-1.0/language-specs/R.lang
+share/gtksourceview-1.0/language-specs/ada.lang
+share/gtksourceview-1.0/language-specs/boo.lang
+share/gtksourceview-1.0/language-specs/c.lang
+share/gtksourceview-1.0/language-specs/changelog.lang
+share/gtksourceview-1.0/language-specs/cpp.lang
+share/gtksourceview-1.0/language-specs/csharp.lang
+share/gtksourceview-1.0/language-specs/css.lang
+share/gtksourceview-1.0/language-specs/d.lang
+share/gtksourceview-1.0/language-specs/desktop.lang
+share/gtksourceview-1.0/language-specs/diff.lang
+share/gtksourceview-1.0/language-specs/docbook.lang
+share/gtksourceview-1.0/language-specs/fortran.lang
+share/gtksourceview-1.0/language-specs/gtkrc.lang
+share/gtksourceview-1.0/language-specs/haskell.lang
+share/gtksourceview-1.0/language-specs/html.lang
+share/gtksourceview-1.0/language-specs/idl.lang
+share/gtksourceview-1.0/language-specs/ini.lang
+share/gtksourceview-1.0/language-specs/java.lang
+share/gtksourceview-1.0/language-specs/javascript.lang
+share/gtksourceview-1.0/language-specs/language.dtd
+share/gtksourceview-1.0/language-specs/language.rng
+share/gtksourceview-1.0/language-specs/latex.lang
+share/gtksourceview-1.0/language-specs/lua.lang
+share/gtksourceview-1.0/language-specs/makefile.lang
+share/gtksourceview-1.0/language-specs/msil.lang
+share/gtksourceview-1.0/language-specs/nemerle.lang
+share/gtksourceview-1.0/language-specs/ocaml.lang
+share/gtksourceview-1.0/language-specs/octave.lang
+share/gtksourceview-1.0/language-specs/pascal.lang
+share/gtksourceview-1.0/language-specs/perl.lang
+share/gtksourceview-1.0/language-specs/php.lang
+share/gtksourceview-1.0/language-specs/po.lang
+share/gtksourceview-1.0/language-specs/python.lang
+share/gtksourceview-1.0/language-specs/ruby.lang
+share/gtksourceview-1.0/language-specs/scheme.lang
+share/gtksourceview-1.0/language-specs/sh.lang
+share/gtksourceview-1.0/language-specs/spec.lang
+share/gtksourceview-1.0/language-specs/sql.lang
+share/gtksourceview-1.0/language-specs/tcl.lang
+share/gtksourceview-1.0/language-specs/texinfo.lang
+share/gtksourceview-1.0/language-specs/vbnet.lang
+share/gtksourceview-1.0/language-specs/verilog.lang
+share/gtksourceview-1.0/language-specs/vhdl.lang
+share/gtksourceview-1.0/language-specs/xml.lang
share/locale/ar/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/az/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/be/LC_MESSAGES/gtksourceview-1.0.mo
@@ -127,8 +127,8 @@ share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_HK/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo
-@dirrm share/gnome/gtksourceview-1.0/language-specs
-@dirrm share/gnome/gtksourceview-1.0
+@dirrm share/gtksourceview-1.0/language-specs
+@dirrm share/gtksourceview-1.0
@dirrm include/gtksourceview-1.0/gtksourceview
@dirrm include/gtksourceview-1.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11-toolkits/gtksourceview2-reference/Makefile b/x11-toolkits/gtksourceview2-reference/Makefile
new file mode 100644
index 000000000000..05721546b110
--- /dev/null
+++ b/x11-toolkits/gtksourceview2-reference/Makefile
@@ -0,0 +1,11 @@
+# New ports collection makefile for: gtksourceview-reference
+# Date created: 09 May 2006
+# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gtksourceview2-reference/Makefile,v 1.1 2007/06/25 20:59:01 mezz Exp $
+#
+
+PORTREVISION= 0
+
+.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtksourceview2-reference/pkg-descr b/x11-toolkits/gtksourceview2-reference/pkg-descr
new file mode 100644
index 000000000000..3065f973f59b
--- /dev/null
+++ b/x11-toolkits/gtksourceview2-reference/pkg-descr
@@ -0,0 +1 @@
+This port contains the programming reference for x11-toolkits/gtksourceview2.
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
new file mode 100644
index 000000000000..29237f6ca18c
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: gtksourceview
+# Date created: 07 May 2003
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.54 2007/10/17 17:10:06 mezz Exp $
+#
+
+PORTNAME= gtksourceview2
+PORTVERSION= 2.0.1
+PORTREVISION?= 0
+CATEGORIES= x11-toolkits gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+
+USE_BZIP2= yes
+
+.if !defined(REFERENCE_PORT)
+
+USE_GETTEXT= yes
+USE_XLIB= yes
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
+USE_GNOME= gnomeprefix gnomehack gtk20 libxml2 intlhack \
+ ltverhack referencehack
+CONFIGURE_ARGS= --enable-compile-warnings=no
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
new file mode 100644
index 000000000000..aadd0ebe4f74
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gtksourceview-2.0.1.tar.bz2) = b7848c5328e7576b1717d75c53063602
+SHA256 (gnome2/gtksourceview-2.0.1.tar.bz2) = 818bd8c6559fd4f4dd5cba219b9ec88dfb3ca989f8ba82c8ddf06ee8fe25dfa6
+SIZE (gnome2/gtksourceview-2.0.1.tar.bz2) = 1017189
diff --git a/x11-toolkits/gtksourceview2/pkg-descr b/x11-toolkits/gtksourceview2/pkg-descr
new file mode 100644
index 000000000000..729f7178053b
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/pkg-descr
@@ -0,0 +1,2 @@
+GtkSourceView is a text widget for Gtk+-2 that provides syntax highlighting
+and other features typically expected in a source code editor.
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
new file mode 100644
index 000000000000..69850a61fae5
--- /dev/null
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -0,0 +1,177 @@
+include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h
+include/gtksourceview-2.0/gtksourceview/gtksourceiter.h
+include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h
+include/gtksourceview-2.0/gtksourceview/gtksourcelanguagemanager.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/gtksourceview-typebuiltins.h
+include/gtksourceview-2.0/gtksourceview/gtksourceview.h
+lib/libgtksourceview-2.0.a
+lib/libgtksourceview-2.0.la
+lib/libgtksourceview-2.0.so
+lib/libgtksourceview-2.0.so.0
+libdata/pkgconfig/gtksourceview-2.0.pc
+share/gtksourceview-2.0/language-specs/R.lang
+share/gtksourceview-2.0/language-specs/ada.lang
+share/gtksourceview-2.0/language-specs/awk.lang
+share/gtksourceview-2.0/language-specs/boo.lang
+share/gtksourceview-2.0/language-specs/c.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
+share/gtksourceview-2.0/language-specs/convert.py
+share/gtksourceview-2.0/language-specs/cpp.lang
+share/gtksourceview-2.0/language-specs/csharp.lang
+share/gtksourceview-2.0/language-specs/css.lang
+share/gtksourceview-2.0/language-specs/d.lang
+share/gtksourceview-2.0/language-specs/def.lang
+share/gtksourceview-2.0/language-specs/desktop.lang
+share/gtksourceview-2.0/language-specs/diff.lang
+share/gtksourceview-2.0/language-specs/docbook.lang
+share/gtksourceview-2.0/language-specs/dpatch.lang
+share/gtksourceview-2.0/language-specs/dtd.lang
+share/gtksourceview-2.0/language-specs/erlang.lang
+share/gtksourceview-2.0/language-specs/fortran.lang
+share/gtksourceview-2.0/language-specs/gap.lang
+share/gtksourceview-2.0/language-specs/gtk-doc.lang
+share/gtksourceview-2.0/language-specs/gtkrc.lang
+share/gtksourceview-2.0/language-specs/haddock.lang
+share/gtksourceview-2.0/language-specs/haskell-literate.lang
+share/gtksourceview-2.0/language-specs/haskell.lang
+share/gtksourceview-2.0/language-specs/html.lang
+share/gtksourceview-2.0/language-specs/idl.lang
+share/gtksourceview-2.0/language-specs/ini.lang
+share/gtksourceview-2.0/language-specs/java.lang
+share/gtksourceview-2.0/language-specs/javascript.lang
+share/gtksourceview-2.0/language-specs/language.dtd
+share/gtksourceview-2.0/language-specs/language.rng
+share/gtksourceview-2.0/language-specs/language2.rng
+share/gtksourceview-2.0/language-specs/latex.lang
+share/gtksourceview-2.0/language-specs/libtool.lang
+share/gtksourceview-2.0/language-specs/lua.lang
+share/gtksourceview-2.0/language-specs/m4.lang
+share/gtksourceview-2.0/language-specs/makefile.lang
+share/gtksourceview-2.0/language-specs/msil.lang
+share/gtksourceview-2.0/language-specs/nemerle.lang
+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/pascal.lang
+share/gtksourceview-2.0/language-specs/perl.lang
+share/gtksourceview-2.0/language-specs/php.lang
+share/gtksourceview-2.0/language-specs/pkgconfig.lang
+share/gtksourceview-2.0/language-specs/po.lang
+share/gtksourceview-2.0/language-specs/python.lang
+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/sql.lang
+share/gtksourceview-2.0/language-specs/styles.rng
+share/gtksourceview-2.0/language-specs/tcl.lang
+share/gtksourceview-2.0/language-specs/texinfo.lang
+share/gtksourceview-2.0/language-specs/vala.lang
+share/gtksourceview-2.0/language-specs/vbnet.lang
+share/gtksourceview-2.0/language-specs/verilog.lang
+share/gtksourceview-2.0/language-specs/vhdl.lang
+share/gtksourceview-2.0/language-specs/xml.lang
+share/gtksourceview-2.0/language-specs/yacc.lang
+share/gtksourceview-2.0/styles/classic.xml
+share/gtksourceview-2.0/styles/kate.xml
+share/gtksourceview-2.0/styles/oblivion.xml
+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/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
+share/locale/bn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/bs/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ca/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/cs/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/cy/LC_MESSAGES/gtksourceview-2.0.mo
+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_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
+share/locale/et/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/eu/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/fa/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/fi/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/fr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ga/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/gl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/gu/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/he/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/hi/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/hr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/hu/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/id/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/it/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ja/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ko/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/lt/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/lv/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mg/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mk/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ml/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/mr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ms/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/nb/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ne/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/nl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/oc/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/or/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pa/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pt/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ro/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ru/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/rw/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/si/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sk/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sl/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sq/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/sv/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ta/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/th/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/tr/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/uk/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/vi/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/xh/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gtksourceview-2.0.mo
+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
+@dirrm include/gtksourceview-2.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 70d158effba9..edffbec5870e 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/guile-gnome/Makefile,v 1.2 2007/07/30 21:23:18 mezz Exp $
PORTNAME= guile-gnome
PORTVERSION= 0.20
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-toolkits gnome scheme
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-guile/0.20
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
index b8a85cdc531d..2921ca1bf1d0 100644
--- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::bonobo::Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- guile-gnome/bonobo/Makefile.in.orig Fri Mar 9 19:07:48 2001
+++ guile-gnome/bonobo/Makefile.in Mon Nov 12 14:05:21 2001
@@ -98,10 +98,10 @@
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
index 98da7a4aaa2f..70486d75329a 100644
--- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gdk-pixbuf::Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- guile-gnome/gdk-pixbuf/Makefile.in 2001/11/12 12:09:05 1.1
+++ guile-gnome/gdk-pixbuf/Makefile.in 2001/11/12 12:09:54
@@ -98,7 +98,7 @@
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
index cb215e9ed4f6..50a187329f00 100644
--- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
+++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml.defs
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- guile-gnome/gtkhtml/gtkhtml.defs 2001/07/24 09:08:47 1.1
+++ guile-gnome/gtkhtml/gtkhtml.defs 2001/07/24 09:20:23
@@ -78,7 +78,8 @@
diff --git a/x11-toolkits/guile-gnome/pkg-plist b/x11-toolkits/guile-gnome/pkg-plist
index d815d124b9a3..12a345e5d2d0 100644
--- a/x11-toolkits/guile-gnome/pkg-plist
+++ b/x11-toolkits/guile-gnome/pkg-plist
@@ -31,24 +31,24 @@ lib/libguilezvt.a
lib/libguilezvt.la
lib/libguilezvt.so
lib/libguilezvt.so.0
-share/gnome/guile-gnome/bonobo.defs
-share/gnome/guile-gnome/ghttp.defs
-share/gnome/guile-gnome/gnome.defs
-share/gnome/guile-gnome/gnorba.defs
-share/gnome/guile-gnome/gtkhtml.defs
-share/gnome/guile-gnome/zvt.defs
-share/gnome/guile-gtk/gdkpixbuf.defs
-share/gnome/guile-gtk/libglade.defs
-share/gnome/guile/gnome/bonobo.scm
-share/gnome/guile/gnome/ghttp.scm
-share/gnome/guile/gnome/gnome.scm
-share/gnome/guile/gnome/gnorba.scm
-share/gnome/guile/gnome/zvt.scm
-share/gnome/guile/gtk/gdkpixbuf.scm
-share/gnome/guile/gtk/gtkhtml.scm
-share/gnome/guile/gtk/libglade.scm
-@dirrm share/gnome/guile/gtk
-@dirrm share/gnome/guile/gnome
-@dirrm share/gnome/guile
-@dirrm share/gnome/guile-gtk
-@dirrm share/gnome/guile-gnome
+share/guile-gnome/bonobo.defs
+share/guile-gnome/ghttp.defs
+share/guile-gnome/gnome.defs
+share/guile-gnome/gnorba.defs
+share/guile-gnome/gtkhtml.defs
+share/guile-gnome/zvt.defs
+share/guile-gtk/gdkpixbuf.defs
+share/guile-gtk/libglade.defs
+share/guile/gnome/bonobo.scm
+share/guile/gnome/ghttp.scm
+share/guile/gnome/gnome.scm
+share/guile/gnome/gnorba.scm
+share/guile/gnome/zvt.scm
+share/guile/gtk/gdkpixbuf.scm
+share/guile/gtk/gtkhtml.scm
+share/guile/gtk/libglade.scm
+@dirrm share/guile/gtk
+@dirrm share/guile/gnome
+@dirrm share/guile
+@dirrm share/guile-gtk
+@dirrm share/guile-gnome
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index bd3f023934a8..02167a06e8af 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -4,11 +4,11 @@
# Whom: ijliao
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/inti/Makefile,v 1.3 2007/05/23 16:18:51 ahze Exp $
PORTNAME= inti
PORTVERSION= 1.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= inti
@@ -47,9 +47,9 @@ post-install:
@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.endif
- @${FIND} ${PREFIX}/share/gnome/inti -type f | \
+ @${FIND} ${PREFIX}/share/inti -type f | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
- @${FIND} ${PREFIX}/share/gnome/inti -type d | ${SORT} -r | \
+ @${FIND} ${PREFIX}/share/inti -type d | ${SORT} -r | \
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index dfc641f47583..9c1966b82d42 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.55 2007/03/12 18:11:27 marcus Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.61 2007/09/17 14:52:59 ahze Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.18.0
-PORTREVISION?= 1
+PORTVERSION= 2.20.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index bc5fcfe2fea8..43cf32693b35 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.18.0.tar.bz2) = 22bd67a0a8b7f156c02c5fc08fb1fa24
-SHA256 (gnome/libbonoboui-2.18.0.tar.bz2) = 2963b3f0f348faa43eb84083ce93070ec82844205744219dec2df46ed2305775
-SIZE (gnome/libbonoboui-2.18.0.tar.bz2) = 981973
+MD5 (gnome/libbonoboui-2.20.0.tar.bz2) = 14427a459f6ca355de5f5e47ce95c1c4
+SHA256 (gnome/libbonoboui-2.20.0.tar.bz2) = e6958e88039a9ef409ad8e90f78d65c0171e22ee0927f07790eaf6ede722a838
+SIZE (gnome/libbonoboui-2.20.0.tar.bz2) = 991509
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 023280c3527b..4ef163bdabda 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Sun Jan 28 17:47:38 2007
-+++ Makefile.in Sun Jan 28 17:47:59 2007
-@@ -254,7 +254,7 @@ sysconfdir = @sysconfdir@
+--- Makefile.in.orig 2007-07-31 00:33:13.000000000 -0400
++++ Makefile.in 2007-07-31 00:33:29.000000000 -0400
+@@ -253,7 +253,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 1349efca8b18..f7257bbe9e60 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -43,10 +43,10 @@ lib/libglade/2.0/libbonobo.so
libdata/bonobo/servers/Bonobo_Sample_Controls.server
libdata/bonobo/servers/CanvDemo.server
libdata/pkgconfig/libbonoboui-2.0.pc
-share/gnome/applications/bonobo-browser.desktop
-share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
-share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
-share/gnome/gnome-2.0/ui/bonobo-browser.xml
+share/applications/bonobo-browser.desktop
+share/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
+share/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/gnome-2.0/ui/bonobo-browser.xml
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
@@ -100,6 +100,7 @@ share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nso/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/oc/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
@@ -116,6 +117,7 @@ share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/th/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/vi/LC_MESSAGES/libbonoboui-2.0.mo
@@ -142,6 +144,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -154,3 +158,4 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 15f6facea973..47b92a91db78 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.18 2007/03/12 13:52:14 ahze Exp $
+# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.21 2007/09/17 13:13:59 ahze Exp $
#
PORTNAME= libgail-gnome
-PORTVERSION= 1.18.0
-PORTREVISION= 1
+PORTVERSION= 1.20.0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgail-gnome/distinfo b/x11-toolkits/libgail-gnome/distinfo
index 7232f8381615..bf5919840106 100644
--- a/x11-toolkits/libgail-gnome/distinfo
+++ b/x11-toolkits/libgail-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgail-gnome-1.18.0.tar.bz2) = 2dd239118bf252c7b1e3d1701cd8a954
-SHA256 (gnome2/libgail-gnome-1.18.0.tar.bz2) = c2c921517ea6be997316302df8cd3a7311a436d5101926516ea646dbb054a9b0
-SIZE (gnome2/libgail-gnome-1.18.0.tar.bz2) = 223621
+MD5 (gnome2/libgail-gnome-1.20.0.tar.bz2) = 5a7662e3d637c86baa95a50adb225e56
+SHA256 (gnome2/libgail-gnome-1.20.0.tar.bz2) = 9e29f7a66554103ef467334a7ac4bf682556b0268c30514a7050e3476e0e29c5
+SIZE (gnome2/libgail-gnome-1.20.0.tar.bz2) = 237027
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 8bcb1408e7f5..fe3cfc0b5297 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.64 2007/03/12 19:15:02 mezz Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.69 2007/10/17 21:36:14 mezz Exp $
#
PORTNAME= libgnomeprintui
-PORTVERSION= 2.18.0
+PORTVERSION= 2.18.1
PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -28,7 +28,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \
intlhack ltverhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_BISON= build
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index 4e5193574e46..48a5909ff400 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.18.0.tar.bz2) = bea9871059cabee9d108bab32d58d2af
-SHA256 (gnome2/libgnomeprintui-2.18.0.tar.bz2) = dc75c70a998134e2e2a71fe7ce19f52764c2f5daa62a35c30eac1d86694e0975
-SIZE (gnome2/libgnomeprintui-2.18.0.tar.bz2) = 656952
+MD5 (gnome2/libgnomeprintui-2.18.1.tar.bz2) = 4f9a09372a5fa2cd5c35be30dff3fcd6
+SHA256 (gnome2/libgnomeprintui-2.18.1.tar.bz2) = c2bcd55a191083850d7894ee78178797603463fc79061c50f34c65c6a1d0bb0f
+SIZE (gnome2/libgnomeprintui-2.18.1.tar.bz2) = 686595
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index eae47f017834..ad52a4494454 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -30,7 +30,7 @@ libdata/pkgconfig/libgnomeprintui-2.2.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/libgnomeprintui/%%VERSION%%/gnome-print-job-preview.xml
+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
@@ -81,6 +81,7 @@ share/locale/nb/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
+share/locale/oc/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/or/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -89,6 +90,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/rw/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/si/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -106,8 +108,8 @@ share/locale/xh/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/zh_HK/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
-@dirrm share/gnome/libgnomeprintui/%%VERSION%%
-@dirrm share/gnome/libgnomeprintui
+@dirrm share/libgnomeprintui/%%VERSION%%
+@dirrm share/libgnomeprintui
@dirrm %%DOCSDIR%%
@dirrm include/libgnomeprintui-2.2/libgnomeprintui
@dirrm include/libgnomeprintui-2.2
@@ -117,8 +119,12 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 99f09ed3db93..3bf8762aa97b 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.99 2007/03/14 03:42:53 marcus Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.108 2007/10/17 22:37:05 mezz Exp $
#
PORTNAME= libgnomeui
-PORTVERSION= 2.18.1
-PORTREVISION?= 2
+PORTVERSION= 2.20.1.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 5930958b8652..36eb70bcf572 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.18.1.tar.bz2) = dbdb274517ad643d9397dd6868788631
-SHA256 (gnome2/libgnomeui-2.18.1.tar.bz2) = d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
-SIZE (gnome2/libgnomeui-2.18.1.tar.bz2) = 1462027
+MD5 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = d1f500c5d33ce93159b4952bb476fcf3
+SHA256 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 133933c70234ecd4560cec165034c21c94598c24c34138ed1ee1770f52328cef
+SIZE (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 1445994
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
deleted file mode 100644
index c3c751eff668..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- libgnomeui/gnome-thumbnail.c.orig Sat Jan 21 23:11:21 2006
-+++ libgnomeui/gnome-thumbnail.c Sat Jan 21 23:10:52 2006
-@@ -994,11 +994,7 @@ gnome_thumbnail_factory_generate_thumbna
- return NULL;
-
- width = gdk_pixbuf_get_width (pixbuf);
-- g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
-- g_strdup_printf ("%d", width), g_free);
- height = gdk_pixbuf_get_height (pixbuf);
-- g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
-- g_strdup_printf ("%d", height), g_free);
-
- if (width > size || height > size)
- {
-@@ -1011,6 +1007,13 @@ gnome_thumbnail_factory_generate_thumbna
- g_object_unref (pixbuf);
- pixbuf = scaled;
- }
-+
-+ width = gdk_pixbuf_get_width (pixbuf);
-+ g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
-+ g_strdup_printf ("%d", width), g_free);
-+ height = gdk_pixbuf_get_height (pixbuf);
-+ g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
-+ g_strdup_printf ("%d", height), g_free);
-
- return pixbuf;
- }
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index ebd78c97d835..acce03934cfd 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -60,8 +60,6 @@ lib/libgnomeui-2.la
lib/libgnomeui-2.so
lib/libgnomeui-2.so.0
libdata/pkgconfig/libgnomeui-2.0.pc
-libexec/gnome_segv2
-share/gnome/pixmaps/gnome-about-logo.png
share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
@@ -96,6 +94,7 @@ share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/hr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/hy/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -119,6 +118,7 @@ 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
share/locale/nso/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
@@ -127,6 +127,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/rw/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/si/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
@@ -149,6 +150,7 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
+share/pixmaps/gnome-about-logo.png
@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems
@dirrm include/libgnomeui-2.0/libgnomeui
@dirrm include/libgnomeui-2.0
@@ -166,8 +168,12 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -178,6 +184,8 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index bdb4c9e4f893..1a714ac77067 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.10 2007/03/10 07:39:37 marcus Exp $
+# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.12 2007/09/17 17:05:03 marcus Exp $
#
PORTNAME= libgnomeuimm
-PORTVERSION= 2.18.0
-PORTREVISION= 1
+PORTVERSION= 2.20.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index a83623df10cf..16f95ce7ae66 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeuimm-2.18.0.tar.bz2) = ba42d820f535f8e7fc5d31699d484efb
-SHA256 (gnome2/libgnomeuimm-2.18.0.tar.bz2) = 70638f28a4cc6504b9e39a1f80118dacaa029454510a1ae113dc861a665897cc
-SIZE (gnome2/libgnomeuimm-2.18.0.tar.bz2) = 349549
+MD5 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 350d3424247611a009432395aff8619f
+SHA256 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = f8bb4f068b7b0fc65e026ca28a57f2109f643f537f050f8a2bd0bb019e8bca8f
+SIZE (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 326994
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 0e70539b7d57..374ad075f735 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.85 2007/03/12 23:15:43 marcus Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.98 2007/10/17 21:36:14 mezz Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 2ff354fad676..6e4643d407e9 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.18.3.tar.bz2) = 1badcbb50e7bc59865f72ec270c15125
-SHA256 (gnome2/libwnck-2.18.3.tar.bz2) = 216e0c4d0995c3a6456141eefc07ce9905e1df67bfc2b2b7ae28ce248747415d
-SIZE (gnome2/libwnck-2.18.3.tar.bz2) = 482211
+MD5 (gnome2/libwnck-2.20.1.tar.bz2) = 8a5c390c7e2ea48e6260c0bc9ea2142b
+SHA256 (gnome2/libwnck-2.20.1.tar.bz2) = 9a9699ab2fa04433618adafb204f07216d7256c4f975ad066ac3ee0eb5e5797b
+SIZE (gnome2/libwnck-2.20.1.tar.bz2) = 648179
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 2964ad3b42b3..2b85d43521af 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -1,3 +1,4 @@
+bin/wnckprop
include/libwnck-1.0/libwnck/application.h
include/libwnck-1.0/libwnck/class-group.h
include/libwnck-1.0/libwnck/libwnck.h
@@ -13,7 +14,7 @@ include/libwnck-1.0/libwnck/workspace.h
lib/libwnck-1.a
lib/libwnck-1.la
lib/libwnck-1.so
-lib/libwnck-1.so.18
+lib/libwnck-1.so.22
libdata/pkgconfig/libwnck-1.0.pc
share/locale/am/LC_MESSAGES/libwnck.mo
share/locale/ar/LC_MESSAGES/libwnck.mo
@@ -69,6 +70,7 @@ share/locale/nb/LC_MESSAGES/libwnck.mo
share/locale/ne/LC_MESSAGES/libwnck.mo
share/locale/nl/LC_MESSAGES/libwnck.mo
share/locale/nn/LC_MESSAGES/libwnck.mo
+share/locale/oc/LC_MESSAGES/libwnck.mo
share/locale/or/LC_MESSAGES/libwnck.mo
share/locale/pa/LC_MESSAGES/libwnck.mo
share/locale/pl/LC_MESSAGES/libwnck.mo
@@ -77,6 +79,7 @@ share/locale/pt_BR/LC_MESSAGES/libwnck.mo
share/locale/ro/LC_MESSAGES/libwnck.mo
share/locale/ru/LC_MESSAGES/libwnck.mo
share/locale/rw/LC_MESSAGES/libwnck.mo
+share/locale/si/LC_MESSAGES/libwnck.mo
share/locale/sk/LC_MESSAGES/libwnck.mo
share/locale/sl/LC_MESSAGES/libwnck.mo
share/locale/sq/LC_MESSAGES/libwnck.mo
@@ -102,8 +105,12 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 4c152632efde..9a970c620685 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pango/Makefile,v 1.94 2007/03/13 00:54:42 mezz Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.111 2007/10/15 21:40:26 mezz Exp $
#
PORTNAME= pango
-PORTVERSION= 1.16.5
+PORTVERSION= 1.18.3
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -41,8 +41,8 @@ CONFIGURE_ARGS= --with-qt=no \
GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags`
PLIST_SUB= VERSION="1.6.0"
-FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
+FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
MAN1= pango-querymodules.1
@@ -53,12 +53,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB+= X11="@comment "
.else
-USE_XLIB+= yes
-LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG+= xft xrender
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
- ${GLIB2_CFLAGS} -I${LOCALBASE}/include \
- -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ ${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB+= X11=""
.endif
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 521323d36978..3fd27c4df6b5 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.16.5.tar.bz2) = d8d7da2ab854f6e257ec06bf552a6114
-SHA256 (gnome2/pango-1.16.5.tar.bz2) = 78ffda1dd67b16c6f558c918d2473de284091bfab075777a4f81e33752bc444d
-SIZE (gnome2/pango-1.16.5.tar.bz2) = 1345977
+MD5 (gnome2/pango-1.18.3.tar.bz2) = 4a9862b5151f16dcad8e30dd6ef08549
+SHA256 (gnome2/pango-1.18.3.tar.bz2) = a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
+SIZE (gnome2/pango-1.18.3.tar.bz2) = 1394980
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 0dfe3c306b63..86ba73dc53f8 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -16,6 +16,7 @@ include/pango-1.0/pango/pango-glyph-item.h
include/pango-1.0/pango/pango-glyph.h
include/pango-1.0/pango/pango-gravity.h
include/pango-1.0/pango/pango-item.h
+include/pango-1.0/pango/pango-language.h
include/pango-1.0/pango/pango-layout.h
include/pango-1.0/pango/pango-matrix.h
include/pango-1.0/pango/pango-modules.h
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index afe66097e2af..c7fad2d56cb1 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.58 2007/03/18 05:45:44 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.65 2007/09/16 17:47:04 ahze Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.18.0
-PORTREVISION= 2
+PORTVERSION= 2.20.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +21,7 @@ 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.1:${PORTSDIR}/multimedia/totem \
+ totem-plparser.7:${PORTSDIR}/multimedia/totem \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
gnome-keyring:${PORTSDIR}/security/gnome-keyring
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 7a6a8dc4b2cb..244fc7d5468b 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.18.0.tar.bz2) = ce1b1c095a69c2656177570a2939fabb
-SHA256 (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = 1238ed484620cd29e65695376ebf8a38162b4a94706b956b647e43776820d787
-SIZE (gnome2/gnome-python-desktop-2.18.0.tar.bz2) = 432321
+MD5 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 02b177f488091d27bf0648ec4660d8f7
+SHA256 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 32e2f5f4d3e79157a83cb7a1c6c409bc2fef75178f9626b2d83a1fd1c2ee4a8d
+SIZE (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 440199
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 2cfcf76a57c6..8bb79f1fe771 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.36 2006/03/12 23:45:37 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.41 2007/07/28 18:23:53 marcus Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.14.3
-PORTREVISION= 3
+PORTVERSION= 2.19.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -29,7 +29,7 @@ USE_GECKO= firefox seamonkey xulrunner mozilla
USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack libgtkhtml pygnome2 libgda2
+USE_GNOME= gnomehack libgtkhtml pygnome2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtkmozembed=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index 3616f3f71fc2..c16b77d8ddb3 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-extras-2.14.3.tar.bz2) = 7d3414838ccb94cfcecc0a48f68c012d
-SHA256 (gnome2/gnome-python-extras-2.14.3.tar.bz2) = 2c0392d3f71272d4c3921f715aaf9ef7e54ee64be12d778fb2fb53f40d14f4c5
-SIZE (gnome2/gnome-python-extras-2.14.3.tar.bz2) = 363684
+MD5 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 08896c63d71ce44d20fafbaf9c0edc78
+SHA256 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
+SIZE (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 361721
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 2940eacbaee6..9a0550865cec 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -1,4 +1,3 @@
-include/pygda-1.2/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
@@ -6,8 +5,6 @@ include/pygda-1.2/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
@@ -24,7 +21,6 @@ include/pygda-1.2/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
libdata/pkgconfig/gnome-python-extras-2.0.pc
-libdata/pkgconfig/pygda-1.2.pc
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
@@ -43,15 +39,16 @@ libdata/pkgconfig/pygda-1.2.pc
%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_combo_button.py
%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_dock.py
%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
+%%PORTDOCS%%share/examples/py-gnome/gksu2/simple.py
%%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
%%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
-share/pygtk/2.0/defs/gda.defs
share/pygtk/2.0/defs/gtkhtml2.defs
share/pygtk/2.0/defs/gtkmozembed.defs
share/pygtk/2.0/defs/trayicon.defs
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkspell
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
+%%PORTDOCS%%@dirrm share/examples/py-gnome/gksu2
%%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg
@@ -60,4 +57,3 @@ share/pygtk/2.0/defs/trayicon.defs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
-@dirrm include/pygda-1.2
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 9b339eef4f7b..9a0446eaa24f 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.41 2007/03/12 19:06:44 mezz Exp $
+# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.45 2007/09/16 17:35:44 ahze Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.18.2
-PORTREVISION= 1
+PORTVERSION= 2.20.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_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 e82aafe57d04..2f0ba44c4eb9 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.18.2.tar.bz2) = 3df58e4354526d4e0be8524c0bf6ddb8
-SHA256 (gnome2/gnome-python-2.18.2.tar.bz2) = c1ae11e43276df87ec48ec630ce8f244df08eeabfa023d055bf9e673048788d7
-SIZE (gnome2/gnome-python-2.18.2.tar.bz2) = 415869
+MD5 (gnome2/gnome-python-2.20.0.tar.bz2) = b5f17b65333f1cf6a8c0de914eb06191
+SHA256 (gnome2/gnome-python-2.20.0.tar.bz2) = 45bf3132203f724f0ba4a4597b50c43a361d57e48dfc236c78882654204b4d06
+SIZE (gnome2/gnome-python-2.20.0.tar.bz2) = 417469
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index baf69d69155f..c5018b5b25df 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,11 +3,11 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.49 2006/10/03 20:52:30 ahze Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.54 2007/09/16 17:26:18 ahze Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.10.6
+PORTVERSION= 2.12.0
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_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 4b8e748944c3..8dbdf2f95aad 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.10.6.tar.bz2) = f051e25adcbdc1ddcf736fadad3d66f2
-SHA256 (gnome2/pygtk-2.10.6.tar.bz2) = e524a45b7ffab55c441bafff43f9583e48616ce48a150413f30208e540435ac9
-SIZE (gnome2/pygtk-2.10.6.tar.bz2) = 1977892
+MD5 (gnome2/pygtk-2.12.0.tar.bz2) = 3c1a42b774600c353342cfa3782a7d77
+SHA256 (gnome2/pygtk-2.12.0.tar.bz2) = 0200c16528c8fd32eec2a9b1c1c2a303d88f5dc6ca94124a6e3ec8be1cac496e
+SIZE (gnome2/pygtk-2.12.0.tar.bz2) = 2154621
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 9c376a08734e..3346306cdb6e 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -135,6 +135,7 @@ libdata/pkgconfig/pygtk-2.0.pc
%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/customtreemodel.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/scrollable.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/sizegroup.py
@@ -252,12 +253,15 @@ share/pygtk/2.0/codegen/scmexpr.pyo
share/pygtk/2.0/defs/atk-types.defs
share/pygtk/2.0/defs/atk.defs
share/pygtk/2.0/defs/gdk-2.10.defs
+share/pygtk/2.0/defs/gdk-2.12.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
share/pygtk/2.0/defs/gdk.defs
share/pygtk/2.0/defs/gtk-2.10-types.defs
share/pygtk/2.0/defs/gtk-2.10.defs
+share/pygtk/2.0/defs/gtk-2.12-types.defs
+share/pygtk/2.0/defs/gtk-2.12.defs
share/pygtk/2.0/defs/gtk-base-types.defs
share/pygtk/2.0/defs/gtk-base.defs
share/pygtk/2.0/defs/gtk-types.defs
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
new file mode 100644
index 000000000000..533c315e3516
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: py-gtksourceview
+# Date created: 25 June 2007
+# Whom: Mezz <mezz@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.6 2007/09/17 13:46:28 ahze Exp $
+#
+
+PORTNAME= gtksourceview
+PORTVERSION= 2.0.0
+CATEGORIES= x11-toolkits gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= pygtksourceview-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A python bindings for the version 2 of the GtkSourceView library
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomeprefix gnometarget gtksourceview2 pygtk2
+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
new file mode 100644
index 000000000000..ed287d31e15f
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -0,0 +1,3 @@
+MD5 (pygtksourceview-2.0.0.tar.bz2) = a4947108e7a669b67ff0ff157a132728
+SHA256 (pygtksourceview-2.0.0.tar.bz2) = 749075c118a029efc51c58f4a49afbf0ec969a1c1f9ee8c25782ea08b3f9c649
+SIZE (pygtksourceview-2.0.0.tar.bz2) = 255507
diff --git a/x11-toolkits/py-gtksourceview/pkg-descr b/x11-toolkits/py-gtksourceview/pkg-descr
new file mode 100644
index 000000000000..2e25fb73166a
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/pkg-descr
@@ -0,0 +1,4 @@
+This archive contains python bindings for the version 2 of the
+GtkSourceView library.
+
+WWW: http://www.gnome.org
diff --git a/x11-toolkits/py-gtksourceview/pkg-plist b/x11-toolkits/py-gtksourceview/pkg-plist
new file mode 100644
index 000000000000..579b96136d89
--- /dev/null
+++ b/x11-toolkits/py-gtksourceview/pkg-plist
@@ -0,0 +1,4 @@
+%%PYTHON_SITELIBDIR%%/gtksourceview2.la
+%%PYTHON_SITELIBDIR%%/gtksourceview2.so
+libdata/pkgconfig/pygtksourceview-2.0.pc
+share/pygtk/2.0/defs/gtksourceview2.defs
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 5729c673b753..210de9ff9600 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -3,7 +3,7 @@
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/ruby-gtk2/Makefile,v 1.2 2005/10/17 07:05:43 mezz Exp $
+# $MCom: ports/x11-toolkits/ruby-gtk2/Makefile,v 1.5 2007/10/05 05:06:39 mezz Exp $
#
PORTNAME= gtk2
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index 041a6e30fa9f..6ed5a354978a 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -71,6 +71,7 @@
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/tree_store.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/alpha-demo.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/assistant.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/bindings.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button.rb
@@ -112,10 +113,12 @@
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/mouse-gesture.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pangorenderer.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pointer_grab.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/print.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/properties.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/radiobutton.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/recentchooserdialog.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/rgtk+cairo.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/scalebutton.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/settings.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/statusicon.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/stock.rb
@@ -129,6 +132,7 @@
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/to_drawable.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/toolbar.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tooltips.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tree_combo.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tree_progress.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treemodelfilter.rb
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index d3e0c63d9c82..ea23bc3e5071 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.72 2007/03/13 00:43:46 mezz Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.84 2007/10/17 21:36:14 mezz Exp $
#
PORTNAME= vte
-PORTVERSION= 0.16.8
+PORTVERSION= 0.16.9
PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index b64906d0dbbf..8dadc503f151 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.16.8.tar.bz2) = 65344de3023c41c8dda2b35a415bf969
-SHA256 (gnome2/vte-0.16.8.tar.bz2) = 1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
-SIZE (gnome2/vte-0.16.8.tar.bz2) = 1112410
+MD5 (gnome2/vte-0.16.9.tar.bz2) = a42c893a01e3d9818789be373e529422
+SHA256 (gnome2/vte-0.16.9.tar.bz2) = 0e61bbccbc6689d8d9ea4842795498d3ff85079b870eda899cbbd7beb80866ec
+SIZE (gnome2/vte-0.16.9.tar.bz2) = 1115282
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 2039f668eee5..6f8bd8e95045 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -19,7 +19,7 @@ lib/vte/vterdb
lib/vte/window
libdata/pkgconfig/vte.pc
libexec/gnome-pty-helper
-share/gnome/vte/termcap/xterm
+share/vte/termcap/xterm
share/locale/am/LC_MESSAGES/vte.mo
share/locale/ang/LC_MESSAGES/vte.mo
share/locale/ar/LC_MESSAGES/vte.mo
@@ -101,8 +101,8 @@ share/locale/xh/LC_MESSAGES/vte.mo
share/locale/zh_CN/LC_MESSAGES/vte.mo
share/locale/zh_HK/LC_MESSAGES/vte.mo
share/locale/zh_TW/LC_MESSAGES/vte.mo
-@dirrm share/gnome/vte/termcap
-@dirrm share/gnome/vte
+@dirrm share/vte/termcap
+@dirrm share/vte
@dirrm lib/vte
@dirrm include/vte
@dirrmtry share/locale/zh_HK/LC_MESSAGES