summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-02-07 18:42:25 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-02-07 18:42:25 +0000
commit336b31c3940aea29270fc9fd9b51d3ba1633729e (patch)
treeab986f61fb6fef3625ba83cee9ea5d304243bfe8 /x11-toolkits
parentadd ocaml-images 2.10 (diff)
Update to GNOME 2.2.
This is Phase I. All existing ports have been updated to their GNOME 2.2 counterparts.
Notes
Notes: svn path=/head/; revision=75035
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/at-spi/Makefile4
-rw-r--r--x11-toolkits/at-spi/distinfo2
-rw-r--r--x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c10
-rw-r--r--x11-toolkits/at-spi/pkg-plist8
-rw-r--r--x11-toolkits/eel2/Makefile6
-rw-r--r--x11-toolkits/eel2/distinfo2
-rw-r--r--x11-toolkits/eel2/pkg-plist17
-rw-r--r--x11-toolkits/gail/Makefile16
-rw-r--r--x11-toolkits/gail/distinfo2
-rw-r--r--x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in11
-rw-r--r--x11-toolkits/gal2/Makefile10
-rw-r--r--x11-toolkits/gal2/distinfo2
-rw-r--r--x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c12
-rw-r--r--x11-toolkits/gal2/pkg-plist373
-rw-r--r--x11-toolkits/gnome-themes/Makefile8
-rw-r--r--x11-toolkits/gnome-themes/distinfo2
-rw-r--r--x11-toolkits/gnome-themes/files/patch-configure10
-rw-r--r--x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in11
-rw-r--r--x11-toolkits/gnome-themes/pkg-plist435
-rw-r--r--x11-toolkits/gtk-engines2/Makefile12
-rw-r--r--x11-toolkits/gtk-engines2/distinfo2
-rw-r--r--x11-toolkits/gtk-engines2/pkg-plist3
-rw-r--r--x11-toolkits/gtk20/Makefile25
-rw-r--r--x11-toolkits/gtk20/distinfo2
-rw-r--r--x11-toolkits/gtk20/files/patch-ae18
-rw-r--r--x11-toolkits/gtk20/files/patch-ag11
-rw-r--r--x11-toolkits/gtk20/pkg-plist20
-rw-r--r--x11-toolkits/gtk30/Makefile25
-rw-r--r--x11-toolkits/gtk30/distinfo2
-rw-r--r--x11-toolkits/gtk30/files/patch-ae18
-rw-r--r--x11-toolkits/gtk30/files/patch-ag11
-rw-r--r--x11-toolkits/gtk30/pkg-plist20
-rw-r--r--x11-toolkits/libbonoboui/Makefile8
-rw-r--r--x11-toolkits/libbonoboui/distinfo2
-rw-r--r--x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c18
-rw-r--r--x11-toolkits/libbonoboui/files/patch-configure9
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist3
-rw-r--r--x11-toolkits/libgail-gnome/Makefile5
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile10
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo2
-rw-r--r--x11-toolkits/libgnomeprintui/files/patch-configure10
-rw-r--r--x11-toolkits/libgnomeprintui/files/patch-ltmain.sh45
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist110
-rw-r--r--x11-toolkits/libgnomeui/Makefile9
-rw-r--r--x11-toolkits/libgnomeui/distinfo2
-rw-r--r--x11-toolkits/libgnomeui/files/patch-Makefile.in10
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in11
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist62
-rw-r--r--x11-toolkits/libwnck/Makefile7
-rw-r--r--x11-toolkits/libwnck/distinfo2
-rw-r--r--x11-toolkits/libwnck/pkg-plist11
-rw-r--r--x11-toolkits/libzvt/Makefile13
-rw-r--r--x11-toolkits/libzvt/files/patch-configure4
-rw-r--r--x11-toolkits/pango/Makefile14
-rw-r--r--x11-toolkits/pango/distinfo2
-rw-r--r--x11-toolkits/pango/files/patch-ltmain.sh47
-rw-r--r--x11-toolkits/pango/files/patch-pangoxft.h11
-rw-r--r--x11-toolkits/pango/pkg-plist50
-rw-r--r--x11-toolkits/vte/Makefile8
-rw-r--r--x11-toolkits/vte/distinfo2
-rw-r--r--x11-toolkits/vte/files/patch-src_keymap.c2
-rw-r--r--x11-toolkits/vte/pkg-plist10
62 files changed, 1068 insertions, 541 deletions
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 98d621350f0c..475f05818565 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= at-spi
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.8
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/at-spi/distinfo b/x11-toolkits/at-spi/distinfo
index f147d65aeeea..6440a59679ae 100644
--- a/x11-toolkits/at-spi/distinfo
+++ b/x11-toolkits/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-1.0.2.tar.bz2) = a242b806b58d924b7f58f769ff4e2298
+MD5 (gnome2/at-spi-1.1.8.tar.bz2) = 76e2df52a280a794bde0e6dd259c01f8
diff --git a/x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c b/x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c
new file mode 100644
index 000000000000..161b17116292
--- /dev/null
+++ b/x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c
@@ -0,0 +1,10 @@
+--- registryd/deviceeventcontroller.c.orig Wed Nov 27 16:36:12 2002
++++ registryd/deviceeventcontroller.c Wed Nov 27 16:38:21 2002
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <stdio.h>
++#include <sys/time.h>
+ #include <bonobo/bonobo-exception.h>
+
+ #include <X11/Xlib.h>
diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist
index 4b89257f26e7..639018a75a67 100644
--- a/x11-toolkits/at-spi/pkg-plist
+++ b/x11-toolkits/at-spi/pkg-plist
@@ -9,6 +9,7 @@ include/at-spi-1.0/libspi/action.h
include/at-spi-1.0/libspi/application.h
include/at-spi-1.0/libspi/base.h
include/at-spi-1.0/libspi/component.h
+include/at-spi-1.0/libspi/devicelistener.h
include/at-spi-1.0/libspi/editabletext.h
include/at-spi-1.0/libspi/eventlistener.h
include/at-spi-1.0/libspi/hyperlink.h
@@ -27,10 +28,10 @@ include/at-spi-1.0/libspi/text.h
include/at-spi-1.0/libspi/value.h
lib/libcspi.a
lib/libcspi.so
-lib/libcspi.so.1
+lib/libcspi.so.8
lib/libspi.a
lib/libspi.so
-lib/libspi.so.1
+lib/libspi.so.8
lib/gtk-2.0/modules/libatk-bridge.so
lib/orbit-2.0/Accessibility_module.so
libdata/bonobo/servers/Accessibility_Registry.server
@@ -55,8 +56,7 @@ share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html
share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html
share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html
share/doc/at-spi-cspi/book1.html
-share/doc/at-spi-cspi/c6121.html
-share/doc/at-spi-cspi/c6124.html
+share/doc/at-spi-cspi/c5968.html
share/doc/at-spi-cspi/index.sgml
share/doc/at-spi-cspi/spi-accessible.html
share/doc/at-spi-cspi/spi-application.html
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 70fbae062f15..3de751a5de00 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= eel2
-PORTVERSION= 2.0.8
+PORTVERSION= 2.2.0.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
DIST_SUBDIR= gnome2
DISTNAME= eel-${PORTVERSION}
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
gailutil.17:${PORTSDIR}/x11-toolkits/gail \
- gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+ gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index c699a6c2a0c8..a2640b905243 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eel-2.0.8.tar.bz2) = fc2f7a38204e2b7640f5d6258fe11890
+MD5 (gnome2/eel-2.2.0.2.tar.bz2) = 5145fc6b81b55647d3dd056da77a46c0
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index 5fee1d130ae9..f083fffaf02a 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -3,17 +3,19 @@ include/eel-2/eel/eel-art-extensions.h
include/eel-2/eel/eel-art-gtk-extensions.h
include/eel-2/eel/eel-background-box.h
include/eel-2/eel/eel-background.h
-include/eel-2/eel/eel-canvas-rect.h
+include/eel-2/eel/eel-canvas-rect-ellipse.h
+include/eel-2/eel/eel-canvas-util.h
+include/eel-2/eel/eel-canvas.h
include/eel-2/eel/eel-caption-table.h
include/eel-2/eel/eel-caption.h
include/eel-2/eel/eel-cell-renderer-pixbuf-list.h
include/eel-2/eel/eel-dateedit-extensions.h
include/eel-2/eel/eel-debug-drawing.h
include/eel-2/eel/eel-debug.h
+include/eel-2/eel/eel-editable-label.h
include/eel-2/eel/eel-ellipsizing-label.h
include/eel-2/eel/eel-enumeration.h
include/eel-2/eel/eel-features.h
-include/eel-2/eel/eel-font-picker.h
include/eel-2/eel/eel-gconf-extensions.h
include/eel-2/eel/eel-gdk-extensions.h
include/eel-2/eel/eel-gdk-pixbuf-extensions.h
@@ -31,10 +33,7 @@ include/eel-2/eel/eel-labeled-image.h
include/eel-2/eel/eel-marshal.h
include/eel-2/eel/eel-pango-extensions.h
include/eel-2/eel/eel-password-dialog.h
-include/eel-2/eel/eel-preferences-box.h
-include/eel-2/eel/eel-preferences-group.h
-include/eel-2/eel/eel-preferences-item.h
-include/eel-2/eel/eel-preferences-pane.h
+include/eel-2/eel/eel-preferences-glade.h
include/eel-2/eel/eel-preferences.h
include/eel-2/eel/eel-radio-button-group.h
include/eel-2/eel/eel-self-checks.h
@@ -42,7 +41,6 @@ include/eel-2/eel/eel-stock-dialogs.h
include/eel-2/eel/eel-string-list.h
include/eel-2/eel/eel-string-picker.h
include/eel-2/eel/eel-string.h
-include/eel-2/eel/eel-text-caption.h
include/eel-2/eel/eel-type-builtins.h
include/eel-2/eel/eel-types.h
include/eel-2/eel/eel-vfs-extensions.h
@@ -51,8 +49,9 @@ include/eel-2/eel/eel-xml-extensions.h
include/eel-2/eel/eel.h
lib/libeel-2.a
lib/libeel-2.so
-lib/libeel-2.so.2
+lib/libeel-2.so.4
libdata/pkgconfig/eel-2.0.pc
+share/locale/am/LC_MESSAGES/eel-2.0.mo
share/locale/ar/LC_MESSAGES/eel-2.0.mo
share/locale/az/LC_MESSAGES/eel-2.0.mo
share/locale/be/LC_MESSAGES/eel-2.0.mo
@@ -67,6 +66,7 @@ share/locale/en_GB/LC_MESSAGES/eel-2.0.mo
share/locale/es/LC_MESSAGES/eel-2.0.mo
share/locale/et/LC_MESSAGES/eel-2.0.mo
share/locale/eu/LC_MESSAGES/eel-2.0.mo
+share/locale/fa/LC_MESSAGES/eel-2.0.mo
share/locale/fi/LC_MESSAGES/eel-2.0.mo
share/locale/fr/LC_MESSAGES/eel-2.0.mo
share/locale/ga/LC_MESSAGES/eel-2.0.mo
@@ -80,6 +80,7 @@ share/locale/ko/LC_MESSAGES/eel-2.0.mo
share/locale/lt/LC_MESSAGES/eel-2.0.mo
share/locale/lv/LC_MESSAGES/eel-2.0.mo
share/locale/mk/LC_MESSAGES/eel-2.0.mo
+share/locale/mn/LC_MESSAGES/eel-2.0.mo
share/locale/ms/LC_MESSAGES/eel-2.0.mo
share/locale/nl/LC_MESSAGES/eel-2.0.mo
share/locale/nn/LC_MESSAGES/eel-2.0.mo
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 48007940b9a7..c3515535376d 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,29 +6,27 @@
#
PORTNAME= gail
-PORTVERSION= 0.17
+PORTVERSION= 1.2.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
+LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-gtk-doc
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --with-html-dir=${PREFIX}/share/doc
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-pre-patch:
- @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index 0f5e123e0b37..e0c656f9b85e 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.17.tar.bz2) = 23d73923bd0947d5c975afa13b2de3a3
+MD5 (gnome2/gail-1.2.0.tar.bz2) = 8b5b960eb4f71656ff798e63401d1bf0
diff --git a/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in
index a112ecbdca64..e69de29bb2d1 100644
--- a/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in
+++ b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in
@@ -1,11 +0,0 @@
---- docs/reference/libgail-util/Makefile.in.orig Tue Jul 23 12:42:03 2002
-+++ docs/reference/libgail-util/Makefile.in Tue Jul 23 12:42:30 2002
-@@ -103,7 +103,7 @@
-
- INSTALLDIR = $(prefix)/share/gtk-doc
-
--HTML_DIR = ${datadir}/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
-
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 167f83199d09..26f09c50d8b5 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= gal2
-PORTVERSION= 0.0.7
+PORTVERSION= 1.99.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gal2-0/0.0
-DISTNAME= ${PORTNAME}-0-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/gal/1.99
+DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
- gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+ gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index cae9923cc410..95d431ce2f9e 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gal2-0-0.0.7.tar.bz2) = b6d7f0d41c0fcd07a943de3ddb92245e
+MD5 (gnome2/gal-1.99.1.tar.bz2) = 7ce5122053c46a2b5c4445c30cc860b1
diff --git a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
index d12a6a930b83..69c179628356 100644
--- a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
+++ b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c
@@ -1,5 +1,5 @@
---- gal/e-table/e-table-group.c.orig Thu Nov 28 13:51:22 2002
-+++ gal/e-table/e-table-group.c Thu Nov 28 22:23:01 2002
+--- gal/e-table/e-table-group.c.orig Wed Nov 20 10:02:06 2002
++++ gal/e-table/e-table-group.c Thu Feb 6 22:35:27 2003
@@ -22,6 +22,7 @@
*/
@@ -8,17 +8,17 @@
#include <gtk/gtksignal.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include "e-table-group.h"
-@@ -129,13 +130,14 @@
+@@ -128,13 +129,14 @@
ETableHeader *header,
ETableModel *model)
{
+ va_list args;
etg->full_header = full_header;
- gtk_object_ref (GTK_OBJECT(etg->full_header));
+ g_object_ref (etg->full_header);
etg->header = header;
- gtk_object_ref (GTK_OBJECT(etg->header));
+ g_object_ref (etg->header);
etg->model = model;
- gtk_object_ref (GTK_OBJECT(etg->model));
+ g_object_ref (etg->model);
- gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
+ gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, args);
}
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 3309af5bd8ee..1c8cd9903601 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -1,142 +1,153 @@
-include/gal-2-0/gal/e-paned/e-hpaned.h
-include/gal-2-0/gal/e-paned/e-paned.h
-include/gal-2-0/gal/e-paned/e-vpaned.h
-include/gal-2-0/gal/e-table/e-cell-checkbox.h
-include/gal-2-0/gal/e-table/e-cell-combo.h
-include/gal-2-0/gal/e-table/e-cell-date.h
-include/gal-2-0/gal/e-table/e-cell-float.h
-include/gal-2-0/gal/e-table/e-cell-number.h
-include/gal-2-0/gal/e-table/e-cell-pixbuf.h
-include/gal-2-0/gal/e-table/e-cell-popup.h
-include/gal-2-0/gal/e-table/e-cell-progress.h
-include/gal-2-0/gal/e-table/e-cell-size.h
-include/gal-2-0/gal/e-table/e-cell-spin-button.h
-include/gal-2-0/gal/e-table/e-cell-text.h
-include/gal-2-0/gal/e-table/e-cell-toggle.h
-include/gal-2-0/gal/e-table/e-cell-tree.h
-include/gal-2-0/gal/e-table/e-cell-vbox.h
-include/gal-2-0/gal/e-table/e-cell.h
-include/gal-2-0/gal/e-table/e-table-click-to-add.h
-include/gal-2-0/gal/e-table/e-table-col-dnd.h
-include/gal-2-0/gal/e-table/e-table-col.h
-include/gal-2-0/gal/e-table/e-table-column-specification.h
-include/gal-2-0/gal/e-table/e-table-config.h
-include/gal-2-0/gal/e-table/e-table-defines.h
-include/gal-2-0/gal/e-table/e-table-extras.h
-include/gal-2-0/gal/e-table/e-table-field-chooser-dialog.h
-include/gal-2-0/gal/e-table/e-table-field-chooser-item.h
-include/gal-2-0/gal/e-table/e-table-field-chooser.h
-include/gal-2-0/gal/e-table/e-table-group-container.h
-include/gal-2-0/gal/e-table/e-table-group-leaf.h
-include/gal-2-0/gal/e-table/e-table-group.h
-include/gal-2-0/gal/e-table/e-table-header-item.h
-include/gal-2-0/gal/e-table/e-table-header-utils.h
-include/gal-2-0/gal/e-table/e-table-header.h
-include/gal-2-0/gal/e-table/e-table-item.h
-include/gal-2-0/gal/e-table/e-table-memory-callbacks.h
-include/gal-2-0/gal/e-table/e-table-memory-store.h
-include/gal-2-0/gal/e-table/e-table-memory.h
-include/gal-2-0/gal/e-table/e-table-model.h
-include/gal-2-0/gal/e-table/e-table-one.h
-include/gal-2-0/gal/e-table/e-table-scrolled.h
-include/gal-2-0/gal/e-table/e-table-search.h
-include/gal-2-0/gal/e-table/e-table-selection-model.h
-include/gal-2-0/gal/e-table/e-table-simple.h
-include/gal-2-0/gal/e-table/e-table-sort-info.h
-include/gal-2-0/gal/e-table/e-table-sorted-variable.h
-include/gal-2-0/gal/e-table/e-table-sorted.h
-include/gal-2-0/gal/e-table/e-table-sorter.h
-include/gal-2-0/gal/e-table/e-table-sorting-utils.h
-include/gal-2-0/gal/e-table/e-table-specification.h
-include/gal-2-0/gal/e-table/e-table-state.h
-include/gal-2-0/gal/e-table/e-table-subset-variable.h
-include/gal-2-0/gal/e-table/e-table-subset.h
-include/gal-2-0/gal/e-table/e-table-tooltip.h
-include/gal-2-0/gal/e-table/e-table-utils.h
-include/gal-2-0/gal/e-table/e-table-without.h
-include/gal-2-0/gal/e-table/e-table.h
-include/gal-2-0/gal/e-table/e-tree-memory-callbacks.h
-include/gal-2-0/gal/e-table/e-tree-memory.h
-include/gal-2-0/gal/e-table/e-tree-model.h
-include/gal-2-0/gal/e-table/e-tree-scrolled.h
-include/gal-2-0/gal/e-table/e-tree-selection-model.h
-include/gal-2-0/gal/e-table/e-tree-sorted.h
-include/gal-2-0/gal/e-table/e-tree-table-adapter.h
-include/gal-2-0/gal/e-table/e-tree.h
-include/gal-2-0/gal/e-text/e-completion-match.h
-include/gal-2-0/gal/e-text/e-completion-view.h
-include/gal-2-0/gal/e-text/e-completion.h
-include/gal-2-0/gal/e-text/e-entry.h
-include/gal-2-0/gal/e-text/e-table-text-model.h
-include/gal-2-0/gal/e-text/e-text-model-repos.h
-include/gal-2-0/gal/e-text/e-text-model-uri.h
-include/gal-2-0/gal/e-text/e-text-model.h
-include/gal-2-0/gal/e-text/e-text.h
-include/gal-2-0/gal/menus/gal-define-views-dialog.h
-include/gal-2-0/gal/menus/gal-define-views-model.h
-include/gal-2-0/gal/menus/gal-view-collection.h
-include/gal-2-0/gal/menus/gal-view-etable.h
-include/gal-2-0/gal/menus/gal-view-factory-etable.h
-include/gal-2-0/gal/menus/gal-view-factory.h
-include/gal-2-0/gal/menus/gal-view-instance-save-as-dialog.h
-include/gal-2-0/gal/menus/gal-view-instance.h
-include/gal-2-0/gal/menus/gal-view-new-dialog.h
-include/gal-2-0/gal/menus/gal-view.h
-include/gal-2-0/gal/shortcut-bar/e-group-bar.h
-include/gal-2-0/gal/shortcut-bar/e-icon-bar-bg-item.h
-include/gal-2-0/gal/shortcut-bar/e-icon-bar.h
-include/gal-2-0/gal/shortcut-bar/e-shortcut-bar.h
-include/gal-2-0/gal/shortcut-bar/e-shortcut-model.h
-include/gal-2-0/gal/shortcut-bar/e-vscrolled-bar.h
-include/gal-2-0/gal/util/e-bit-array.h
-include/gal-2-0/gal/util/e-cache.h
-include/gal-2-0/gal/util/e-marshal.h
-include/gal-2-0/gal/util/e-sorter-array.h
-include/gal-2-0/gal/util/e-sorter.h
-include/gal-2-0/gal/util/e-text-event-processor-emacs-like.h
-include/gal-2-0/gal/util/e-text-event-processor-types.h
-include/gal-2-0/gal/util/e-text-event-processor.h
-include/gal-2-0/gal/util/e-util.h
-include/gal-2-0/gal/util/e-xml-utils.h
-include/gal-2-0/gal/widgets/color-group.h
-include/gal-2-0/gal/widgets/color-palette.h
-include/gal-2-0/gal/widgets/e-canvas-background.h
-include/gal-2-0/gal/widgets/e-canvas-utils.h
-include/gal-2-0/gal/widgets/e-canvas-vbox.h
-include/gal-2-0/gal/widgets/e-canvas.h
-include/gal-2-0/gal/widgets/e-categories-master-list-array.h
-include/gal-2-0/gal/widgets/e-categories-master-list-combo.h
-include/gal-2-0/gal/widgets/e-categories-master-list-dialog-model.h
-include/gal-2-0/gal/widgets/e-categories-master-list-dialog.h
-include/gal-2-0/gal/widgets/e-categories-master-list-option-menu.h
-include/gal-2-0/gal/widgets/e-categories-master-list.h
-include/gal-2-0/gal/widgets/e-categories.h
-include/gal-2-0/gal/widgets/e-colors.h
-include/gal-2-0/gal/widgets/e-cursors.h
-include/gal-2-0/gal/widgets/e-file-selection.h
-include/gal-2-0/gal/widgets/e-font.h
-include/gal-2-0/gal/widgets/e-gui-utils.h
-include/gal-2-0/gal/widgets/e-hscrollbar.h
-include/gal-2-0/gal/widgets/e-hsv-utils.h
-include/gal-2-0/gal/widgets/e-option-menu.h
-include/gal-2-0/gal/widgets/e-popup-menu.h
-include/gal-2-0/gal/widgets/e-printable.h
-include/gal-2-0/gal/widgets/e-reflow-model.h
-include/gal-2-0/gal/widgets/e-reflow.h
-include/gal-2-0/gal/widgets/e-scroll-frame.h
-include/gal-2-0/gal/widgets/e-selection-model-array.h
-include/gal-2-0/gal/widgets/e-selection-model-simple.h
-include/gal-2-0/gal/widgets/e-selection-model.h
-include/gal-2-0/gal/widgets/e-unicode.h
-include/gal-2-0/gal/widgets/e-vscrollbar.h
-include/gal-2-0/gal/widgets/gtk-combo-box.h
-include/gal-2-0/gal/widgets/gtk-combo-stack.h
-include/gal-2-0/gal/widgets/gtk-combo-text.h
-include/gal-2-0/gal/widgets/widget-color-combo.h
-include/gal-2-0/gal/widgets/widget-pixmap-combo.h
-lib/libgal-2-0.a
-lib/libgal-2-0.so
-lib/libgal-2-0.so.2
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-registry.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-text.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-factory.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-item.h
+include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table.h
+include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text-factory.h
+include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text.h
+include/gal-2.0/gal/a11y/gal-a11y-util.h
+include/gal-2.0/gal/e-paned/e-hpaned.h
+include/gal-2.0/gal/e-paned/e-paned.h
+include/gal-2.0/gal/e-paned/e-vpaned.h
+include/gal-2.0/gal/e-table/e-cell-checkbox.h
+include/gal-2.0/gal/e-table/e-cell-combo.h
+include/gal-2.0/gal/e-table/e-cell-date.h
+include/gal-2.0/gal/e-table/e-cell-float.h
+include/gal-2.0/gal/e-table/e-cell-number.h
+include/gal-2.0/gal/e-table/e-cell-pixbuf.h
+include/gal-2.0/gal/e-table/e-cell-popup.h
+include/gal-2.0/gal/e-table/e-cell-progress.h
+include/gal-2.0/gal/e-table/e-cell-size.h
+include/gal-2.0/gal/e-table/e-cell-spin-button.h
+include/gal-2.0/gal/e-table/e-cell-text.h
+include/gal-2.0/gal/e-table/e-cell-toggle.h
+include/gal-2.0/gal/e-table/e-cell-tree.h
+include/gal-2.0/gal/e-table/e-cell-vbox.h
+include/gal-2.0/gal/e-table/e-cell.h
+include/gal-2.0/gal/e-table/e-table-click-to-add.h
+include/gal-2.0/gal/e-table/e-table-col-dnd.h
+include/gal-2.0/gal/e-table/e-table-col.h
+include/gal-2.0/gal/e-table/e-table-column-specification.h
+include/gal-2.0/gal/e-table/e-table-config.h
+include/gal-2.0/gal/e-table/e-table-defines.h
+include/gal-2.0/gal/e-table/e-table-extras.h
+include/gal-2.0/gal/e-table/e-table-field-chooser-dialog.h
+include/gal-2.0/gal/e-table/e-table-field-chooser-item.h
+include/gal-2.0/gal/e-table/e-table-field-chooser.h
+include/gal-2.0/gal/e-table/e-table-group-container.h
+include/gal-2.0/gal/e-table/e-table-group-leaf.h
+include/gal-2.0/gal/e-table/e-table-group.h
+include/gal-2.0/gal/e-table/e-table-header-item.h
+include/gal-2.0/gal/e-table/e-table-header-utils.h
+include/gal-2.0/gal/e-table/e-table-header.h
+include/gal-2.0/gal/e-table/e-table-item.h
+include/gal-2.0/gal/e-table/e-table-memory-callbacks.h
+include/gal-2.0/gal/e-table/e-table-memory-store.h
+include/gal-2.0/gal/e-table/e-table-memory.h
+include/gal-2.0/gal/e-table/e-table-model.h
+include/gal-2.0/gal/e-table/e-table-one.h
+include/gal-2.0/gal/e-table/e-table-scrolled.h
+include/gal-2.0/gal/e-table/e-table-search.h
+include/gal-2.0/gal/e-table/e-table-selection-model.h
+include/gal-2.0/gal/e-table/e-table-simple.h
+include/gal-2.0/gal/e-table/e-table-sort-info.h
+include/gal-2.0/gal/e-table/e-table-sorted-variable.h
+include/gal-2.0/gal/e-table/e-table-sorted.h
+include/gal-2.0/gal/e-table/e-table-sorter.h
+include/gal-2.0/gal/e-table/e-table-sorting-utils.h
+include/gal-2.0/gal/e-table/e-table-specification.h
+include/gal-2.0/gal/e-table/e-table-state.h
+include/gal-2.0/gal/e-table/e-table-subset-variable.h
+include/gal-2.0/gal/e-table/e-table-subset.h
+include/gal-2.0/gal/e-table/e-table-tooltip.h
+include/gal-2.0/gal/e-table/e-table-utils.h
+include/gal-2.0/gal/e-table/e-table-without.h
+include/gal-2.0/gal/e-table/e-table.h
+include/gal-2.0/gal/e-table/e-tree-memory-callbacks.h
+include/gal-2.0/gal/e-table/e-tree-memory.h
+include/gal-2.0/gal/e-table/e-tree-model.h
+include/gal-2.0/gal/e-table/e-tree-scrolled.h
+include/gal-2.0/gal/e-table/e-tree-selection-model.h
+include/gal-2.0/gal/e-table/e-tree-sorted.h
+include/gal-2.0/gal/e-table/e-tree-table-adapter.h
+include/gal-2.0/gal/e-table/e-tree.h
+include/gal-2.0/gal/e-text/e-completion-match.h
+include/gal-2.0/gal/e-text/e-completion-view.h
+include/gal-2.0/gal/e-text/e-completion.h
+include/gal-2.0/gal/e-text/e-entry.h
+include/gal-2.0/gal/e-text/e-table-text-model.h
+include/gal-2.0/gal/e-text/e-text-model-repos.h
+include/gal-2.0/gal/e-text/e-text-model-uri.h
+include/gal-2.0/gal/e-text/e-text-model.h
+include/gal-2.0/gal/e-text/e-text.h
+include/gal-2.0/gal/menus/gal-define-views-dialog.h
+include/gal-2.0/gal/menus/gal-define-views-model.h
+include/gal-2.0/gal/menus/gal-view-collection.h
+include/gal-2.0/gal/menus/gal-view-etable.h
+include/gal-2.0/gal/menus/gal-view-factory-etable.h
+include/gal-2.0/gal/menus/gal-view-factory.h
+include/gal-2.0/gal/menus/gal-view-instance-save-as-dialog.h
+include/gal-2.0/gal/menus/gal-view-instance.h
+include/gal-2.0/gal/menus/gal-view-new-dialog.h
+include/gal-2.0/gal/menus/gal-view.h
+include/gal-2.0/gal/shortcut-bar/e-group-bar.h
+include/gal-2.0/gal/shortcut-bar/e-icon-bar-bg-item.h
+include/gal-2.0/gal/shortcut-bar/e-icon-bar.h
+include/gal-2.0/gal/shortcut-bar/e-shortcut-bar.h
+include/gal-2.0/gal/shortcut-bar/e-shortcut-model.h
+include/gal-2.0/gal/shortcut-bar/e-vscrolled-bar.h
+include/gal-2.0/gal/util/e-bit-array.h
+include/gal-2.0/gal/util/e-cache.h
+include/gal-2.0/gal/util/e-iconv.h
+include/gal-2.0/gal/util/e-marshal.h
+include/gal-2.0/gal/util/e-sorter-array.h
+include/gal-2.0/gal/util/e-sorter.h
+include/gal-2.0/gal/util/e-text-event-processor-emacs-like.h
+include/gal-2.0/gal/util/e-text-event-processor-types.h
+include/gal-2.0/gal/util/e-text-event-processor.h
+include/gal-2.0/gal/util/e-util.h
+include/gal-2.0/gal/util/e-xml-utils.h
+include/gal-2.0/gal/widgets/color-group.h
+include/gal-2.0/gal/widgets/color-palette.h
+include/gal-2.0/gal/widgets/e-canvas-background.h
+include/gal-2.0/gal/widgets/e-canvas-utils.h
+include/gal-2.0/gal/widgets/e-canvas-vbox.h
+include/gal-2.0/gal/widgets/e-canvas.h
+include/gal-2.0/gal/widgets/e-categories-master-list-array.h
+include/gal-2.0/gal/widgets/e-categories-master-list-combo.h
+include/gal-2.0/gal/widgets/e-categories-master-list-dialog-model.h
+include/gal-2.0/gal/widgets/e-categories-master-list-dialog.h
+include/gal-2.0/gal/widgets/e-categories-master-list-option-menu.h
+include/gal-2.0/gal/widgets/e-categories-master-list.h
+include/gal-2.0/gal/widgets/e-categories.h
+include/gal-2.0/gal/widgets/e-colors.h
+include/gal-2.0/gal/widgets/e-cursors.h
+include/gal-2.0/gal/widgets/e-file-selection.h
+include/gal-2.0/gal/widgets/e-font.h
+include/gal-2.0/gal/widgets/e-gui-utils.h
+include/gal-2.0/gal/widgets/e-hscrollbar.h
+include/gal-2.0/gal/widgets/e-hsv-utils.h
+include/gal-2.0/gal/widgets/e-option-menu.h
+include/gal-2.0/gal/widgets/e-popup-menu.h
+include/gal-2.0/gal/widgets/e-printable.h
+include/gal-2.0/gal/widgets/e-reflow-model.h
+include/gal-2.0/gal/widgets/e-reflow.h
+include/gal-2.0/gal/widgets/e-scroll-frame.h
+include/gal-2.0/gal/widgets/e-selection-model-array.h
+include/gal-2.0/gal/widgets/e-selection-model-simple.h
+include/gal-2.0/gal/widgets/e-selection-model.h
+include/gal-2.0/gal/widgets/e-unicode.h
+include/gal-2.0/gal/widgets/e-vscrollbar.h
+include/gal-2.0/gal/widgets/gtk-combo-box.h
+include/gal-2.0/gal/widgets/gtk-combo-stack.h
+include/gal-2.0/gal/widgets/gtk-combo-text.h
+include/gal-2.0/gal/widgets/widget-color-combo.h
+include/gal-2.0/gal/widgets/widget-pixmap-combo.h
+lib/gtk-2.0/modules/libgal-a11y-2.0.so
+lib/libgal-2.0.a
+lib/libgal-2.0.so
+lib/libgal-2.0.so.0
libdata/pkgconfig/gal-2.0.pc
share/doc/gal2/gal-api.sgml
share/doc/gal2/gal-decl.txt
@@ -144,46 +155,48 @@ share/doc/gal2/gal-sections.txt
share/doc/gal2/gal.hierarchy
share/doc/gal2/gal.signals
share/doc/gal2/gal.types
-share/gnome/gal-2-0/%%VERSION%%/glade/e-categories-master-list-dialog.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-config-no-group.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-config.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-field-chooser.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/e-table-group.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-categories.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-define-views.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-share/gnome/gal-2-0/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_birthday_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_business_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_favorites_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_gifts_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_goals_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_holiday_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_ideas_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_international_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_personal_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_status_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_strategies_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
-share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
-@dirrm share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories
-@dirrm share/gnome/gal-2-0/%%VERSION%%/pixmaps
-@dirrm share/gnome/gal-2-0/%%VERSION%%/glade
-@dirrm share/gnome/gal-2-0/%%VERSION%%
-@dirrm share/gnome/gal-2-0
+share/gnome/gal-2.0/%%VERSION%%/glade/e-categories-master-list-dialog.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config-no-group.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/e-table-field-chooser.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-categories.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-define-views.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-new-dialog.glade
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_birthday_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_business_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_favorites_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_gifts_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_goals_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_ideas_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_international_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_personal_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_status_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_strategies_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png
+share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png
+@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories
+@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps
+@dirrm share/gnome/gal-2.0/%%VERSION%%/glade
+@dirrm share/gnome/gal-2.0/%%VERSION%%
+@dirrm share/gnome/gal-2.0
@dirrm share/doc/gal2/gal
@dirrm share/doc/gal2
-@dirrm include/gal-2-0/gal/widgets
-@dirrm include/gal-2-0/gal/util
-@dirrm include/gal-2-0/gal/shortcut-bar
-@dirrm include/gal-2-0/gal/menus
-@dirrm include/gal-2-0/gal/e-text
-@dirrm include/gal-2-0/gal/e-table
-@dirrm include/gal-2-0/gal/e-paned
-@dirrm include/gal-2-0/gal
-@dirrm include/gal-2-0
+@dirrm include/gal-2.0/gal/widgets
+@dirrm include/gal-2.0/gal/util
+@dirrm include/gal-2.0/gal/shortcut-bar
+@dirrm include/gal-2.0/gal/menus
+@dirrm include/gal-2.0/gal/e-text
+@dirrm include/gal-2.0/gal/e-table
+@dirrm include/gal-2.0/gal/e-paned
+@dirrm include/gal-2.0/gal/a11y/e-text
+@dirrm include/gal-2.0/gal/a11y/e-table
+@dirrm include/gal-2.0/gal/a11y
+@dirrm include/gal-2.0/gal
+@dirrm include/gal-2.0
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index d08a560c30f3..2c0841063dab 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -6,15 +6,17 @@
#
PORTNAME= gnome-themes
-PORTVERSION= 1.0
+PORTVERSION= 2.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine
+LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity
+RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo
index 682cebb1ffc4..a0b32f0fe100 100644
--- a/x11-toolkits/gnome-themes/distinfo
+++ b/x11-toolkits/gnome-themes/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-1.0.tar.bz2) = fd9f0cc87edfa7c8d9e04293f72f131d
+MD5 (gnome2/gnome-themes-2.2.tar.bz2) = 18f9b8cea0469bf2ae934024c6f4fa9d
diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure
new file mode 100644
index 000000000000..8afd3d20e32f
--- /dev/null
+++ b/x11-toolkits/gnome-themes/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Mon Feb 3 20:16:09 2003
++++ configure Mon Feb 3 20:16:31 2003
+@@ -7640,6 +7640,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in
new file mode 100644
index 000000000000..02365472fd62
--- /dev/null
+++ b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in
@@ -0,0 +1,11 @@
+--- metacity-themes/Makefile.in.orig Mon Feb 3 20:16:59 2003
++++ metacity-themes/Makefile.in Mon Feb 3 20:17:33 2003
+@@ -120,7 +120,7 @@
+ THEMES = Mist Sandwish Smokey
+
+
+-THEME_DIR = $(datadir)/themes
++THEME_DIR = $(datadir)/gnome/themes
+ THEME_SUBDIR = metacity-1
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist
index 6a2667b67616..f69543fe3d6f 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -1,3 +1,241 @@
+lib/gtk-2.0/2.2.0/engines/libcrux-engine.so
+lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so
+lib/gtk-2.0/2.2.0/engines/libmist.so
+share/eazel-engine/arrow_down-spinner.png
+share/eazel-engine/arrow_down.png
+share/eazel-engine/arrow_left.png
+share/eazel-engine/arrow_right.png
+share/eazel-engine/arrow_up-spinner.png
+share/eazel-engine/arrow_up.png
+share/eazel-engine/check-active-default-focus.png
+share/eazel-engine/check-active-default.png
+share/eazel-engine/check-active-hilight-focus.png
+share/eazel-engine/check-active-hilight.png
+share/eazel-engine/check-active-insensitive.png
+share/eazel-engine/check-active-pressed-focus.png
+share/eazel-engine/check-active-pressed.png
+share/eazel-engine/check-default-focus.png
+share/eazel-engine/check-default.png
+share/eazel-engine/check-hilight-focus.png
+share/eazel-engine/check-hilight.png
+share/eazel-engine/check-insensitive.png
+share/eazel-engine/check-pressed-focus.png
+share/eazel-engine/check-pressed.png
+share/eazel-engine/progressbar-left.png
+share/eazel-engine/progressbar-right.png
+share/eazel-engine/progressbar.png
+share/eazel-engine/progressbar_trough.png
+share/eazel-engine/radio-active-default-focus.png
+share/eazel-engine/radio-active-default.png
+share/eazel-engine/radio-active-hilight-focus.png
+share/eazel-engine/radio-active-hilight.png
+share/eazel-engine/radio-active-insensitive.png
+share/eazel-engine/radio-active-pressed-focus.png
+share/eazel-engine/radio-active-pressed.png
+share/eazel-engine/radio-default-focus.png
+share/eazel-engine/radio-default.png
+share/eazel-engine/radio-hilight-focus.png
+share/eazel-engine/radio-hilight.png
+share/eazel-engine/radio-insensitive.png
+share/eazel-engine/radio-pressed-focus.png
+share/eazel-engine/radio-pressed.png
+share/eazel-engine/scroller-arrow-down-hilight.png
+share/eazel-engine/scroller-arrow-down-pressed.png
+share/eazel-engine/scroller-arrow-down.png
+share/eazel-engine/scroller-arrow-left-hilight.png
+share/eazel-engine/scroller-arrow-left-pressed.png
+share/eazel-engine/scroller-arrow-left.png
+share/eazel-engine/scroller-arrow-right-hilight.png
+share/eazel-engine/scroller-arrow-right-pressed.png
+share/eazel-engine/scroller-arrow-right.png
+share/eazel-engine/scroller-arrow-up-hilight.png
+share/eazel-engine/scroller-arrow-up-pressed.png
+share/eazel-engine/scroller-arrow-up.png
+share/eazel-engine/scroller-h-hilight.png
+share/eazel-engine/scroller-h-thumb-hilight.png
+share/eazel-engine/scroller-h-thumb.png
+share/eazel-engine/scroller-h-trough.png
+share/eazel-engine/scroller-h.png
+share/eazel-engine/scroller-v-hilight.png
+share/eazel-engine/scroller-v-thumb-hilight.png
+share/eazel-engine/scroller-v-thumb.png
+share/eazel-engine/scroller-v-trough.png
+share/eazel-engine/scroller-v.png
+share/eazel-engine/slider_h_thumb.png
+share/eazel-engine/slider_h_trough.png
+share/eazel-engine/slider_h_trough_focus.png
+share/eazel-engine/slider_v_thumb.png
+share/eazel-engine/slider_v_trough.png
+share/eazel-engine/slider_v_trough_focus.png
+share/eazel-engine/tab_left-unsel.png
+share/eazel-engine/tab_left.png
+share/eazel-engine/tab_right.png
+share/eazel-engine/tab_sel-bottom.png
+share/eazel-engine/tab_sel.png
+share/eazel-engine/tab_usel-bottom-left.png
+share/eazel-engine/tab_usel-bottom.png
+share/eazel-engine/tab_usel-left.png
+share/eazel-engine/tab_usel.png
+share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png
+share/gnome/themes/Sandwish/metacity-1/active-border-top-right-border.png
+share/gnome/themes/Sandwish/metacity-1/active-bottom-left-border.png
+share/gnome/themes/Sandwish/metacity-1/active-bottom-left-corner.png
+share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-left-border.png
+share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-right-border.png
+share/gnome/themes/Sandwish/metacity-1/active-bottom-right-border.png
+share/gnome/themes/Sandwish/metacity-1/active-bottom-right-corner.png
+share/gnome/themes/Sandwish/metacity-1/active-button-prelight.png
+share/gnome/themes/Sandwish/metacity-1/active-button-pressed.png
+share/gnome/themes/Sandwish/metacity-1/active-button.png
+share/gnome/themes/Sandwish/metacity-1/active-close-button.png
+share/gnome/themes/Sandwish/metacity-1/active-left-border.png
+share/gnome/themes/Sandwish/metacity-1/active-left-top-border-shaded.png
+share/gnome/themes/Sandwish/metacity-1/active-left-top-border.png
+share/gnome/themes/Sandwish/metacity-1/active-maximize-button.png
+share/gnome/themes/Sandwish/metacity-1/active-menu-button-prelight.png
+share/gnome/themes/Sandwish/metacity-1/active-menu-button-pressed.png
+share/gnome/themes/Sandwish/metacity-1/active-menu-button.png
+share/gnome/themes/Sandwish/metacity-1/active-minimize-button.png
+share/gnome/themes/Sandwish/metacity-1/active-right-border.png
+share/gnome/themes/Sandwish/metacity-1/active-right-top-border-shaded.png
+share/gnome/themes/Sandwish/metacity-1/active-right-top-border.png
+share/gnome/themes/Sandwish/metacity-1/active-top-center-left.png
+share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-left.png
+share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-right.png
+share/gnome/themes/Sandwish/metacity-1/active-top-center-right.png
+share/gnome/themes/Sandwish/metacity-1/active-top-left-border.png
+share/gnome/themes/Sandwish/metacity-1/active-top-left-corner.png
+share/gnome/themes/Sandwish/metacity-1/active-top-mid-left-border.png
+share/gnome/themes/Sandwish/metacity-1/active-top-mid-right-border.png
+share/gnome/themes/Sandwish/metacity-1/active-top-right-border.png
+share/gnome/themes/Sandwish/metacity-1/active-top-right-corner.png
+share/gnome/themes/Sandwish/metacity-1/inactive-border-top-left-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-border-top-right-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-corner.png
+share/gnome/themes/Sandwish/metacity-1/inactive-bottom-mid-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-corner.png
+share/gnome/themes/Sandwish/metacity-1/inactive-button-prelight.png
+share/gnome/themes/Sandwish/metacity-1/inactive-button-pressed.png
+share/gnome/themes/Sandwish/metacity-1/inactive-button.png
+share/gnome/themes/Sandwish/metacity-1/inactive-close-button.png
+share/gnome/themes/Sandwish/metacity-1/inactive-left-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border-shaded.png
+share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-maximize-button.png
+share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-prelight.png
+share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-pressed.png
+share/gnome/themes/Sandwish/metacity-1/inactive-menu-button.png
+share/gnome/themes/Sandwish/metacity-1/inactive-minimize-button.png
+share/gnome/themes/Sandwish/metacity-1/inactive-right-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border-shaded.png
+share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-center-left.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-center-mid.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-center-right.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-left-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-left-corner.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-mid-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-right-border.png
+share/gnome/themes/Sandwish/metacity-1/inactive-top-right-corner.png
+share/gnome/themes/Sandwish/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Smokey/metacity-1/button-base.png
+share/gnome/themes/Smokey/metacity-1/button-pressed-shine.png
+share/gnome/themes/Smokey/metacity-1/button-pressed.png
+share/gnome/themes/Smokey/metacity-1/button-shine.png
+share/gnome/themes/Smokey/metacity-1/close.png
+share/gnome/themes/Smokey/metacity-1/maximize.png
+share/gnome/themes/Smokey/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Smokey/metacity-1/minimize.png
+share/gnome/themes/Smokey/metacity-1/stripes.png
+share/icons/Crux/12x12/filesystems/gnome-fs-directory.png
+share/icons/Crux/12x12/filesystems/gnome-fs-regular.png
+share/icons/Crux/192x192/filesystems/gnome-fs-directory.png
+share/icons/Crux/192x192/filesystems/gnome-fs-regular.png
+share/icons/Crux/20x20/filesystems/gnome-fs-directory.png
+share/icons/Crux/20x20/filesystems/gnome-fs-regular.png
+share/icons/Crux/24x24/filesystems/gnome-fs-directory.png
+share/icons/Crux/24x24/filesystems/gnome-fs-regular.png
+share/icons/Crux/36x36/filesystems/gnome-fs-directory.png
+share/icons/Crux/36x36/filesystems/gnome-fs-regular.png
+share/icons/Crux/48x48/emblems/emblem-nowrite.png
+share/icons/Crux/48x48/filesystems/gnome-fs-directory.png
+share/icons/Crux/48x48/filesystems/gnome-fs-regular.png
+share/icons/Crux/72x72/emblems/emblem-nowrite.png
+share/icons/Crux/72x72/filesystems/gnome-fs-directory.png
+share/icons/Crux/72x72/filesystems/gnome-fs-regular.png
+share/icons/Crux/96x96/emblems/emblem-nowrite.png
+share/icons/Crux/96x96/filesystems/gnome-fs-directory.png
+share/icons/Crux/96x96/filesystems/gnome-fs-regular.png
+share/icons/Crux/index.theme
+share/icons/Flat-Blue/12x12/emblems/emblem-symbolic-link.png
+share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory-accept.png
+share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory.png
+share/icons/Flat-Blue/12x12/filesystems/gnome-fs-regular.png
+share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-empty.png
+share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-full.png
+share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark-missing.png
+share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark.png
+share/icons/Flat-Blue/24x24/emblems/emblem-symbolic-link.png
+share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory-accept.png
+share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory.png
+share/icons/Flat-Blue/24x24/filesystems/gnome-fs-regular.png
+share/icons/Flat-Blue/36x36/emblems/emblem-symbolic-link.png
+share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory-accept.png
+share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory.png
+share/icons/Flat-Blue/36x36/filesystems/gnome-fs-regular.png
+share/icons/Flat-Blue/48x48/devices/gnome-dev-broken-image.png
+share/icons/Flat-Blue/48x48/devices/gnome-dev-spreadsheet.png
+share/icons/Flat-Blue/48x48/devices/gnome-dev-stalled.png
+share/icons/Flat-Blue/48x48/devices/gnome-dev-symlink.png
+share/icons/Flat-Blue/48x48/emblems/emblem-art.png
+share/icons/Flat-Blue/48x48/emblems/emblem-broken-link.png
+share/icons/Flat-Blue/48x48/emblems/emblem-camera.png
+share/icons/Flat-Blue/48x48/emblems/emblem-documents.png
+share/icons/Flat-Blue/48x48/emblems/emblem-generic.png
+share/icons/Flat-Blue/48x48/emblems/emblem-mail.png
+share/icons/Flat-Blue/48x48/emblems/emblem-multimedia.png
+share/icons/Flat-Blue/48x48/emblems/emblem-package.png
+share/icons/Flat-Blue/48x48/emblems/emblem-pictures.png
+share/icons/Flat-Blue/48x48/emblems/emblem-sound.png
+share/icons/Flat-Blue/48x48/emblems/emblem-symbolic-link.png
+share/icons/Flat-Blue/48x48/emblems/emblem-trash.png
+share/icons/Flat-Blue/48x48/emblems/emblem-web.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark-missing.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory-accept.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-home.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-loading.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-regular.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-empty.png
+share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Flat-Blue/72x72/devices/gnome-dev-search.png
+share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory-accept.png
+share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory.png
+share/icons/Flat-Blue/72x72/filesystems/gnome-fs-regular.png
+share/icons/Flat-Blue/72x72/filesystems/gnome-fs-web.png
+share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory-accept.png
+share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory.png
+share/icons/Flat-Blue/96x96/filesystems/gnome-fs-regular.png
+share/icons/Flat-Blue/index.theme
+share/icons/Flat-Blue/scalable/emblems/emblem-OK.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-certified.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-cool.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-danger.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-distinguished.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-draft.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-favorite.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-important.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-new.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-noread.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-nowrite.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-ohno.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-personal.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-special.svg
+share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg
share/icons/HighContrast/index.theme
share/icons/HighContrastInverse/index.theme
share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png
@@ -652,12 +890,84 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png
share/icons/LowContrastLargePrint/index.theme
+share/icons/Sandy/12x12/filesystems/gnome-fs-directory-accept.png
+share/icons/Sandy/12x12/filesystems/gnome-fs-directory.png
+share/icons/Sandy/24x24/filesystems/gnome-fs-directory-accept.png
+share/icons/Sandy/24x24/filesystems/gnome-fs-directory.png
+share/icons/Sandy/36x36/filesystems/gnome-fs-directory-accept.png
+share/icons/Sandy/36x36/filesystems/gnome-fs-directory.png
+share/icons/Sandy/48x48/filesystems/gnome-fs-directory-accept.png
+share/icons/Sandy/48x48/filesystems/gnome-fs-directory.png
+share/icons/Sandy/72x72/filesystems/gnome-fs-directory-accept.png
+share/icons/Sandy/72x72/filesystems/gnome-fs-directory.png
+share/icons/Sandy/96x96/filesystems/gnome-fs-directory-accept.png
+share/icons/Sandy/96x96/filesystems/gnome-fs-directory.png
+share/icons/Sandy/index.theme
+share/icons/Smokey-Blue/48x48/emblems/emblem-nowrite.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-72.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-96.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-nfs.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty-accept.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full-accept.png
+share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Blue/index.theme
+share/icons/Smokey-Red/48x48/emblems/emblem-nowrite.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-72.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-96.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-nfs.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty-accept.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
+share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Red/index.theme
+share/themes/Crux/gtk-2.0/gtkrc
+share/themes/Crux/index.theme
+share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png
+share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png
+share/themes/Grand-Canyon/gtk-2.0/3d_all_prelight.png
+share/themes/Grand-Canyon/gtk-2.0/3d_bottom_flat.png
+share/themes/Grand-Canyon/gtk-2.0/3d_bottom_normal.png
+share/themes/Grand-Canyon/gtk-2.0/3d_bottom_prelight.png
+share/themes/Grand-Canyon/gtk-2.0/3d_top_flat.png
+share/themes/Grand-Canyon/gtk-2.0/3d_top_normal.png
+share/themes/Grand-Canyon/gtk-2.0/3d_top_prelight.png
+share/themes/Grand-Canyon/gtk-2.0/arrow_down.png
+share/themes/Grand-Canyon/gtk-2.0/arrow_left.png
+share/themes/Grand-Canyon/gtk-2.0/arrow_null.png
+share/themes/Grand-Canyon/gtk-2.0/arrow_right.png
+share/themes/Grand-Canyon/gtk-2.0/arrow_sub.png
+share/themes/Grand-Canyon/gtk-2.0/arrow_up.png
+share/themes/Grand-Canyon/gtk-2.0/blank.png
+share/themes/Grand-Canyon/gtk-2.0/button_default.png
+share/themes/Grand-Canyon/gtk-2.0/check2.png
+share/themes/Grand-Canyon/gtk-2.0/entry1.png
+share/themes/Grand-Canyon/gtk-2.0/gtkrc
+share/themes/Grand-Canyon/gtk-2.0/gtkrc.pants
+share/themes/Grand-Canyon/gtk-2.0/hline.png
+share/themes/Grand-Canyon/gtk-2.0/htrough.png
+share/themes/Grand-Canyon/gtk-2.0/in.png
+share/themes/Grand-Canyon/gtk-2.0/menu_shadow.png
+share/themes/Grand-Canyon/gtk-2.0/minus.png
+share/themes/Grand-Canyon/gtk-2.0/mradio1.png
+share/themes/Grand-Canyon/gtk-2.0/mradio2.png
+share/themes/Grand-Canyon/gtk-2.0/notebook_bottom_flat.png
+share/themes/Grand-Canyon/gtk-2.0/notebook_left_flat.png
+share/themes/Grand-Canyon/gtk-2.0/notebook_right_flat.png
+share/themes/Grand-Canyon/gtk-2.0/notebook_top_flat.png
+share/themes/Grand-Canyon/gtk-2.0/option_menu.png
+share/themes/Grand-Canyon/gtk-2.0/plus.png
+share/themes/Grand-Canyon/gtk-2.0/radio2.png
+share/themes/Grand-Canyon/gtk-2.0/vtrough.png
+share/themes/Grand-Canyon/index.theme
share/themes/HighContrast/gtk-2.0/gtkrc
share/themes/HighContrast/index.theme
share/themes/HighContrastInverse/gtk-2.0/gtkrc
share/themes/HighContrastInverse/index.theme
share/themes/HighContrastLargePrint/gtk-2.0/gtkrc
-share/themes/HighContrastLargePrint/index.theme
+share/themes/HighContrastLargePrint/index.theme~
share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png
share/themes/HighContrastLargePrint/pixmaps/double-click-off.png
share/themes/HighContrastLargePrint/pixmaps/double-click-on.png
@@ -790,7 +1100,7 @@ share/themes/HighContrastLargePrint/pixmaps/volume-min.png
share/themes/HighContrastLargePrint/pixmaps/volume-mute.png
share/themes/HighContrastLargePrint/pixmaps/volume-zero.png
share/themes/HighContrastLargePrintInverse/gtk-2.0/gtkrc
-share/themes/HighContrastLargePrintInverse/index.theme
+share/themes/HighContrastLargePrintInverse/index.theme~
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png
@@ -1055,10 +1365,11 @@ share/themes/LargePrint/pixmaps/volume-medium.png
share/themes/LargePrint/pixmaps/volume-min.png
share/themes/LargePrint/pixmaps/volume-mute.png
share/themes/LargePrint/pixmaps/volume-zero.png
+share/themes/LighthouseBlue/gtk-2.0/gtkrc
share/themes/LowContrast/gtk-2.0/gtkrc
-share/themes/LowContrast/index.theme
+share/themes/LowContrast/index.theme~
share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
-share/themes/LowContrastLargePrint/index.theme
+share/themes/LowContrastLargePrint/index.theme~
share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png
share/themes/LowContrastLargePrint/pixmaps/double-click-off.png
share/themes/LowContrastLargePrint/pixmaps/double-click-on.png
@@ -1190,11 +1501,50 @@ share/themes/LowContrastLargePrint/pixmaps/volume-medium.png
share/themes/LowContrastLargePrint/pixmaps/volume-min.png
share/themes/LowContrastLargePrint/pixmaps/volume-mute.png
share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
+share/themes/Mist/gtk-2.0/gtkrc
+share/themes/Mist/index.theme
+share/themes/Ocean-Dream/index.theme
+share/themes/Simple/gtk-2.0/gtkrc
+share/themes/Simple/index.theme
+share/themes/Smokey-Blue/gtk-2.0/bubble-blue-prelight.png
+share/themes/Smokey-Blue/gtk-2.0/bubble-blue-pressed.png
+share/themes/Smokey-Blue/gtk-2.0/bubble-blue-sb.png
+share/themes/Smokey-Blue/gtk-2.0/bubble-blue.png
+share/themes/Smokey-Blue/gtk-2.0/bubble-grey.png
+share/themes/Smokey-Blue/gtk-2.0/check1.png
+share/themes/Smokey-Blue/gtk-2.0/check2.png
+share/themes/Smokey-Blue/gtk-2.0/gtkrc
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-blue.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-grey.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-blue.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-grey.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-blue.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-grey.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue1.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey.png
+share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey1.png
+share/themes/Smokey-Blue/gtk-2.0/lines_background.png
+share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png
+share/themes/Smokey-Blue/gtk-2.0/option1.png
+share/themes/Smokey-Blue/gtk-2.0/option2.png
+share/themes/Smokey-Blue/index.theme
+share/themes/Traditional/index.theme
+@dirrm share/themes/Traditional
+@dirrm share/themes/Smokey-Blue/gtk-2.0
+@dirrm share/themes/Smokey-Blue
+@dirrm share/themes/Simple/gtk-2.0
+@dirrm share/themes/Simple
+@dirrm share/themes/Ocean-Dream
+@dirrm share/themes/Mist/gtk-2.0
+@dirrm share/themes/Mist
@dirrm share/themes/LowContrastLargePrint/pixmaps
@dirrm share/themes/LowContrastLargePrint/gtk-2.0
@dirrm share/themes/LowContrastLargePrint
@dirrm share/themes/LowContrast/gtk-2.0
@dirrm share/themes/LowContrast
+@dirrm share/themes/LighthouseBlue/gtk-2.0
+@dirrm share/themes/LighthouseBlue
@dirrm share/themes/LargePrint/pixmaps
@dirrm share/themes/LargePrint/gtk-2.0
@dirrm share/themes/LargePrint
@@ -1208,6 +1558,31 @@ share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
@dirrm share/themes/HighContrastInverse
@dirrm share/themes/HighContrast/gtk-2.0
@dirrm share/themes/HighContrast
+@dirrm share/themes/Grand-Canyon/gtk-2.0
+@dirrm share/themes/Grand-Canyon
+@dirrm share/themes/Crux/gtk-2.0
+@dirrm share/themes/Crux
+@dirrm share/icons/Smokey-Red/48x48/filesystems
+@dirrm share/icons/Smokey-Red/48x48/emblems
+@dirrm share/icons/Smokey-Red/48x48
+@dirrm share/icons/Smokey-Red
+@dirrm share/icons/Smokey-Blue/48x48/filesystems
+@dirrm share/icons/Smokey-Blue/48x48/emblems
+@dirrm share/icons/Smokey-Blue/48x48
+@dirrm share/icons/Smokey-Blue
+@dirrm share/icons/Sandy/96x96/filesystems
+@dirrm share/icons/Sandy/96x96
+@dirrm share/icons/Sandy/72x72/filesystems
+@dirrm share/icons/Sandy/72x72
+@dirrm share/icons/Sandy/48x48/filesystems
+@dirrm share/icons/Sandy/48x48
+@dirrm share/icons/Sandy/36x36/filesystems
+@dirrm share/icons/Sandy/36x36
+@dirrm share/icons/Sandy/24x24/filesystems
+@dirrm share/icons/Sandy/24x24
+@dirrm share/icons/Sandy/12x12/filesystems
+@dirrm share/icons/Sandy/12x12
+@dirrm share/icons/Sandy
@dirrm share/icons/LowContrastLargePrint/48x48/mimetypes
@dirrm share/icons/LowContrastLargePrint/48x48/filesystems
@dirrm share/icons/LowContrastLargePrint/48x48/emblems
@@ -1233,4 +1608,56 @@ share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
@dirrm share/icons/HighContrastLargePrint
@dirrm share/icons/HighContrastInverse
@dirrm share/icons/HighContrast
+@dirrm share/icons/Flat-Blue/scalable/emblems
+@dirrm share/icons/Flat-Blue/scalable
+@dirrm share/icons/Flat-Blue/96x96/filesystems
+@dirrm share/icons/Flat-Blue/96x96
+@dirrm share/icons/Flat-Blue/72x72/filesystems
+@dirrm share/icons/Flat-Blue/72x72/devices
+@dirrm share/icons/Flat-Blue/72x72
+@dirrm share/icons/Flat-Blue/48x48/filesystems
+@dirrm share/icons/Flat-Blue/48x48/emblems
+@dirrm share/icons/Flat-Blue/48x48/devices
+@dirrm share/icons/Flat-Blue/48x48
+@dirrm share/icons/Flat-Blue/36x36/filesystems
+@dirrm share/icons/Flat-Blue/36x36/emblems
+@dirrm share/icons/Flat-Blue/36x36
+@dirrm share/icons/Flat-Blue/24x24/filesystems
+@dirrm share/icons/Flat-Blue/24x24/emblems
+@dirrm share/icons/Flat-Blue/24x24
+@dirrm share/icons/Flat-Blue/20x20/filesystems
+@dirrm share/icons/Flat-Blue/20x20
+@dirrm share/icons/Flat-Blue/192x192/filesystems
+@dirrm share/icons/Flat-Blue/192x192
+@dirrm share/icons/Flat-Blue/12x12/filesystems
+@dirrm share/icons/Flat-Blue/12x12/emblems
+@dirrm share/icons/Flat-Blue/12x12
+@dirrm share/icons/Flat-Blue
+@dirrm share/icons/Crux/96x96/filesystems
+@dirrm share/icons/Crux/96x96/emblems
+@dirrm share/icons/Crux/96x96
+@dirrm share/icons/Crux/72x72/filesystems
+@dirrm share/icons/Crux/72x72/emblems
+@dirrm share/icons/Crux/72x72
+@dirrm share/icons/Crux/48x48/filesystems
+@dirrm share/icons/Crux/48x48/emblems
+@dirrm share/icons/Crux/48x48
+@dirrm share/icons/Crux/36x36/filesystems
+@dirrm share/icons/Crux/36x36
+@dirrm share/icons/Crux/24x24/filesystems
+@dirrm share/icons/Crux/24x24
+@dirrm share/icons/Crux/20x20/filesystems
+@dirrm share/icons/Crux/20x20
+@dirrm share/icons/Crux/192x192/filesystems
+@dirrm share/icons/Crux/192x192
+@dirrm share/icons/Crux/12x12/filesystems
+@dirrm share/icons/Crux/12x12
+@dirrm share/icons/Crux
+@dirrm share/gnome/themes/Smokey/metacity-1
+@dirrm share/gnome/themes/Smokey
+@dirrm share/gnome/themes/Sandwish/metacity-1
+@dirrm share/gnome/themes/Sandwish
+@dirrm share/gnome/themes/Mist/metacity-1
+@dirrm share/gnome/themes/Mist
+@dirrm share/eazel-engine
@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index c0142e498200..649e67dcae87 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -6,22 +6,24 @@
#
PORTNAME= gtk-engines2
-PORTVERSION= 1.9.0
+PORTVERSION= 2.2.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gtk-engines/1.9
-DISTNAME= gtk-engines-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
+DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
+USE_GNOMENG= yes
+USE_GNOME= gnomehack
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= VERSION=2.0.0
+PLIST_SUB= VERSION=2.2.0
THEMES= metal redmond95
diff --git a/x11-toolkits/gtk-engines2/distinfo b/x11-toolkits/gtk-engines2/distinfo
index a025fd2ab81a..6e6b48e93ec1 100644
--- a/x11-toolkits/gtk-engines2/distinfo
+++ b/x11-toolkits/gtk-engines2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk-engines-1.9.0.tar.bz2) = d77b10a9e73226a306a32d5c89ba066d
+MD5 (gnome2/gtk-engines-2.2.0.tar.bz2) = 78e9276c28b509f3203de4873c20a263
diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist
index 1888a2ba8fcd..39f05f6c3a84 100644
--- a/x11-toolkits/gtk-engines2/pkg-plist
+++ b/x11-toolkits/gtk-engines2/pkg-plist
@@ -1,10 +1,9 @@
lib/gtk-2.0/%%VERSION%%/engines/libmetal.so
lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so
lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so
-share/themes/Metal/ICON.png
+libdata/pkgconfig/gtk-engines-2.pc
share/themes/Metal/README.html
share/themes/Metal/gtk-2.0/gtkrc
-share/themes/Redmond95/ICON.png
share/themes/Redmond95/README.html
share/themes/Redmond95/gtk-2.0/gtkrc
@dirrm share/themes/Redmond95/gtk-2.0
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b476e968af4a..0c008a6dba21 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gtk
-PORTVERSION= 2.0.9
+PORTVERSION= 2.2.1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -21,8 +21,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/devel/atk \
- pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS= atk-1.0.200:${PORTSDIR}/devel/atk \
+ pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -33,23 +33,28 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
-USE_GNOMENG= yes
-USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --enable-static \
- --with-xinput=xfree
+USE_GNOMENG= yes
+USE_GNOME= gnomehack
+CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= GTK_VERSION="2.0.0"
+PLIST_SUB= GTK_VERSION="2.2.0"
MAN1= gdk-pixbuf-csource.1
-post-extract:
+post-patch:
@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
+ @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|Xft\.h|Xft2.h|g'
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+ ${WRKSRC}/po/Makefile.in.in
pre-build:
${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index e289dc9500c9..72dd41ecd3b7 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2
+MD5 (gnome2/gtk+-2.2.1.tar.bz2) = dfd5755fddb26a46c96bfaa813280ac4
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index 591824a7d638..f195f07b43c6 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig Thu May 23 17:20:40 2002
-+++ configure Sat Jun 1 14:26:00 2002
-@@ -7192,6 +7192,7 @@
+--- configure.orig Wed Dec 11 18:31:51 2002
++++ configure Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,3 @@ $FreeBSD$
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10107,7 +10108,7 @@
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index b3df848c80aa..b0be157797ed 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- gtk/Makefile.in.orig Sat Jun 1 14:27:02 2002
-+++ gtk/Makefile.in Sat Jun 1 14:29:10 2002
-@@ -182,7 +182,7 @@
+--- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002
++++ gtk/Makefile.in Thu Dec 12 12:08:43 2002
+@@ -183,7 +183,7 @@
-DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
- -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
+ -DGTK_HOST=\"@host@\" \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 143e7096e46e..b9b4f883a8e2 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,10 +1,14 @@
bin/gdk-pixbuf-csource
bin/gtk-query-immodules-2.0
+bin/gdk-pixbuf-query-loaders
+etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
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
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
@@ -12,6 +16,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcursor.h
+include/gtk-2.0/gdk/gdkdisplay.h
+include/gtk-2.0/gdk/gdkdisplaymanager.h
include/gtk-2.0/gdk/gdkdnd.h
include/gtk-2.0/gdk/gdkdrawable.h
include/gtk-2.0/gdk/gdkenumtypes.h
@@ -30,6 +36,7 @@ include/gtk-2.0/gdk/gdkprivate.h
include/gtk-2.0/gdk/gdkproperty.h
include/gtk-2.0/gdk/gdkregion.h
include/gtk-2.0/gdk/gdkrgb.h
+include/gtk-2.0/gdk/gdkscreen.h
include/gtk-2.0/gdk/gdkselection.h
include/gtk-2.0/gdk/gdktypes.h
include/gtk-2.0/gdk/gdkvisual.h
@@ -181,6 +188,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
include/gtk-2.0/gtk/gtkvseparator.h
include/gtk-2.0/gtk/gtkwidget.h
include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
@@ -205,16 +213,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.0
+lib/libgdk-x11-2.0.so.200
lib/libgdk_pixbuf-2.0.a
lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf-2.0.so.200
lib/libgdk_pixbuf_xlib-2.0.a
lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.so.200
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.0
+lib/libgtk-x11-2.0.so.200
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -223,7 +231,6 @@ libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
share/locale/am/LC_MESSAGES/gtk20.mo
-share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/be/LC_MESSAGES/gtk20.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
@@ -253,6 +260,8 @@ share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/lt/LC_MESSAGES/gtk20.mo
share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20.mo
share/locale/ms/LC_MESSAGES/gtk20.mo
share/locale/nl/LC_MESSAGES/gtk20.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
@@ -267,6 +276,7 @@ share/locale/sl/LC_MESSAGES/gtk20.mo
share/locale/sp/LC_MESSAGES/gtk20.mo
share/locale/sr/LC_MESSAGES/gtk20.mo
share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/ta/LC_MESSAGES/gtk20.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index b476e968af4a..0c008a6dba21 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gtk
-PORTVERSION= 2.0.9
+PORTVERSION= 2.2.1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -21,8 +21,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/devel/atk \
- pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS= atk-1.0.200:${PORTSDIR}/devel/atk \
+ pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -33,23 +33,28 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
-USE_GNOMENG= yes
-USE_GNOME= gnomehack
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --enable-static \
- --with-xinput=xfree
+USE_GNOMENG= yes
+USE_GNOME= gnomehack
+CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= GTK_VERSION="2.0.0"
+PLIST_SUB= GTK_VERSION="2.2.0"
MAN1= gdk-pixbuf-csource.1
-post-extract:
+post-patch:
@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
+ @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|Xft\.h|Xft2.h|g'
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+ ${WRKSRC}/po/Makefile.in.in
pre-build:
${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index e289dc9500c9..72dd41ecd3b7 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2
+MD5 (gnome2/gtk+-2.2.1.tar.bz2) = dfd5755fddb26a46c96bfaa813280ac4
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index 591824a7d638..f195f07b43c6 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig Thu May 23 17:20:40 2002
-+++ configure Sat Jun 1 14:26:00 2002
-@@ -7192,6 +7192,7 @@
+--- configure.orig Wed Dec 11 18:31:51 2002
++++ configure Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,3 @@ $FreeBSD$
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10107,7 +10108,7 @@
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index b3df848c80aa..b0be157797ed 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- gtk/Makefile.in.orig Sat Jun 1 14:27:02 2002
-+++ gtk/Makefile.in Sat Jun 1 14:29:10 2002
-@@ -182,7 +182,7 @@
+--- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002
++++ gtk/Makefile.in Thu Dec 12 12:08:43 2002
+@@ -183,7 +183,7 @@
-DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
- -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
+ -DGTK_HOST=\"@host@\" \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 143e7096e46e..b9b4f883a8e2 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,10 +1,14 @@
bin/gdk-pixbuf-csource
bin/gtk-query-immodules-2.0
+bin/gdk-pixbuf-query-loaders
+etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
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
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
@@ -12,6 +16,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcursor.h
+include/gtk-2.0/gdk/gdkdisplay.h
+include/gtk-2.0/gdk/gdkdisplaymanager.h
include/gtk-2.0/gdk/gdkdnd.h
include/gtk-2.0/gdk/gdkdrawable.h
include/gtk-2.0/gdk/gdkenumtypes.h
@@ -30,6 +36,7 @@ include/gtk-2.0/gdk/gdkprivate.h
include/gtk-2.0/gdk/gdkproperty.h
include/gtk-2.0/gdk/gdkregion.h
include/gtk-2.0/gdk/gdkrgb.h
+include/gtk-2.0/gdk/gdkscreen.h
include/gtk-2.0/gdk/gdkselection.h
include/gtk-2.0/gdk/gdktypes.h
include/gtk-2.0/gdk/gdkvisual.h
@@ -181,6 +188,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
include/gtk-2.0/gtk/gtkvseparator.h
include/gtk-2.0/gtk/gtkwidget.h
include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
@@ -205,16 +213,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.0
+lib/libgdk-x11-2.0.so.200
lib/libgdk_pixbuf-2.0.a
lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf-2.0.so.200
lib/libgdk_pixbuf_xlib-2.0.a
lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.so.200
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.0
+lib/libgtk-x11-2.0.so.200
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -223,7 +231,6 @@ libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
share/locale/am/LC_MESSAGES/gtk20.mo
-share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/be/LC_MESSAGES/gtk20.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
@@ -253,6 +260,8 @@ share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/lt/LC_MESSAGES/gtk20.mo
share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20.mo
share/locale/ms/LC_MESSAGES/gtk20.mo
share/locale/nl/LC_MESSAGES/gtk20.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
@@ -267,6 +276,7 @@ share/locale/sl/LC_MESSAGES/gtk20.mo
share/locale/sp/LC_MESSAGES/gtk20.mo
share/locale/sr/LC_MESSAGES/gtk20.mo
share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/ta/LC_MESSAGES/gtk20.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 8d2d9d44575a..6ab877a337cf 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,16 +6,16 @@
#
PORTNAME= libbonoboui
-PORTVERSION= 2.0.3.3
+PORTVERSION= 2.2.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas \
- gnome-2.0:${PORTSDIR}/x11/libgnome
+LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas \
+ gnome-2.200:${PORTSDIR}/x11/libgnome
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index ea7c39b5db44..71c72347e16b 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-2.0.3.3.tar.bz2) = 2ae0f5ea9567a6e6bca80df4156978fc
+MD5 (gnome2/libbonoboui-2.2.0.tar.bz2) = e3a5090990f0dcf88aa1e8e8cea74e4f
diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c
deleted file mode 100644
index 7d93d259360a..000000000000
--- a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- bonobo/bonobo-ui-util.c.orig Mon Sep 2 11:24:00 2002
-+++ bonobo/bonobo-ui-util.c Sat Nov 16 16:38:54 2002
-@@ -539,11 +539,10 @@
- GNOME_PARAM_GNOME_PREFIX, &prefix, NULL);
- }
-
-- /* sub-optimal, but what can you do */
-- if (prefix)
-- datadir = g_strdup_printf ("%s/share", prefix);
-- else
-- datadir = g_strdup (BONOBO_DATADIR);
-+ g_object_get (G_OBJECT (gnome_program_get ()),
-+ GNOME_PARAM_APP_DATADIR, &datadir, NULL);
-+ if (!datadir)
-+ datadir = g_strdup (BONOBO_DATADIR);
-
- cl->program = gnome_program_init (
- doc_id, "2.1",
diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure
index b963f8bcce5c..e33f9e6ceb4e 100644
--- a/x11-toolkits/libbonoboui/files/patch-configure
+++ b/x11-toolkits/libbonoboui/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig Fri Oct 18 07:23:27 2002
-+++ configure Fri Nov 1 16:08:44 2002
-@@ -7235,6 +7235,7 @@
+
+$FreeBSD$
+
+--- configure 2002/04/26 11:11:58 1.1
++++ configure 2002/04/26 11:12:23
+@@ -7013,6 +7013,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index f97a23354ee4..3a29cf390d36 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -46,11 +46,13 @@ share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
@@ -58,6 +60,7 @@ share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ms/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/no/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 1e2f5d4cd2f5..dda56c9df969 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgail-gnome
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
@@ -14,8 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
- spi.1:${PORTSDIR}/x11-toolkits/at-spi
+LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+ spi.8:${PORTSDIR}/x11-toolkits/at-spi
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 20a3f9a65579..a4facd7dfcbd 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,16 +6,16 @@
#
PORTNAME= libgnomeprintui
-PORTVERSION= 1.116.3
+PORTVERSION= 2.2.1.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.116
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gnomeprint-2.0:${PORTSDIR}/print/libgnomeprint \
- gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
+LIB_DEPENDS= gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
+ gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -25,7 +25,7 @@ USE_GNOMENG= yes
USE_GNOME= gnomeprefix gnomehack
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index 9e71a6a29887..03477a7f497c 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprintui-1.116.3.tar.bz2) = 4db8d9c405ab9717861463b333c01366
+MD5 (gnome2/libgnomeprintui-2.2.1.1.tar.bz2) = fda6586628c60693295b81cc3576ca23
diff --git a/x11-toolkits/libgnomeprintui/files/patch-configure b/x11-toolkits/libgnomeprintui/files/patch-configure
new file mode 100644
index 000000000000..188be53fea84
--- /dev/null
+++ b/x11-toolkits/libgnomeprintui/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Tue Dec 10 22:29:55 2002
++++ configure Tue Dec 10 22:30:17 2002
+@@ -8158,6 +8158,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh b/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Wed Jan 23 11:38:40 2002
-+++ ltmain.sh Sun Feb 3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2412,6 +2420,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 07649de3e14a..c89a4928adb1 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -1,40 +1,70 @@
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-font-dialog.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-copies.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-dialog.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-master-preview.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-paper-selector.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-preview.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-printer-dialog.h
-lib/libgnomeprintui-2.a
-lib/libgnomeprintui-2.so
-lib/libgnomeprintui-2.so.0
-libdata/pkgconfig/libgnomeprintui-2.0.pc
-share/locale/am/LC_MESSAGES/libgnomeprintui.mo
-share/locale/az/LC_MESSAGES/libgnomeprintui.mo
-share/locale/be/LC_MESSAGES/libgnomeprintui.mo
-share/locale/bg/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ca/LC_MESSAGES/libgnomeprintui.mo
-share/locale/cs/LC_MESSAGES/libgnomeprintui.mo
-share/locale/da/LC_MESSAGES/libgnomeprintui.mo
-share/locale/de/LC_MESSAGES/libgnomeprintui.mo
-share/locale/el/LC_MESSAGES/libgnomeprintui.mo
-share/locale/es/LC_MESSAGES/libgnomeprintui.mo
-share/locale/et/LC_MESSAGES/libgnomeprintui.mo
-share/locale/eu/LC_MESSAGES/libgnomeprintui.mo
-share/locale/hi/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ko/LC_MESSAGES/libgnomeprintui.mo
-share/locale/lv/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ms/LC_MESSAGES/libgnomeprintui.mo
-share/locale/pl/LC_MESSAGES/libgnomeprintui.mo
-share/locale/pt/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ro/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ru/LC_MESSAGES/libgnomeprintui.mo
-share/locale/sl/LC_MESSAGES/libgnomeprintui.mo
-share/locale/sv/LC_MESSAGES/libgnomeprintui.mo
-share/locale/ta/LC_MESSAGES/libgnomeprintui.mo
-share/locale/vi/LC_MESSAGES/libgnomeprintui.mo
-share/locale/wa/LC_MESSAGES/libgnomeprintui.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomeprintui.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomeprintui.mo
-@dirrm include/libgnomeprintui-2.0/libgnomeprintui
-@dirrm include/libgnomeprintui-2.0
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
+lib/libgnomeprintui-2-2.a
+lib/libgnomeprintui-2-2.so
+lib/libgnomeprintui-2-2.so.0
+libdata/pkgconfig/libgnomeprintui-2.2.pc
+share/doc/libgnomeprintui/c7.html
+share/doc/libgnomeprintui/index.html
+share/doc/libgnomeprintui/index.sgml
+share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
+share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
+share/doc/libgnomeprintui/libgnomeprintui.html
+share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/he/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/hi/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/hr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/hu/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ms/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/no/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
+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/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
+@dirrm share/doc/libgnomeprintui
+@dirrm include/libgnomeprintui-2.2/libgnomeprintui
+@dirrm include/libgnomeprintui-2.2
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 00f4eb3e66c8..6a2da9db23c0 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,16 +6,17 @@
#
PORTNAME= libgnomeui
-PORTVERSION= 2.0.6
-PORTREVISION= 1
+PORTVERSION= 2.2.0.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS+= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui
+LIB_DEPENDS+= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui \
+ startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 16327a337d4c..7014f72c327e 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-2.0.6.tar.bz2) = 5915cc352f3c89705f9dc5d73a6a2600
+MD5 (gnome2/libgnomeui-2.2.0.1.tar.bz2) = f8cb4ecb5058e59a2df11a007323ae91
diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in
index a0bf02e31068..5eb473f9c1d8 100644
--- a/x11-toolkits/libgnomeui/files/patch-Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig Fri May 17 20:27:51 2002
-+++ Makefile.in Fri May 17 20:29:00 2002
-@@ -115,7 +115,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
+--- Makefile.in.orig Sat Nov 9 02:33:58 2002
++++ Makefile.in Sat Nov 9 02:36:36 2002
+@@ -122,7 +122,7 @@
+ cxxflags_set = @cxxflags_set@
+ gnomelocaledir = @gnomelocaledir@
-SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests
+SUBDIRS = libgnomeui glade images demos doc po #tests
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
new file mode 100644
index 000000000000..4aa372f11bb9
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
@@ -0,0 +1,11 @@
+--- libgnomeui/Makefile.in.orig Sat Nov 9 02:37:09 2002
++++ libgnomeui/Makefile.in Sat Nov 9 02:38:38 2002
+@@ -150,7 +150,7 @@
+ -DGNOMEUILIBDIR=\""$(libdir)"\" \
+ -DGNOMEUIDATADIR=\""$(datadir)"\" \
+ -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" \
+- -DGNOMEUIICONDIR=\""$(datadir)/icons"\" \
++ -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\" \
+ -DGNOMEUISERVERDIR=\""$(libexecdir)"\" \
+ -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" \
+ -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" \
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index aafe82e641c8..77f82ec0b27a 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -21,7 +21,9 @@ include/libgnomeui-2.0/libgnomeui/gnome-ice.h
include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h
include/libgnomeui-2.0/libgnomeui/gnome-icon-item.h
include/libgnomeui-2.0/libgnomeui/gnome-icon-list.h
+include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h
include/libgnomeui-2.0/libgnomeui/gnome-icon-sel.h
+include/libgnomeui-2.0/libgnomeui/gnome-icon-theme.h
include/libgnomeui-2.0/libgnomeui/gnome-mdi-child.h
include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h
include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h
@@ -33,6 +35,8 @@ include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h
include/libgnomeui-2.0/libgnomeui/gnome-propertybox.h
include/libgnomeui-2.0/libgnomeui/gnome-scores.h
include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h
+include/libgnomeui-2.0/libgnomeui/gnome-theme-parser.h
+include/libgnomeui-2.0/libgnomeui/gnome-thumbnail.h
include/libgnomeui-2.0/libgnomeui/gnome-types.h
include/libgnomeui-2.0/libgnomeui/gnome-ui-init.h
include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h
@@ -44,10 +48,14 @@ include/libgnomeui-2.0/libgnomeui/libgnomeui.h
lib/libglade/2.0/libgnome.so
lib/libgnomeui-2.a
lib/libgnomeui-2.so
-lib/libgnomeui-2.so.0
+lib/libgnomeui-2.so.200
libdata/pkgconfig/libgnomeui-2.0.pc
libexec/gnome_segv2
+share/doc/libgnomeui/application-mgmt.html
share/doc/libgnomeui/c4.html
+share/doc/libgnomeui/deprecated.html
+share/doc/libgnomeui/druids.html
+share/doc/libgnomeui/fixme.html
share/doc/libgnomeui/gnomeabout.html
share/doc/libgnomeui/gnomeapp.html
share/doc/libgnomeui/gnomeappbar.html
@@ -79,6 +87,9 @@ share/doc/libgnomeui/index.sgml
share/doc/libgnomeui/libgnomeui-gnome-app-helper.html
share/doc/libgnomeui/libgnomeui-gnome-app-util.html
share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html
+share/doc/libgnomeui/libgnomeui-gnome-gconf-ui.html
+share/doc/libgnomeui/libgnomeui-gnome-ice.html
+share/doc/libgnomeui/libgnomeui-gnome-macros.html
share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html
share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html
share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html
@@ -87,12 +98,54 @@ share/doc/libgnomeui/libgnomeui-gnome-ui-init.html
share/doc/libgnomeui/libgnomeui-gnome-uidefs.html
share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html
share/doc/libgnomeui/libgnomeui-gnome-window.html
+share/doc/libgnomeui/libgnomeui-gnomeabout.html
+share/doc/libgnomeui/libgnomeui-gnomeapp.html
+share/doc/libgnomeui/libgnomeui-gnomeappbar.html
+share/doc/libgnomeui/libgnomeui-gnomeclient.html
+share/doc/libgnomeui/libgnomeui-gnomecolorpicker.html
+share/doc/libgnomeui/libgnomeui-gnomedateedit.html
+share/doc/libgnomeui/libgnomeui-gnomedialog.html
+share/doc/libgnomeui/libgnomeui-gnomedruid.html
+share/doc/libgnomeui/libgnomeui-gnomedruidpage.html
+share/doc/libgnomeui/libgnomeui-gnomedruidpageedge.html
+share/doc/libgnomeui/libgnomeui-gnomedruidpagestandard.html
+share/doc/libgnomeui/libgnomeui-gnomeentry.html
+share/doc/libgnomeui/libgnomeui-gnomefileentry.html
+share/doc/libgnomeui/libgnomeui-gnomefontpicker.html
+share/doc/libgnomeui/libgnomeui-gnomehref.html
+share/doc/libgnomeui/libgnomeui-gnomeiconentry.html
+share/doc/libgnomeui/libgnomeui-gnomeiconlist.html
+share/doc/libgnomeui/libgnomeui-gnomeiconlookup.html
+share/doc/libgnomeui/libgnomeui-gnomeiconselection.html
+share/doc/libgnomeui/libgnomeui-gnomeicontheme.html
+share/doc/libgnomeui/libgnomeui-gnomemdi.html
+share/doc/libgnomeui/libgnomeui-gnomemdichild.html
+share/doc/libgnomeui/libgnomeui-gnomemdigenericchild.html
+share/doc/libgnomeui/libgnomeui-gnomemessagebox.html
+share/doc/libgnomeui/libgnomeui-gnomepixmap.html
+share/doc/libgnomeui/libgnomeui-gnomepixmapentry.html
+share/doc/libgnomeui/libgnomeui-gnomepropertybox.html
+share/doc/libgnomeui/libgnomeui-gnomescores.html
+share/doc/libgnomeui/libgnomeui-gnomethemefile.html
+share/doc/libgnomeui/libgnomeui-gnomethumbnail.html
share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html
share/doc/libgnomeui/libgnomeui-objects.html
+share/doc/libgnomeui/miscellaneous.html
+share/doc/libgnomeui/x1427.html
share/doc/libgnomeui/x1495.html
+share/doc/libgnomeui/x15441.html
+share/doc/libgnomeui/x15454.html
+share/doc/libgnomeui/x15523.html
share/doc/libgnomeui/x15980.html
+share/doc/libgnomeui/x17879.html
+share/doc/libgnomeui/x17892.html
+share/doc/libgnomeui/x17961.html
share/doc/libgnomeui/x18473.html
+share/doc/libgnomeui/x6079.html
+share/doc/libgnomeui/x6088.html
share/doc/libgnomeui/x6263.html
+share/doc/libgnomeui/x7838.html
+share/doc/libgnomeui/x7859.html
share/doc/libgnomeui/x8080.html
share/gnome/pixmaps/gnome-about-logo.png
share/gnome/pixmaps/gnome-default-dlg.png
@@ -100,8 +153,9 @@ share/gnome/pixmaps/gnome-error.png
share/gnome/pixmaps/gnome-info.png
share/gnome/pixmaps/gnome-question.png
share/gnome/pixmaps/gnome-warning.png
-share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
@@ -114,6 +168,7 @@ share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/et/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -121,7 +176,10 @@ share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ms/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/no/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index cc00216d6954..a92e45d31e0a 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME= libwnck
-PORTVERSION= 0.18
+PORTVERSION= 2.2.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.18
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
+ startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index d0b7c07fe6bc..0938d6b32c3c 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libwnck-0.18.tar.bz2) = c79cff043a13e7f07e6a253f597d571d
+MD5 (gnome2/libwnck-2.2.1.tar.bz2) = 2cd4dbcd275ccffe877527419c048218
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index d64aca60ed6b..cf49d3a5e6f2 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -11,26 +11,33 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h
include/libwnck-1.0/libwnck/workspace.h
lib/libwnck-1.a
lib/libwnck-1.so
-lib/libwnck-1.so.4
+lib/libwnck-1.so.9
libdata/pkgconfig/libwnck-1.0.pc
+share/locale/am/LC_MESSAGES/libwnck.mo
share/locale/ar/LC_MESSAGES/libwnck.mo
share/locale/az/LC_MESSAGES/libwnck.mo
+share/locale/be/LC_MESSAGES/libwnck.mo
share/locale/bg/LC_MESSAGES/libwnck.mo
share/locale/ca/LC_MESSAGES/libwnck.mo
+share/locale/cs/LC_MESSAGES/libwnck.mo
share/locale/da/LC_MESSAGES/libwnck.mo
share/locale/de/LC_MESSAGES/libwnck.mo
share/locale/el/LC_MESSAGES/libwnck.mo
share/locale/es/LC_MESSAGES/libwnck.mo
share/locale/et/LC_MESSAGES/libwnck.mo
+share/locale/fa/LC_MESSAGES/libwnck.mo
share/locale/fi/LC_MESSAGES/libwnck.mo
share/locale/fr/LC_MESSAGES/libwnck.mo
share/locale/gl/LC_MESSAGES/libwnck.mo
share/locale/he/LC_MESSAGES/libwnck.mo
+share/locale/hi/LC_MESSAGES/libwnck.mo
share/locale/hu/LC_MESSAGES/libwnck.mo
share/locale/it/LC_MESSAGES/libwnck.mo
share/locale/ja/LC_MESSAGES/libwnck.mo
share/locale/ko/LC_MESSAGES/libwnck.mo
share/locale/lv/LC_MESSAGES/libwnck.mo
+share/locale/mk/LC_MESSAGES/libwnck.mo
+share/locale/mn/LC_MESSAGES/libwnck.mo
share/locale/ms/LC_MESSAGES/libwnck.mo
share/locale/nl/LC_MESSAGES/libwnck.mo
share/locale/nn/LC_MESSAGES/libwnck.mo
@@ -38,8 +45,10 @@ share/locale/no/LC_MESSAGES/libwnck.mo
share/locale/pl/LC_MESSAGES/libwnck.mo
share/locale/pt/LC_MESSAGES/libwnck.mo
share/locale/pt_BR/LC_MESSAGES/libwnck.mo
+share/locale/ro/LC_MESSAGES/libwnck.mo
share/locale/ru/LC_MESSAGES/libwnck.mo
share/locale/sk/LC_MESSAGES/libwnck.mo
+share/locale/sq/LC_MESSAGES/libwnck.mo
share/locale/sl/LC_MESSAGES/libwnck.mo
share/locale/sv/LC_MESSAGES/libwnck.mo
share/locale/tr/LC_MESSAGES/libwnck.mo
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 93c78b596bad..6b9568835f4a 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libzvt
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
USE_BZIP2= yes
@@ -25,18 +25,15 @@ USE_REINPLACE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+USE_GNOMENG= yes
+USE_GNOME= gnomeprefix gnomehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-pre-patch:
+post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
- s|[(]datadir[)]/gnome/|(datadir)/|g'
@find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|g'
diff --git a/x11-toolkits/libzvt/files/patch-configure b/x11-toolkits/libzvt/files/patch-configure
index 4ad2981352da..c4ddc9ef79ef 100644
--- a/x11-toolkits/libzvt/files/patch-configure
+++ b/x11-toolkits/libzvt/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig Sat Nov 30 21:07:06 2002
-+++ configure Sat Nov 30 21:07:31 2002
+--- configure.orig Mon Jun 24 11:41:40 2002
++++ configure Sat Nov 30 21:02:28 2002
@@ -7115,6 +7115,7 @@
# This can be used to rebuild libtool when needed
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 04de75c35123..0a9b9014751a 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= pango
-PORTVERSION= 1.0.5
+PORTVERSION= 1.2.1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.0,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
http://www.ameth.org/gimp/gtk/v1.3/
@@ -17,8 +17,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
-LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \
- freetype.9:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \
+ Xft2.2:${PORTSDIR}/x11-fonts/Xft \
intl.4:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
@@ -26,9 +26,9 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
USE_GNOMENG= yes
USE_GNOME= gnomehack
-GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-qt=no \
--with-html-dir=${PREFIX}/share/doc \
--enable-static
@@ -42,7 +42,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB= VERSION="1.0.0"
+PLIST_SUB= VERSION="1.2.0"
.include <bsd.port.pre.mk>
@@ -53,7 +53,7 @@ PLIST_SUB+= XFREE4:=""
.endif
post-patch:
- @find ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
+ @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
's|internal/tterrors\.h|fterrors.h| ; s|TT_Err_|FT_Err_|g'
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 8c60dc1ae795..020067318579 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pango-1.0.5.tar.bz2) = e300e5c163bc28e180e45c8e20543b4b
+MD5 (gnome2/pango-1.2.1.tar.bz2) = 6b354ef14e75739a92b5b78f4ca3165a
diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh
index ec2f7e4ad88c..e9e312dfe402 100644
--- a/x11-toolkits/pango/files/patch-ltmain.sh
+++ b/x11-toolkits/pango/files/patch-ltmain.sh
@@ -1,32 +1,15 @@
---- ltmain.sh.orig Fri Apr 26 05:23:44 2002
-+++ ltmain.sh Wed Jul 3 12:50:12 2002
-@@ -1056,14 +1056,14 @@
- # These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
- ;;
-- *-*-openbsd*)
-+ *-*-openbsd*|*-*-freebsd*)
- # Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
- ;;
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd*)
-+ *-*-openbsd*|*-*-freebsd*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1073,8 +1073,16 @@
+--- ltmain.sh.orig Fri Nov 8 15:40:11 2002
++++ ltmain.sh Tue Dec 3 18:47:10 2002
+@@ -1082,8 +1082,16 @@
continue
;;
+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
+
-module)
module=yes
@@ -34,7 +17,7 @@
continue
;;
-@@ -2399,6 +2407,9 @@
+@@ -2397,6 +2405,9 @@
# problems, so we reset it completely
verstring=""
;;
@@ -44,17 +27,7 @@
*)
verstring="0.0"
;;
-@@ -2502,6 +2513,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4286,10 +4300,12 @@
+@@ -4327,10 +4338,12 @@
fi
# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/pango/files/patch-pangoxft.h b/x11-toolkits/pango/files/patch-pangoxft.h
new file mode 100644
index 000000000000..939194042b12
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-pangoxft.h
@@ -0,0 +1,11 @@
+--- pango/pangoxft.h.orig Sun Oct 6 23:03:37 2002
++++ pango/pangoxft.h Sun Oct 6 23:03:42 2002
+@@ -31,7 +31,7 @@
+ #define _XFT_NO_COMPAT
+ #define _XFTCOMPAT_H_
+ #include <X11/Xlib.h>
+-#include <X11/Xft/Xft.h>
++#include <X11/Xft/Xft2.h>
+ #if defined(XftVersion) && XftVersion >= 20000
+ #else
+ #error "must have Xft version 2 or newer"
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index fe5974b94d84..6b2513e949e4 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -10,6 +10,7 @@ include/pango-1.0/pango/pango-enum-types.h
include/pango-1.0/pango/pango-font.h
include/pango-1.0/pango/pango-fontmap.h
include/pango-1.0/pango/pango-fontset.h
+include/pango-1.0/pango/pango-glyph-item.h
include/pango-1.0/pango/pango-glyph.h
include/pango-1.0/pango/pango-indic.h
include/pango-1.0/pango/pango-item.h
@@ -25,16 +26,16 @@ include/pango-1.0/pango/pangox.h
%%XFREE4:%%include/pango-1.0/pango/pangoxft.h
lib/libpango-1.0.a
lib/libpango-1.0.so
-lib/libpango-1.0.so.0
+lib/libpango-1.0.so.200
lib/libpangoft2-1.0.a
lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.0
+lib/libpangoft2-1.0.so.200
lib/libpangox-1.0.a
lib/libpangox-1.0.so
-lib/libpangox-1.0.so.0
+lib/libpangox-1.0.so.200
%%XFREE4:%%lib/libpangoxft-1.0.a
%%XFREE4:%%lib/libpangoxft-1.0.so
-%%XFREE4:%%lib/libpangoxft-1.0.so.0
+%%XFREE4:%%lib/libpangoxft-1.0.so.200
lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so
lib/pango/%%VERSION%%/modules/pango-arabic-x.so
%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
@@ -45,42 +46,47 @@ lib/pango/%%VERSION%%/modules/pango-bengali-x.so
lib/pango/%%VERSION%%/modules/pango-devanagari-x.so
lib/pango/%%VERSION%%/modules/pango-gujarati-x.so
lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hangul-xft.so
lib/pango/%%VERSION%%/modules/pango-hangul-x.so
lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so
lib/pango/%%VERSION%%/modules/pango-hebrew-x.so
%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-indic-xft.so
lib/pango/%%VERSION%%/modules/pango-myanmar-x.so
lib/pango/%%VERSION%%/modules/pango-tamil-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-tamil-xft.so
lib/pango/%%VERSION%%/modules/pango-thai-x.so
%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-thai-xft.so
libdata/pkgconfig/pango.pc
libdata/pkgconfig/pangoft2.pc
libdata/pkgconfig/pangox.pc
%%XFREE4:%%libdata/pkgconfig/pangoxft.pc
+share/doc/pango/home.png
share/doc/pango/index.html
share/doc/pango/index.sgml
share/doc/pango/layout.gif
+share/doc/pango/left.png
share/doc/pango/lowlevel.html
-share/doc/pango/pango-coverage-maps.html
-share/doc/pango/pango-engines.html
-share/doc/pango/pango-fonts.html
-share/doc/pango/pango-freetype-fonts-and-rendering.html
-share/doc/pango/pango-glyph-storage.html
-share/doc/pango/pango-indic-engine-support.html
-share/doc/pango/pango-layout-objects.html
-share/doc/pango/pango-modules.html
-share/doc/pango/pango-opentype-font-handling.html
-share/doc/pango/pango-tab-stops.html
-share/doc/pango/pango-text-attributes.html
-share/doc/pango/pango-text-processing.html
-share/doc/pango/pango-win32-fonts-and-rendering.html
-share/doc/pango/pango-x-fonts.html
-share/doc/pango/pango-x-rendering.html
-share/doc/pango/pango-xft-fonts-and-rendering.html
+share/doc/pango/PangoMarkupFormat.html
+share/doc/pango/pango-Coverage-Maps.html
+share/doc/pango/pango-Engines.html
+share/doc/pango/pango-Fonts.html
+share/doc/pango/pango-FreeType-Fonts-and-Rendering.html
+share/doc/pango/pango-Glyph-Storage.html
+share/doc/pango/pango-Indic-Engine-Support.html
+share/doc/pango/pango-Layout-Objects.html
+share/doc/pango/pango-Modules.html
+share/doc/pango/pango-OpenType-Font-Handling.html
+share/doc/pango/pango-Tab-Stops.html
+share/doc/pango/pango-Text-Attributes.html
+share/doc/pango/pango-Text-Processing.html
+share/doc/pango/pango-Win32-Fonts-and-Rendering.html
+share/doc/pango/pango-X-Fonts-and-Rendering.html
+share/doc/pango/pango-Xft-Fonts-and-Rendering.html
+share/doc/pango/pango.devhelp
share/doc/pango/pango.html
-share/doc/pango/pangomarkupformat.html
share/doc/pango/rendering.html
+share/doc/pango/right.png
+share/doc/pango/up.png
@dirrm share/doc/pango
@dirrm lib/pango/%%VERSION%%/modules
@dirrm lib/pango/%%VERSION%%
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 7d1a4aa03c2a..a997e5bb8433 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= vte
-PORTVERSION= 0.10.11
+PORTVERSION= 0.10.17
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
@@ -14,7 +14,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -35,6 +35,10 @@ post-patch:
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c
+ @${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
+ ${WRKSRC}/src/vte.c
+ @${REINPLACE_CMD} -Ee '/^(libvte_la_LIBADD|vte_LDADD)/s/(.*)/\1 -lXft2/' \
+ ${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
${WRKSRC}/po/Makefile.in.in
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index b9901b8f3a2a..a566ee067895 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1 +1 @@
-MD5 (gnome2/vte-0.10.11.tar.bz2) = 457569d09306fd9d6fbe2b11db8b6a2e
+MD5 (gnome2/vte-0.10.17.tar.bz2) = db4f0e903c3912827a40de80b5e8e548
diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c
index 7ed434ebbe99..16012c800304 100644
--- a/x11-toolkits/vte/files/patch-src_keymap.c
+++ b/x11-toolkits/vte/files/patch-src_keymap.c
@@ -2,7 +2,7 @@
+++ src/keymap.c Tue Oct 22 17:42:33 2002
@@ -18,6 +18,7 @@
- #ident "$Id: keymap.c,v 1.5 2002/10/18 20:53:53 nalin Exp $"
+ #ident "$Id: patch-src_keymap.c,v 1.1 2002/10/22 21:53:50 marcus Exp $"
#include "../config.h"
+#include <sys/types.h>
#include <stdlib.h>
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 45ac2512eed6..4da275693c7a 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -18,26 +18,36 @@ lib/vte/window
libdata/pkgconfig/vte.pc
libexec/gnome-pty-helper
share/gnome/vte/termcap/xterm
+share/locale/am/LC_MESSAGES/vte.mo
share/locale/bg/LC_MESSAGES/vte.mo
share/locale/ca/LC_MESSAGES/vte.mo
share/locale/cs/LC_MESSAGES/vte.mo
share/locale/da/LC_MESSAGES/vte.mo
share/locale/de/LC_MESSAGES/vte.mo
+share/locale/el/LC_MESSAGES/vte.mo
share/locale/es/LC_MESSAGES/vte.mo
share/locale/fi/LC_MESSAGES/vte.mo
share/locale/fr/LC_MESSAGES/vte.mo
share/locale/he/LC_MESSAGES/vte.mo
+share/locale/hu/LC_MESSAGES/vte.mo
+share/locale/ko/LC_MESSAGES/vte.mo
share/locale/lv/LC_MESSAGES/vte.mo
+share/locale/mn/LC_MESSAGES/vte.mo
share/locale/ms/LC_MESSAGES/vte.mo
share/locale/nl/LC_MESSAGES/vte.mo
share/locale/no/LC_MESSAGES/vte.mo
+share/locale/ro/LC_MESSAGES/vte.mo
share/locale/pl/LC_MESSAGES/vte.mo
+share/locale/pt/LC_MESSAGES/vte.mo
share/locale/pt_BR/LC_MESSAGES/vte.mo
share/locale/ru/LC_MESSAGES/vte.mo
+share/locale/sl/LC_MESSAGES/vte.mo
share/locale/sk/LC_MESSAGES/vte.mo
share/locale/sv/LC_MESSAGES/vte.mo
+share/locale/tr/LC_MESSAGES/vte.mo
share/locale/uk/LC_MESSAGES/vte.mo
share/locale/vi/LC_MESSAGES/vte.mo
+share/locale/zh_CN/LC_MESSAGES/vte.mo
share/locale/zh_TW/LC_MESSAGES/vte.mo
@dirrm share/gnome/vte/termcap
@dirrm share/gnome/vte