aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
commitc4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch)
tree3910aa2e83f782cec94f15b4547dadb741cd29ce /x11-toolkits
parentf82c84522b047dd99c6f9d85ce3e07217ccce7df (diff)
downloadports-c4851e78e4f63338fe9a4883e5b7a0370dce27f7.tar.gz
ports-c4851e78e4f63338fe9a4883e5b7a0370dce27f7.zip
Notes
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/eel2/Makefile8
-rw-r--r--x11-toolkits/eel2/distinfo4
-rw-r--r--x11-toolkits/eel2/pkg-descr11
-rw-r--r--x11-toolkits/eel2/pkg-plist12
-rw-r--r--x11-toolkits/gnome-themes/Makefile9
-rw-r--r--x11-toolkits/gnome-themes/distinfo4
-rw-r--r--x11-toolkits/gnome-themes/files/patch-configure10
-rw-r--r--x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in6
-rw-r--r--x11-toolkits/gnome-themes/pkg-descr4
-rw-r--r--x11-toolkits/gnome-themes/pkg-plist133
-rw-r--r--x11-toolkits/gtk-engines2/Makefile4
-rw-r--r--x11-toolkits/gtk-engines2/pkg-plist8
-rw-r--r--x11-toolkits/gtk20/Makefile36
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-Makefile.in17
-rw-r--r--x11-toolkits/gtk20/files/patch-ae20
-rw-r--r--x11-toolkits/gtk20/files/patch-ag22
-rw-r--r--x11-toolkits/gtk20/files/patch-ah17
-rw-r--r--x11-toolkits/gtk20/files/patch-ai16
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in6
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c26
-rw-r--r--x11-toolkits/gtk20/files/patch-ltmain.sh51
-rw-r--r--x11-toolkits/gtk20/pkg-descr25
-rw-r--r--x11-toolkits/gtk20/pkg-plist150
-rw-r--r--x11-toolkits/gtk30/Makefile36
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-Makefile.in17
-rw-r--r--x11-toolkits/gtk30/files/patch-ae20
-rw-r--r--x11-toolkits/gtk30/files/patch-ag22
-rw-r--r--x11-toolkits/gtk30/files/patch-ah17
-rw-r--r--x11-toolkits/gtk30/files/patch-ai16
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in6
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c26
-rw-r--r--x11-toolkits/gtk30/files/patch-ltmain.sh51
-rw-r--r--x11-toolkits/gtk30/pkg-descr25
-rw-r--r--x11-toolkits/gtk30/pkg-plist150
-rw-r--r--x11-toolkits/gtksourceview/Makefile6
-rw-r--r--x11-toolkits/gtksourceview/distinfo4
-rw-r--r--x11-toolkits/gtksourceview/files/patch-configure10
-rw-r--r--x11-toolkits/gtksourceview/pkg-descr5
-rw-r--r--x11-toolkits/gtksourceview/pkg-plist57
-rw-r--r--x11-toolkits/libbonoboui/Makefile8
-rw-r--r--x11-toolkits/libbonoboui/distinfo4
-rw-r--r--x11-toolkits/libbonoboui/files/patch-Makefile.in12
-rw-r--r--x11-toolkits/libbonoboui/files/patch-configure13
-rw-r--r--x11-toolkits/libbonoboui/pkg-descr10
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist76
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile10
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo4
-rw-r--r--x11-toolkits/libgnomeprintui/files/patch-configure10
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-descr2
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist12
-rw-r--r--x11-toolkits/libgnomeui/Makefile12
-rw-r--r--x11-toolkits/libgnomeui/distinfo4
-rw-r--r--x11-toolkits/libgnomeui/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/libgnomeui/files/patch-configure13
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in22
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c24
-rw-r--r--x11-toolkits/libgnomeui/pkg-descr3
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist115
-rw-r--r--x11-toolkits/libwnck/Makefile7
-rw-r--r--x11-toolkits/libwnck/distinfo4
-rw-r--r--x11-toolkits/libwnck/files/patch-configure13
-rw-r--r--x11-toolkits/libwnck/pkg-descr4
-rw-r--r--x11-toolkits/libwnck/pkg-plist8
-rw-r--r--x11-toolkits/pango/Makefile13
-rw-r--r--x11-toolkits/pango/distinfo4
-rw-r--r--x11-toolkits/pango/files/patch-modules_indic_indic-ot.h12
-rw-r--r--x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h12
-rw-r--r--x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c11
-rw-r--r--x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h12
-rw-r--r--x11-toolkits/pango/files/patch-pango_pango-ot.h12
-rw-r--r--x11-toolkits/pango/files/patch-pango_pangoft2.c12
-rw-r--r--x11-toolkits/pango/files/patch-pango_pangoft2.h12
-rw-r--r--x11-toolkits/pango/files/pkg-install.in6
-rw-r--r--x11-toolkits/pango/pkg-descr10
-rw-r--r--x11-toolkits/pango/pkg-plist47
77 files changed, 936 insertions, 712 deletions
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index f8016503bc62..e893d010da39 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,24 +6,22 @@
#
PORTNAME= eel2
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
DIST_SUBDIR= gnome2
DISTNAME= eel-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Generally useful classes and extensions to GNOME
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
-
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui
USE_LIBTOOL_VER=13
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index 6221e15d7cb1..d799711f4fbf 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/eel-2.4.2.tar.bz2) = 230c0fe2d7a756d65b2af6c5accfef88
-SIZE (gnome2/eel-2.4.2.tar.bz2) = 496160
+MD5 (gnome2/eel-2.6.0.tar.bz2) = a5e51e028011a7b92ccc30d0a86aa6bb
+SIZE (gnome2/eel-2.6.0.tar.bz2) = 552049
diff --git a/x11-toolkits/eel2/pkg-descr b/x11-toolkits/eel2/pkg-descr
index 9f0aeb752fda..4b91eb9d0da3 100644
--- a/x11-toolkits/eel2/pkg-descr
+++ b/x11-toolkits/eel2/pkg-descr
@@ -1,10 +1,7 @@
-The eel library contains a number of generally useful classes and functions.
-Many of them are extensions to things in glib, gtk, gnome-libs, and other
-widely-used GNOME platform libraries. The long term plan is to move much of
-this into the platform libraries themselves.
+The eel library contains a number of useful classes and functions which
+extend glib, gtk, gnome-libs, and other widely-used GNOME platform libraries.
-Almost all of the eel library was previously part of Nautilus, in the
-"libnautilus-extensions" private library in Nautilus 1.0 - 1.0.2. It is now
-a separate package so it can be used by packages other than Nautilus.
+Almost all of the eel library was previously part of Nautilus, but is now
+a separate package so it can be used by other applications.
WWW: http://www.gnome.org/
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index c053ca9c887f..f089f11c5b22 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -1,4 +1,5 @@
include/eel-2/eel/eel-accessibility.h
+include/eel-2/eel/eel-alert-dialog.h
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
@@ -6,7 +7,6 @@ include/eel-2/eel/eel-background.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.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
@@ -18,7 +18,6 @@ include/eel-2/eel/eel-features.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
-include/eel-2/eel/eel-generous-bin.h
include/eel-2/eel/eel-glib-extensions.h
include/eel-2/eel/eel-gnome-extensions.h
include/eel-2/eel/eel-graphic-effects.h
@@ -26,19 +25,15 @@ include/eel-2/eel/eel-gtk-container.h
include/eel-2/eel/eel-gtk-extensions.h
include/eel-2/eel/eel-gtk-macros.h
include/eel-2/eel/eel-i18n.h
-include/eel-2/eel/eel-image-chooser.h
include/eel-2/eel/eel-image-table.h
-include/eel-2/eel/eel-input-event-box.h
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-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
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-type-builtins.h
include/eel-2/eel/eel-types.h
@@ -48,7 +43,7 @@ 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.6
+lib/libeel-2.so.8
libdata/pkgconfig/eel-2.0.pc
share/locale/am/LC_MESSAGES/eel-2.0.mo
share/locale/ar/LC_MESSAGES/eel-2.0.mo
@@ -64,6 +59,7 @@ share/locale/cy/LC_MESSAGES/eel-2.0.mo
share/locale/da/LC_MESSAGES/eel-2.0.mo
share/locale/de/LC_MESSAGES/eel-2.0.mo
share/locale/el/LC_MESSAGES/eel-2.0.mo
+share/locale/en_CA/LC_MESSAGES/eel-2.0.mo
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
@@ -75,6 +71,7 @@ share/locale/ga/LC_MESSAGES/eel-2.0.mo
share/locale/gl/LC_MESSAGES/eel-2.0.mo
share/locale/he/LC_MESSAGES/eel-2.0.mo
share/locale/hi/LC_MESSAGES/eel-2.0.mo
+share/locale/hr/LC_MESSAGES/eel-2.0.mo
share/locale/hu/LC_MESSAGES/eel-2.0.mo
share/locale/id/LC_MESSAGES/eel-2.0.mo
share/locale/is/LC_MESSAGES/eel-2.0.mo
@@ -94,6 +91,7 @@ share/locale/ne/LC_MESSAGES/eel-2.0.mo
share/locale/nl/LC_MESSAGES/eel-2.0.mo
share/locale/nn/LC_MESSAGES/eel-2.0.mo
share/locale/no/LC_MESSAGES/eel-2.0.mo
+share/locale/pa/LC_MESSAGES/eel-2.0.mo
share/locale/pl/LC_MESSAGES/eel-2.0.mo
share/locale/pt/LC_MESSAGES/eel-2.0.mo
share/locale/pt_BR/LC_MESSAGES/eel-2.0.mo
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index c4e6ffbabcf0..9c40ebfcd0f7 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gnome-themes
-PORTVERSION= 2.4.1
-PORTREVISION= 2
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,10 +22,12 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_LIBTOOL_VER=13
-USE_GNOME= gnomehack metacity libgnomeui
+USE_GNOME= gnomehack lthack metacity libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB= GTK_VERSION="2.4.0"
+
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo
index 38b749dccb7d..34aec8dc8691 100644
--- a/x11-toolkits/gnome-themes/distinfo
+++ b/x11-toolkits/gnome-themes/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-2.4.1.tar.bz2) = 304237994a5bdd8b89628f4387cd0d10
-SIZE (gnome2/gnome-themes-2.4.1.tar.bz2) = 2485378
+MD5 (gnome2/gnome-themes-2.6.0.tar.bz2) = 17817f602713b9ac8ebaff9a7f0cb996
+SIZE (gnome2/gnome-themes-2.6.0.tar.bz2) = 2597765
diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure
deleted file mode 100644
index 3a3c068040c5..000000000000
--- a/x11-toolkits/gnome-themes/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Fri May 16 15:56:25 2003
-+++ configure Fri May 16 23:10:03 2003
-@@ -18073,6 +18073,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
index 02365472fd62..090c18883e26 100644
--- a/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in
+++ b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- metacity-themes/Makefile.in.orig Tue Dec 9 22:11:42 2003
++++ metacity-themes/Makefile.in Tue Dec 9 22:12:00 2003
+@@ -122,7 +122,7 @@
THEMES = Mist Sandwish Smokey
diff --git a/x11-toolkits/gnome-themes/pkg-descr b/x11-toolkits/gnome-themes/pkg-descr
index f3fa6135cc4b..333388e7853d 100644
--- a/x11-toolkits/gnome-themes/pkg-descr
+++ b/x11-toolkits/gnome-themes/pkg-descr
@@ -1,2 +1,2 @@
-New package of default themes for GNOME, which currently includes GTK+ and
-icon themes designed for accessibility.
+A collection of themes for metacity and Gtk, and some basic icon
+sets.
diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist
index 2b7248fd0106..a2e046b7ac75 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -1,8 +1,8 @@
-lib/gtk-2.0/2.2.0/engines/libcrux-engine.so
-lib/gtk-2.0/2.2.0/engines/libhcengine.so
-lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so
-lib/gtk-2.0/2.2.0/engines/libmist.so
-lib/gtk-2.0/2.2.0/engines/libthinice.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
share/eazel-engine/arrow_down-spinner.png
share/eazel-engine/arrow_down.png
share/eazel-engine/arrow_left.png
@@ -241,13 +241,14 @@ 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
-share/icons/HighContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png
share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png
-share/icons/HighContrastLargePrint/48x48/apps/background-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/behavior-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png
share/icons/HighContrastLargePrint/48x48/apps/charpick.png
-share/icons/HighContrastLargePrint/48x48/apps/default-applications-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/font-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/file-manager.png
+share/icons/HighContrastLargePrint/48x48/apps/file-roller.png
+share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png
+share/icons/HighContrastLargePrint/48x48/apps/gdict.png
share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png
share/icons/HighContrastLargePrint/48x48/apps/gkb.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png
@@ -255,7 +256,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-audio2.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-calc3.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-ccmime.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
-share/icons/HighContrastLargePrint/48x48/apps/gnome-ccthemes.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png
@@ -273,29 +273,44 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-joystick.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-log.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mailcheck.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-main-menu.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-background.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-default-applications.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-font.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-keybindings.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-sound.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-theme.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-settings.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-starthere.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-system.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-terminal.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-util.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-window-manager.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-windows.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-workspace.png
-share/icons/HighContrastLargePrint/48x48/apps/keyboard-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/keyboard-shortcut.png
+share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png
share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png
-share/icons/HighContrastLargePrint/48x48/apps/metacity-properties.png
-share/icons/HighContrastLargePrint/48x48/apps/mouse-capplet.png
-share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png
share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png
share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom.png
share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-floppy.png
+share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png
+share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/HighContrastLargePrint/48x48/emblems/emblem-important.png
share/icons/HighContrastLargePrint/48x48/emblems/emblem-noread.png
+share/icons/HighContrastLargePrint/48x48/emblems/emblem-personal.png
+share/icons/HighContrastLargePrint/48x48/emblems/emblem-special.png
+share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-client.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon
@@ -303,6 +318,7 @@ share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-executable.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-home.png
+share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-network.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-regular.png
share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-share.png
@@ -449,13 +465,13 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-package.png
share/icons/HighContrastLargePrint/index.theme
share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-keyboard-capplet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/background-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/behavior-capplet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/default-applications-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/font-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png
@@ -463,7 +479,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccmime.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccthemes.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png
@@ -481,29 +496,44 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-joystick.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-log.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logo-icon-transparent.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-main-menu.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-background.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-default-applications.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-font.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-keybindings.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-sound.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-theme.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-ui-behavior.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-starthere.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-system.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-terminal.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-util.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard-shortcut.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png
share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/metacity-properties.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/mouse-capplet.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-floppy.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png
share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png
+share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png
+share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png
+share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-client.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.icon
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.icon
@@ -511,6 +541,7 @@ share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.p
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-executable.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-ftp.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-home.png
+share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-network.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-nfs.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-regular.png
share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-share.png
@@ -659,13 +690,14 @@ share/icons/HighContrastLargePrintInverse/index.theme
share/icons/LargePrint/index.theme
share/icons/LowContrast/index.theme
share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png
-share/icons/LowContrastLargePrint/48x48/apps/accessibility-keyboard-capplet.png
share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png
-share/icons/LowContrastLargePrint/48x48/apps/background-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/behavior-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png
share/icons/LowContrastLargePrint/48x48/apps/charpick.png
-share/icons/LowContrastLargePrint/48x48/apps/default-applications-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/font-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/file-manager.png
+share/icons/LowContrastLargePrint/48x48/apps/file-roller.png
+share/icons/LowContrastLargePrint/48x48/apps/gcalctool.png
+share/icons/LowContrastLargePrint/48x48/apps/gdict.png
share/icons/LowContrastLargePrint/48x48/apps/gedit-icon.png
share/icons/LowContrastLargePrint/48x48/apps/gkb.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-applications.png
@@ -673,7 +705,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-audio2.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-calc3.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-ccmime.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-ccthemes.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png
@@ -691,24 +722,33 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-joystick.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-log.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mailcheck.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-main-menu.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mini-commander.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-background.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-default-applications.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-font.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-keybindings.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-sound.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-theme.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-settings.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-starthere.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-system.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-terminal.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-util.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-window-manager.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-windows.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-workspace.png
-share/icons/LowContrastLargePrint/48x48/apps/keyboard-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/keyboard-shortcut.png
+share/icons/LowContrastLargePrint/48x48/apps/gucharmap.png
share/icons/LowContrastLargePrint/48x48/apps/launcher-program.png
-share/icons/LowContrastLargePrint/48x48/apps/metacity-properties.png
-share/icons/LowContrastLargePrint/48x48/apps/mouse-capplet.png
-share/icons/LowContrastLargePrint/48x48/apps/sound-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/perfmeter.png
share/icons/LowContrastLargePrint/48x48/apps/window-capplet.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom.png
@@ -716,7 +756,9 @@ share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-dvd.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-floppy.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-harddisk.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png
share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png
share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png
@@ -734,6 +776,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-blockdev.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark-missing.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-chardev.png
+share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-client.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon
@@ -743,6 +786,7 @@ share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-fifo.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-home.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-loading-icon.png
+share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-network.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.icon
share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.png
@@ -926,6 +970,7 @@ 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/locale/am/LC_MESSAGES/gnome-themes.mo
+share/locale/ar/LC_MESSAGES/gnome-themes.mo
share/locale/az/LC_MESSAGES/gnome-themes.mo
share/locale/be/LC_MESSAGES/gnome-themes.mo
share/locale/bg/LC_MESSAGES/gnome-themes.mo
@@ -936,6 +981,8 @@ share/locale/cy/LC_MESSAGES/gnome-themes.mo
share/locale/da/LC_MESSAGES/gnome-themes.mo
share/locale/de/LC_MESSAGES/gnome-themes.mo
share/locale/el/LC_MESSAGES/gnome-themes.mo
+share/locale/en_CA/LC_MESSAGES/gnome-themes.mo
+share/locale/en_GB/LC_MESSAGES/gnome-themes.mo
share/locale/es/LC_MESSAGES/gnome-themes.mo
share/locale/et/LC_MESSAGES/gnome-themes.mo
share/locale/eu/LC_MESSAGES/gnome-themes.mo
@@ -945,6 +992,7 @@ share/locale/fr/LC_MESSAGES/gnome-themes.mo
share/locale/ga/LC_MESSAGES/gnome-themes.mo
share/locale/he/LC_MESSAGES/gnome-themes.mo
share/locale/hi/LC_MESSAGES/gnome-themes.mo
+share/locale/hr/LC_MESSAGES/gnome-themes.mo
share/locale/hu/LC_MESSAGES/gnome-themes.mo
share/locale/id/LC_MESSAGES/gnome-themes.mo
share/locale/is/LC_MESSAGES/gnome-themes.mo
@@ -971,7 +1019,6 @@ share/locale/sq/LC_MESSAGES/gnome-themes.mo
share/locale/sr/LC_MESSAGES/gnome-themes.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-themes.mo
share/locale/sv/LC_MESSAGES/gnome-themes.mo
-share/locale/ta/LC_MESSAGES/gnome-themes.mo
share/locale/th/LC_MESSAGES/gnome-themes.mo
share/locale/tr/LC_MESSAGES/gnome-themes.mo
share/locale/uk/LC_MESSAGES/gnome-themes.mo
@@ -1023,7 +1070,7 @@ 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.disabled
share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png
share/themes/HighContrastLargePrint/pixmaps/double-click-off.png
share/themes/HighContrastLargePrint/pixmaps/double-click-on.png
@@ -1157,7 +1204,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.disabled
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png
share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png
@@ -1426,9 +1473,9 @@ 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.disabled
share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
-share/themes/LowContrastLargePrint/index.theme~
+share/themes/LowContrastLargePrint/index.theme.disabled
share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png
share/themes/LowContrastLargePrint/pixmaps/double-click-off.png
share/themes/LowContrastLargePrint/pixmaps/double-click-on.png
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index dbde4b8854eb..3566b9685b3b 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-engines2
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_LIBTOOL_VER=13
USE_GNOME= gnomehack gtk20
-PLIST_SUB= VERSION=2.2.0
+PLIST_SUB= GTK_VERSION="2.4.0"
THEMES= metal redmond95
diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist
index 39f05f6c3a84..fb60fd7a4cfe 100644
--- a/x11-toolkits/gtk-engines2/pkg-plist
+++ b/x11-toolkits/gtk-engines2/pkg-plist
@@ -1,6 +1,6 @@
-lib/gtk-2.0/%%VERSION%%/engines/libmetal.so
-lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so
libdata/pkgconfig/gtk-engines-2.pc
share/themes/Metal/README.html
share/themes/Metal/gtk-2.0/gtkrc
@@ -8,6 +8,6 @@ share/themes/Redmond95/README.html
share/themes/Redmond95/gtk-2.0/gtkrc
@dirrm share/themes/Redmond95/gtk-2.0
@dirrm share/themes/Metal/gtk-2.0
-@dirrm lib/gtk-2.0/%%VERSION%%/engines
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/engines
@unexec /bin/rmdir %D/share/themes/Redmond95 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index e5462e44ed34..edebf8982175 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gtk
-PORTVERSION= 2.2.4
-PORTREVISION= 2
+PORTVERSION= 2.4.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
- ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.3/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,19 +19,14 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
-.if defined(WITH_DROPSHADOW)
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= xfce
-PATCHFILES= gtk+-menushadow.patch
-PATCH_DIST_STRIP= -p1
-.endif
-
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
+ ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_BZIP2= yes
LATEST_LINK= gtk20
@@ -41,33 +35,23 @@ USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE= yes
USE_GNOME= gnomehack atk pango
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-PLIST_SUB= GTK_VERSION="2.2.0"
-
-MAN1= gdk-pixbuf-csource.1
-
-pre-everything::
-.if !defined(WITH_DROPSHADOW)
- @${ECHO_MSG}
- @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch,
- @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\""
- @${ECHO_MSG} "NOTE: This option is not supported by FreeBSD GNOME Team."
- @${ECHO_MSG} "Please, don't bug us if it doesn't work or build broken."
- @${ECHO_MSG}
-.endif
+PLIST_SUB= GTK_VERSION="2.4.0"
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ ${WRKSRC}/gtk/xdgmime/xdgmime.c
pre-build:
- ${RM} -rf ${WRKSRC}/docs/gtk.info*
+ @${RM} -rf ${WRKSRC}/docs/gtk.info*
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index d327f8a90e90..44f12bfe6a47 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,4 +1,2 @@
-MD5 (gnome2/gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671
-SIZE (gnome2/gtk+-2.2.4.tar.bz2) = 7189272
-MD5 (gnome2/gtk+-menushadow.patch) = 5e02af6c81df2c312c569b40bea129ba
-SIZE (gnome2/gtk+-menushadow.patch) = 15970
+MD5 (gnome2/gtk+-2.4.0.tar.bz2) = fd16157de447c7f0a86495ad0dc67a1b
+SIZE (gnome2/gtk+-2.4.0.tar.bz2) = 8476610
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
index 85e372a01c60..c47baaab5ef5 100644
--- a/x11-toolkits/gtk20/files/patch-Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in 2002/02/12 13:29:11 1.1
-+++ Makefile.in 2002/02/12 13:29:28
-@@ -168,7 +168,7 @@
- ms_librarian = @ms_librarian@
- xinput_progs = @xinput_progs@
+--- Makefile.in.orig Thu Jan 22 19:40:10 2004
++++ Makefile.in Thu Jan 22 19:40:52 2004
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
# require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
deleted file mode 100644
index b1750b724600..000000000000
--- a/x11-toolkits/gtk20/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Thu Sep 4 13:17:19 2003
-+++ configure Tue Mar 16 17:14:34 2004
-@@ -18367,6 +18367,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'
-@@ -24746,7 +24747,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include FT_ERRORS_H
-
- int
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index c4879a292522..b34d2b3f24b6 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,19 +1,19 @@
---- gtk/Makefile.in.orig Sat May 3 02:43:20 2003
-+++ gtk/Makefile.in Sat May 3 02:46:30 2003
-@@ -175,7 +175,7 @@
- -DG_LOG_DOMAIN=\"Gtk\" \
+--- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003
++++ gtk/Makefile.in Fri Oct 24 21:46:49 2003
+@@ -301,7 +301,7 @@
-DGTK_LIBDIR=\"$(libdir)\" \
+ -DGTK_DATADIR=\"$(datadir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
- -DGTK_VERSION=\"@GTK_VERSION@\" \
- -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
- -DGTK_HOST=\"@host@\" \
-@@ -651,6 +651,7 @@
++ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
+ -DGTK_VERSION=\"$(GTK_VERSION)\" \
+ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
+ -DGTK_HOST=\"$(host)\" \
+@@ -856,6 +856,7 @@
TEST_DEPS = $(DEPS) gtk.immodules
- LDADDS = @STRIP_BEGIN@ \
+ LDADDS = \
+ $(GLIB_LIBS) \
$(gtktargetlib) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib)
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 32c2663f049f..88bfe209d8ae 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001
-+++ docs/Makefile.in Wed Oct 24 10:33:46 2001
-@@ -136,7 +136,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
+--- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index a128c58ffe80..a04d08ef58b3 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000
-+++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000
-@@ -160,7 +160,7 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
+--- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003
++++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS =
++SUBDIRS = #gdk-pixbuf gdk gtk
+ subdir = docs/reference
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES =
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
index fa3e1270f1b2..c2cb10b5478c 100644
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -1,6 +1,6 @@
---- gdk-pixbuf/Makefile.in.orig Sat May 3 02:51:31 2003
-+++ gdk-pixbuf/Makefile.in Sat May 3 02:51:59 2003
-@@ -384,7 +384,9 @@
+--- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003
++++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003
+@@ -517,7 +517,9 @@
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
new file mode 100644
index 000000000000..07bb57a6d022
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
@@ -0,0 +1,26 @@
+--- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004
++++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004
+@@ -526,7 +526,7 @@
+
+ priv->custom_theme = FALSE;
+ priv->current_theme = g_strdup (DEFAULT_THEME_NAME);
+- priv->search_path = g_new (char *, 5);
++ priv->search_path = g_new (char *, 7);
+
+
+ priv->search_path[0] = g_build_filename (g_get_home_dir (),
+@@ -534,9 +534,11 @@
+ NULL);
+ priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL);
+ priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL);
+- priv->search_path[3] = g_strdup ("/usr/share/icons");
+- priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
+- priv->search_path_len = 5;
++ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL);
++ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL);
++ priv->search_path[5] = g_strdup ("/usr/share/icons");
++ priv->search_path[6] = g_strdup ("/usr/share/pixmaps");
++ priv->search_path_len = 7;
+
+ priv->themes_valid = FALSE;
+ priv->themes = NULL;
diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh
new file mode 100644
index 000000000000..58384ee38d2e
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Sat Dec 6 14:47:45 2003
++++ ltmain.sh Tue Dec 9 14:09:01 2003
+@@ -1280,7 +1280,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,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
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,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/gtk20/pkg-descr b/x11-toolkits/gtk20/pkg-descr
index 83ab3d952191..8cee4afc7448 100644
--- a/x11-toolkits/gtk20/pkg-descr
+++ b/x11-toolkits/gtk20/pkg-descr
@@ -1,21 +1,10 @@
- GTK is a library for creating graphical user interfaces similar to
-the Motif "look and feel". It is designed to be small and efficient, but
-still flexible enough to allow the programmer freedom in the interfaces
-created. GTK allows the programmer to use a variety of standard user
-interface widgets such as push, radio and check buttons, menus, lists
-and frames. It also provides several "container" widgets which can be
-used to control the layout of the user interface elements.
+The GIMP ToolKit (GTK+) is a collection of GUI widgets. GTK+
+essentially provides the building blocks from which GUIs can be
+built. It is highly themable, and its functionality is highly
+extensible.
- GTK provides some unique features. (At least, I know of no other
-widget library which provides them). For example, a button does not
-contain a label, it contains a child widget, which in most instances
-will be a label. However, the child widget can also be a pixmap, image
-or any combination possible the programmer desires. This flexibility is
-adhered to throughout the library.
-
-GTK+-2.0 is a stable release, but many applications still require
-GTK+-1.2, the previous stable version. You can have the runtime and
-development environments for both GTK+-2.0 and GTK+-1.2 installed
-simultaneously on your computer.
+GTK+-2 is a very stable release, similar only in design to GTK+-1.
+GTK+-2 can coexist happily alongside GTK+-1, but applications are
+written for one version or the other.
WWW: http://www.gtk.org/
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 07e8ff08f981..5b137af92f90 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,6 +1,7 @@
bin/gdk-pixbuf-csource
-bin/gtk-query-immodules-2.0
bin/gdk-pixbuf-query-loaders
+bin/gtk-demo
+bin/gtk-query-immodules-2.0
etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -38,6 +39,7 @@ 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/gdkspawn.h
include/gtk-2.0/gdk/gdktypes.h
include/gtk-2.0/gdk/gdkvisual.h
include/gtk-2.0/gdk/gdkwindow.h
@@ -48,6 +50,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h
include/gtk-2.0/gtk/gtkaccellabel.h
include/gtk-2.0/gtk/gtkaccelmap.h
include/gtk-2.0/gtk/gtkaccessible.h
+include/gtk-2.0/gtk/gtkaction.h
+include/gtk-2.0/gtk/gtkactiongroup.h
include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
@@ -59,6 +63,7 @@ include/gtk-2.0/gtk/gtkbox.h
include/gtk-2.0/gtk/gtkbutton.h
include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
+include/gtk-2.0/gtk/gtkcelllayout.h
include/gtk-2.0/gtk/gtkcellrenderer.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
@@ -67,9 +72,12 @@ include/gtk-2.0/gtk/gtkcheckbutton.h
include/gtk-2.0/gtk/gtkcheckmenuitem.h
include/gtk-2.0/gtk/gtkclipboard.h
include/gtk-2.0/gtk/gtkclist.h
+include/gtk-2.0/gtk/gtkcolorbutton.h
include/gtk-2.0/gtk/gtkcolorsel.h
include/gtk-2.0/gtk/gtkcolorseldialog.h
include/gtk-2.0/gtk/gtkcombo.h
+include/gtk-2.0/gtk/gtkcombobox.h
+include/gtk-2.0/gtk/gtkcomboboxentry.h
include/gtk-2.0/gtk/gtkcontainer.h
include/gtk-2.0/gtk/gtkctree.h
include/gtk-2.0/gtk/gtkcurve.h
@@ -80,9 +88,17 @@ include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
include/gtk-2.0/gtk/gtkenums.h
+include/gtk-2.0/gtk/gtkentrycompletion.h
+include/gtk-2.0/gtk/gtkexpander.h
include/gtk-2.0/gtk/gtkeventbox.h
+include/gtk-2.0/gtk/gtkfilechooser.h
+include/gtk-2.0/gtk/gtkfilechooserdialog.h
+include/gtk-2.0/gtk/gtkfilechooserwidget.h
+include/gtk-2.0/gtk/gtkfilefilter.h
include/gtk-2.0/gtk/gtkfilesel.h
+include/gtk-2.0/gtk/gtkfilesystem.h
include/gtk-2.0/gtk/gtkfixed.h
+include/gtk-2.0/gtk/gtkfontbutton.h
include/gtk-2.0/gtk/gtkfontsel.h
include/gtk-2.0/gtk/gtkframe.h
include/gtk-2.0/gtk/gtkgamma.h
@@ -96,6 +112,7 @@ include/gtk-2.0/gtk/gtkhscale.h
include/gtk-2.0/gtk/gtkhscrollbar.h
include/gtk-2.0/gtk/gtkhseparator.h
include/gtk-2.0/gtk/gtkiconfactory.h
+include/gtk-2.0/gtk/gtkicontheme.h
include/gtk-2.0/gtk/gtkimage.h
include/gtk-2.0/gtk/gtkimagemenuitem.h
include/gtk-2.0/gtk/gtkimcontext.h
@@ -130,8 +147,10 @@ include/gtk-2.0/gtk/gtkpreview.h
include/gtk-2.0/gtk/gtkprivate.h
include/gtk-2.0/gtk/gtkprogress.h
include/gtk-2.0/gtk/gtkprogressbar.h
+include/gtk-2.0/gtk/gtkradioaction.h
include/gtk-2.0/gtk/gtkradiobutton.h
include/gtk-2.0/gtk/gtkradiomenuitem.h
+include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
include/gtk-2.0/gtk/gtkruler.h
@@ -141,6 +160,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
include/gtk-2.0/gtk/gtkseparator.h
include/gtk-2.0/gtk/gtkseparatormenuitem.h
+include/gtk-2.0/gtk/gtkseparatortoolitem.h
include/gtk-2.0/gtk/gtksettings.h
include/gtk-2.0/gtk/gtksignal.h
include/gtk-2.0/gtk/gtksizegroup.h
@@ -162,13 +182,18 @@ include/gtk-2.0/gtk/gtktexttag.h
include/gtk-2.0/gtk/gtktexttagtable.h
include/gtk-2.0/gtk/gtktextview.h
include/gtk-2.0/gtk/gtktipsquery.h
+include/gtk-2.0/gtk/gtktoggleaction.h
include/gtk-2.0/gtk/gtktogglebutton.h
+include/gtk-2.0/gtk/gtktoggletoolbutton.h
include/gtk-2.0/gtk/gtktoolbar.h
+include/gtk-2.0/gtk/gtktoolbutton.h
+include/gtk-2.0/gtk/gtktoolitem.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
include/gtk-2.0/gtk/gtktreeitem.h
include/gtk-2.0/gtk/gtktreemodel.h
+include/gtk-2.0/gtk/gtktreemodelfilter.h
include/gtk-2.0/gtk/gtktreemodelsort.h
include/gtk-2.0/gtk/gtktreeselection.h
include/gtk-2.0/gtk/gtktreesortable.h
@@ -177,6 +202,7 @@ include/gtk-2.0/gtk/gtktreeview.h
include/gtk-2.0/gtk/gtktreeviewcolumn.h
include/gtk-2.0/gtk/gtktypebuiltins.h
include/gtk-2.0/gtk/gtktypeutils.h
+include/gtk-2.0/gtk/gtkuimanager.h
include/gtk-2.0/gtk/gtkvbbox.h
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
@@ -193,6 +219,7 @@ 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
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
@@ -204,7 +231,6 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
@@ -214,16 +240,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.200
+lib/libgdk-x11-2.0.so.400
lib/libgdk_pixbuf-2.0.a
lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.200
+lib/libgdk_pixbuf-2.0.so.400
lib/libgdk_pixbuf_xlib-2.0.a
lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.200
+lib/libgdk_pixbuf_xlib-2.0.so.400
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.200
+lib/libgtk-x11-2.0.so.400
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -231,64 +257,172 @@ libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
+share/gtk-2.0/demo/alphatest.png
+share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/appwindow.c
+share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/changedisplay.c
+share/gtk-2.0/demo/colorsel.c
+share/gtk-2.0/demo/dialog.c
+share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_completion.c
+share/gtk-2.0/demo/floppybuddy.gif
+share/gtk-2.0/demo/gnome-applets.png
+share/gtk-2.0/demo/gnome-calendar.png
+share/gtk-2.0/demo/gnome-foot.png
+share/gtk-2.0/demo/gnome-gimp.png
+share/gtk-2.0/demo/gnome-gmush.png
+share/gtk-2.0/demo/gnome-gsame.png
+share/gtk-2.0/demo/gnu-keys.png
+share/gtk-2.0/demo/gtk-logo-rgb.gif
+share/gtk-2.0/demo/hypertext.c
+share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/list_store.c
+share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/panes.c
+share/gtk-2.0/demo/pixbufs.c
+share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/stock_browser.c
+share/gtk-2.0/demo/textview.c
+share/gtk-2.0/demo/tree_store.c
+share/gtk-2.0/demo/ui_manager.c
+share/locale/af/LC_MESSAGES/gtk20-properties.mo
+share/locale/af/LC_MESSAGES/gtk20.mo
+share/locale/am/LC_MESSAGES/gtk20-properties.mo
share/locale/am/LC_MESSAGES/gtk20.mo
+share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
+share/locale/az/LC_MESSAGES/gtk20-properties.mo
share/locale/az/LC_MESSAGES/gtk20.mo
+share/locale/be/LC_MESSAGES/gtk20-properties.mo
share/locale/be/LC_MESSAGES/gtk20.mo
+share/locale/bg/LC_MESSAGES/gtk20-properties.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
+share/locale/bn/LC_MESSAGES/gtk20-properties.mo
+share/locale/bn/LC_MESSAGES/gtk20.mo
+share/locale/br/LC_MESSAGES/gtk20-properties.mo
+share/locale/br/LC_MESSAGES/gtk20.mo
+share/locale/ca/LC_MESSAGES/gtk20-properties.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
+share/locale/cs/LC_MESSAGES/gtk20-properties.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20-properties.mo
share/locale/cy/LC_MESSAGES/gtk20.mo
+share/locale/da/LC_MESSAGES/gtk20-properties.mo
share/locale/da/LC_MESSAGES/gtk20.mo
+share/locale/de/LC_MESSAGES/gtk20-properties.mo
share/locale/de/LC_MESSAGES/gtk20.mo
+share/locale/el/LC_MESSAGES/gtk20-properties.mo
share/locale/el/LC_MESSAGES/gtk20.mo
+share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
+share/locale/en_CA/LC_MESSAGES/gtk20.mo
+share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
share/locale/en_GB/LC_MESSAGES/gtk20.mo
+share/locale/es/LC_MESSAGES/gtk20-properties.mo
share/locale/es/LC_MESSAGES/gtk20.mo
+share/locale/et/LC_MESSAGES/gtk20-properties.mo
share/locale/et/LC_MESSAGES/gtk20.mo
+share/locale/eu/LC_MESSAGES/gtk20-properties.mo
share/locale/eu/LC_MESSAGES/gtk20.mo
+share/locale/fa/LC_MESSAGES/gtk20-properties.mo
share/locale/fa/LC_MESSAGES/gtk20.mo
+share/locale/fi/LC_MESSAGES/gtk20-properties.mo
share/locale/fi/LC_MESSAGES/gtk20.mo
+share/locale/fr/LC_MESSAGES/gtk20-properties.mo
share/locale/fr/LC_MESSAGES/gtk20.mo
+share/locale/ga/LC_MESSAGES/gtk20-properties.mo
share/locale/ga/LC_MESSAGES/gtk20.mo
+share/locale/gl/LC_MESSAGES/gtk20-properties.mo
share/locale/gl/LC_MESSAGES/gtk20.mo
+share/locale/he/LC_MESSAGES/gtk20-properties.mo
share/locale/he/LC_MESSAGES/gtk20.mo
+share/locale/hi/LC_MESSAGES/gtk20-properties.mo
share/locale/hi/LC_MESSAGES/gtk20.mo
+share/locale/hr/LC_MESSAGES/gtk20-properties.mo
share/locale/hr/LC_MESSAGES/gtk20.mo
+share/locale/hu/LC_MESSAGES/gtk20-properties.mo
share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/ia/LC_MESSAGES/gtk20-properties.mo
share/locale/ia/LC_MESSAGES/gtk20.mo
+share/locale/id/LC_MESSAGES/gtk20-properties.mo
share/locale/id/LC_MESSAGES/gtk20.mo
-share/locale/is/LC_MESSAGES/gtk20.mo
+share/locale/it/LC_MESSAGES/gtk20-properties.mo
share/locale/it/LC_MESSAGES/gtk20.mo
+share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
+share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
+share/locale/li/LC_MESSAGES/gtk20-properties.mo
+share/locale/li/LC_MESSAGES/gtk20.mo
+share/locale/lt/LC_MESSAGES/gtk20-properties.mo
share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/lv/LC_MESSAGES/gtk20-properties.mo
share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mi/LC_MESSAGES/gtk20-properties.mo
+share/locale/mi/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20-properties.mo
share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/ml/LC_MESSAGES/gtk20-properties.mo
share/locale/ml/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20-properties.mo
share/locale/mn/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20-properties.mo
share/locale/ms/LC_MESSAGES/gtk20.mo
+share/locale/ne/LC_MESSAGES/gtk20-properties.mo
share/locale/ne/LC_MESSAGES/gtk20.mo
+share/locale/nl/LC_MESSAGES/gtk20-properties.mo
share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
+share/locale/no/LC_MESSAGES/gtk20-properties.mo
share/locale/no/LC_MESSAGES/gtk20.mo
+share/locale/pl/LC_MESSAGES/gtk20-properties.mo
share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/pt/LC_MESSAGES/gtk20-properties.mo
share/locale/pt/LC_MESSAGES/gtk20.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+share/locale/ro/LC_MESSAGES/gtk20-properties.mo
share/locale/ro/LC_MESSAGES/gtk20.mo
+share/locale/ru/LC_MESSAGES/gtk20-properties.mo
share/locale/ru/LC_MESSAGES/gtk20.mo
+share/locale/sk/LC_MESSAGES/gtk20-properties.mo
share/locale/sk/LC_MESSAGES/gtk20.mo
+share/locale/sl/LC_MESSAGES/gtk20-properties.mo
share/locale/sl/LC_MESSAGES/gtk20.mo
+share/locale/sq/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr/LC_MESSAGES/gtk20-properties.mo
share/locale/sr/LC_MESSAGES/gtk20.mo
+share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
share/locale/sr@Latn/LC_MESSAGES/gtk20.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20.mo
share/locale/sq/LC_MESSAGES/gtk20.mo
+share/locale/sv/LC_MESSAGES/gtk20-properties.mo
share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/ta/LC_MESSAGES/gtk20-properties.mo
share/locale/ta/LC_MESSAGES/gtk20.mo
+share/locale/th/LC_MESSAGES/gtk20-properties.mo
+share/locale/th/LC_MESSAGES/gtk20.mo
+share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
+share/locale/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/uz/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz/LC_MESSAGES/gtk20.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
+share/locale/wa/LC_MESSAGES/gtk20-properties.mo
share/locale/wa/LC_MESSAGES/gtk20.mo
+share/locale/yi/LC_MESSAGES/gtk20-properties.mo
share/locale/yi/LC_MESSAGES/gtk20.mo
+share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Default/gtk-2.0/gtkrc
@@ -297,6 +431,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Emacs
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
+@dirrm share/gtk-2.0/demo
+@dirrm share/gtk-2.0
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e5462e44ed34..edebf8982175 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gtk
-PORTVERSION= 2.2.4
-PORTREVISION= 2
+PORTVERSION= 2.4.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
- ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.3/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,19 +19,14 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
-.if defined(WITH_DROPSHADOW)
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR= xfce
-PATCHFILES= gtk+-menushadow.patch
-PATCH_DIST_STRIP= -p1
-.endif
-
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
+ ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_BZIP2= yes
LATEST_LINK= gtk20
@@ -41,33 +35,23 @@ USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE= yes
USE_GNOME= gnomehack atk pango
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-PLIST_SUB= GTK_VERSION="2.2.0"
-
-MAN1= gdk-pixbuf-csource.1
-
-pre-everything::
-.if !defined(WITH_DROPSHADOW)
- @${ECHO_MSG}
- @${ECHO_MSG} "If you want to compile with experimental menu dropshadow patch,
- @${ECHO_MSG} "hit Ctrl-C right now and use make \"WITH_DROPSHADOW=yes\""
- @${ECHO_MSG} "NOTE: This option is not supported by FreeBSD GNOME Team."
- @${ECHO_MSG} "Please, don't bug us if it doesn't work or build broken."
- @${ECHO_MSG}
-.endif
+PLIST_SUB= GTK_VERSION="2.4.0"
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ ${WRKSRC}/gtk/xdgmime/xdgmime.c
pre-build:
- ${RM} -rf ${WRKSRC}/docs/gtk.info*
+ @${RM} -rf ${WRKSRC}/docs/gtk.info*
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index d327f8a90e90..44f12bfe6a47 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,4 +1,2 @@
-MD5 (gnome2/gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671
-SIZE (gnome2/gtk+-2.2.4.tar.bz2) = 7189272
-MD5 (gnome2/gtk+-menushadow.patch) = 5e02af6c81df2c312c569b40bea129ba
-SIZE (gnome2/gtk+-menushadow.patch) = 15970
+MD5 (gnome2/gtk+-2.4.0.tar.bz2) = fd16157de447c7f0a86495ad0dc67a1b
+SIZE (gnome2/gtk+-2.4.0.tar.bz2) = 8476610
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 85e372a01c60..c47baaab5ef5 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in 2002/02/12 13:29:11 1.1
-+++ Makefile.in 2002/02/12 13:29:28
-@@ -168,7 +168,7 @@
- ms_librarian = @ms_librarian@
- xinput_progs = @xinput_progs@
+--- Makefile.in.orig Thu Jan 22 19:40:10 2004
++++ Makefile.in Thu Jan 22 19:40:52 2004
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
# require automake 1.4
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
deleted file mode 100644
index b1750b724600..000000000000
--- a/x11-toolkits/gtk30/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Thu Sep 4 13:17:19 2003
-+++ configure Tue Mar 16 17:14:34 2004
-@@ -18367,6 +18367,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'
-@@ -24746,7 +24747,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include FT_ERRORS_H
-
- int
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index c4879a292522..b34d2b3f24b6 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,19 +1,19 @@
---- gtk/Makefile.in.orig Sat May 3 02:43:20 2003
-+++ gtk/Makefile.in Sat May 3 02:46:30 2003
-@@ -175,7 +175,7 @@
- -DG_LOG_DOMAIN=\"Gtk\" \
+--- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003
++++ gtk/Makefile.in Fri Oct 24 21:46:49 2003
+@@ -301,7 +301,7 @@
-DGTK_LIBDIR=\"$(libdir)\" \
+ -DGTK_DATADIR=\"$(datadir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
- -DGTK_VERSION=\"@GTK_VERSION@\" \
- -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
- -DGTK_HOST=\"@host@\" \
-@@ -651,6 +651,7 @@
++ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
+ -DGTK_VERSION=\"$(GTK_VERSION)\" \
+ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
+ -DGTK_HOST=\"$(host)\" \
+@@ -856,6 +856,7 @@
TEST_DEPS = $(DEPS) gtk.immodules
- LDADDS = @STRIP_BEGIN@ \
+ LDADDS = \
+ $(GLIB_LIBS) \
$(gtktargetlib) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib)
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 32c2663f049f..88bfe209d8ae 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001
-+++ docs/Makefile.in Wed Oct 24 10:33:46 2001
-@@ -136,7 +136,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
+--- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index a128c58ffe80..a04d08ef58b3 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000
-+++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000
-@@ -160,7 +160,7 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
+--- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003
++++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS =
++SUBDIRS = #gdk-pixbuf gdk gtk
+ subdir = docs/reference
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES =
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
index fa3e1270f1b2..c2cb10b5478c 100644
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
@@ -1,6 +1,6 @@
---- gdk-pixbuf/Makefile.in.orig Sat May 3 02:51:31 2003
-+++ gdk-pixbuf/Makefile.in Sat May 3 02:51:59 2003
-@@ -384,7 +384,9 @@
+--- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003
++++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003
+@@ -517,7 +517,9 @@
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c
new file mode 100644
index 000000000000..07bb57a6d022
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c
@@ -0,0 +1,26 @@
+--- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004
++++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004
+@@ -526,7 +526,7 @@
+
+ priv->custom_theme = FALSE;
+ priv->current_theme = g_strdup (DEFAULT_THEME_NAME);
+- priv->search_path = g_new (char *, 5);
++ priv->search_path = g_new (char *, 7);
+
+
+ priv->search_path[0] = g_build_filename (g_get_home_dir (),
+@@ -534,9 +534,11 @@
+ NULL);
+ priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL);
+ priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL);
+- priv->search_path[3] = g_strdup ("/usr/share/icons");
+- priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
+- priv->search_path_len = 5;
++ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL);
++ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL);
++ priv->search_path[5] = g_strdup ("/usr/share/icons");
++ priv->search_path[6] = g_strdup ("/usr/share/pixmaps");
++ priv->search_path_len = 7;
+
+ priv->themes_valid = FALSE;
+ priv->themes = NULL;
diff --git a/x11-toolkits/gtk30/files/patch-ltmain.sh b/x11-toolkits/gtk30/files/patch-ltmain.sh
new file mode 100644
index 000000000000..58384ee38d2e
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Sat Dec 6 14:47:45 2003
++++ ltmain.sh Tue Dec 9 14:09:01 2003
+@@ -1280,7 +1280,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,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
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,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/gtk30/pkg-descr b/x11-toolkits/gtk30/pkg-descr
index 83ab3d952191..8cee4afc7448 100644
--- a/x11-toolkits/gtk30/pkg-descr
+++ b/x11-toolkits/gtk30/pkg-descr
@@ -1,21 +1,10 @@
- GTK is a library for creating graphical user interfaces similar to
-the Motif "look and feel". It is designed to be small and efficient, but
-still flexible enough to allow the programmer freedom in the interfaces
-created. GTK allows the programmer to use a variety of standard user
-interface widgets such as push, radio and check buttons, menus, lists
-and frames. It also provides several "container" widgets which can be
-used to control the layout of the user interface elements.
+The GIMP ToolKit (GTK+) is a collection of GUI widgets. GTK+
+essentially provides the building blocks from which GUIs can be
+built. It is highly themable, and its functionality is highly
+extensible.
- GTK provides some unique features. (At least, I know of no other
-widget library which provides them). For example, a button does not
-contain a label, it contains a child widget, which in most instances
-will be a label. However, the child widget can also be a pixmap, image
-or any combination possible the programmer desires. This flexibility is
-adhered to throughout the library.
-
-GTK+-2.0 is a stable release, but many applications still require
-GTK+-1.2, the previous stable version. You can have the runtime and
-development environments for both GTK+-2.0 and GTK+-1.2 installed
-simultaneously on your computer.
+GTK+-2 is a very stable release, similar only in design to GTK+-1.
+GTK+-2 can coexist happily alongside GTK+-1, but applications are
+written for one version or the other.
WWW: http://www.gtk.org/
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 07e8ff08f981..5b137af92f90 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,6 +1,7 @@
bin/gdk-pixbuf-csource
-bin/gtk-query-immodules-2.0
bin/gdk-pixbuf-query-loaders
+bin/gtk-demo
+bin/gtk-query-immodules-2.0
etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -38,6 +39,7 @@ 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/gdkspawn.h
include/gtk-2.0/gdk/gdktypes.h
include/gtk-2.0/gdk/gdkvisual.h
include/gtk-2.0/gdk/gdkwindow.h
@@ -48,6 +50,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h
include/gtk-2.0/gtk/gtkaccellabel.h
include/gtk-2.0/gtk/gtkaccelmap.h
include/gtk-2.0/gtk/gtkaccessible.h
+include/gtk-2.0/gtk/gtkaction.h
+include/gtk-2.0/gtk/gtkactiongroup.h
include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
@@ -59,6 +63,7 @@ include/gtk-2.0/gtk/gtkbox.h
include/gtk-2.0/gtk/gtkbutton.h
include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
+include/gtk-2.0/gtk/gtkcelllayout.h
include/gtk-2.0/gtk/gtkcellrenderer.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
@@ -67,9 +72,12 @@ include/gtk-2.0/gtk/gtkcheckbutton.h
include/gtk-2.0/gtk/gtkcheckmenuitem.h
include/gtk-2.0/gtk/gtkclipboard.h
include/gtk-2.0/gtk/gtkclist.h
+include/gtk-2.0/gtk/gtkcolorbutton.h
include/gtk-2.0/gtk/gtkcolorsel.h
include/gtk-2.0/gtk/gtkcolorseldialog.h
include/gtk-2.0/gtk/gtkcombo.h
+include/gtk-2.0/gtk/gtkcombobox.h
+include/gtk-2.0/gtk/gtkcomboboxentry.h
include/gtk-2.0/gtk/gtkcontainer.h
include/gtk-2.0/gtk/gtkctree.h
include/gtk-2.0/gtk/gtkcurve.h
@@ -80,9 +88,17 @@ include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
include/gtk-2.0/gtk/gtkenums.h
+include/gtk-2.0/gtk/gtkentrycompletion.h
+include/gtk-2.0/gtk/gtkexpander.h
include/gtk-2.0/gtk/gtkeventbox.h
+include/gtk-2.0/gtk/gtkfilechooser.h
+include/gtk-2.0/gtk/gtkfilechooserdialog.h
+include/gtk-2.0/gtk/gtkfilechooserwidget.h
+include/gtk-2.0/gtk/gtkfilefilter.h
include/gtk-2.0/gtk/gtkfilesel.h
+include/gtk-2.0/gtk/gtkfilesystem.h
include/gtk-2.0/gtk/gtkfixed.h
+include/gtk-2.0/gtk/gtkfontbutton.h
include/gtk-2.0/gtk/gtkfontsel.h
include/gtk-2.0/gtk/gtkframe.h
include/gtk-2.0/gtk/gtkgamma.h
@@ -96,6 +112,7 @@ include/gtk-2.0/gtk/gtkhscale.h
include/gtk-2.0/gtk/gtkhscrollbar.h
include/gtk-2.0/gtk/gtkhseparator.h
include/gtk-2.0/gtk/gtkiconfactory.h
+include/gtk-2.0/gtk/gtkicontheme.h
include/gtk-2.0/gtk/gtkimage.h
include/gtk-2.0/gtk/gtkimagemenuitem.h
include/gtk-2.0/gtk/gtkimcontext.h
@@ -130,8 +147,10 @@ include/gtk-2.0/gtk/gtkpreview.h
include/gtk-2.0/gtk/gtkprivate.h
include/gtk-2.0/gtk/gtkprogress.h
include/gtk-2.0/gtk/gtkprogressbar.h
+include/gtk-2.0/gtk/gtkradioaction.h
include/gtk-2.0/gtk/gtkradiobutton.h
include/gtk-2.0/gtk/gtkradiomenuitem.h
+include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
include/gtk-2.0/gtk/gtkruler.h
@@ -141,6 +160,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
include/gtk-2.0/gtk/gtkseparator.h
include/gtk-2.0/gtk/gtkseparatormenuitem.h
+include/gtk-2.0/gtk/gtkseparatortoolitem.h
include/gtk-2.0/gtk/gtksettings.h
include/gtk-2.0/gtk/gtksignal.h
include/gtk-2.0/gtk/gtksizegroup.h
@@ -162,13 +182,18 @@ include/gtk-2.0/gtk/gtktexttag.h
include/gtk-2.0/gtk/gtktexttagtable.h
include/gtk-2.0/gtk/gtktextview.h
include/gtk-2.0/gtk/gtktipsquery.h
+include/gtk-2.0/gtk/gtktoggleaction.h
include/gtk-2.0/gtk/gtktogglebutton.h
+include/gtk-2.0/gtk/gtktoggletoolbutton.h
include/gtk-2.0/gtk/gtktoolbar.h
+include/gtk-2.0/gtk/gtktoolbutton.h
+include/gtk-2.0/gtk/gtktoolitem.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
include/gtk-2.0/gtk/gtktreeitem.h
include/gtk-2.0/gtk/gtktreemodel.h
+include/gtk-2.0/gtk/gtktreemodelfilter.h
include/gtk-2.0/gtk/gtktreemodelsort.h
include/gtk-2.0/gtk/gtktreeselection.h
include/gtk-2.0/gtk/gtktreesortable.h
@@ -177,6 +202,7 @@ include/gtk-2.0/gtk/gtktreeview.h
include/gtk-2.0/gtk/gtktreeviewcolumn.h
include/gtk-2.0/gtk/gtktypebuiltins.h
include/gtk-2.0/gtk/gtktypeutils.h
+include/gtk-2.0/gtk/gtkuimanager.h
include/gtk-2.0/gtk/gtkvbbox.h
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
@@ -193,6 +219,7 @@ 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
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
@@ -204,7 +231,6 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
@@ -214,16 +240,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.200
+lib/libgdk-x11-2.0.so.400
lib/libgdk_pixbuf-2.0.a
lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.200
+lib/libgdk_pixbuf-2.0.so.400
lib/libgdk_pixbuf_xlib-2.0.a
lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.200
+lib/libgdk_pixbuf_xlib-2.0.so.400
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.200
+lib/libgtk-x11-2.0.so.400
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -231,64 +257,172 @@ libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
+share/gtk-2.0/demo/alphatest.png
+share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/appwindow.c
+share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/changedisplay.c
+share/gtk-2.0/demo/colorsel.c
+share/gtk-2.0/demo/dialog.c
+share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_completion.c
+share/gtk-2.0/demo/floppybuddy.gif
+share/gtk-2.0/demo/gnome-applets.png
+share/gtk-2.0/demo/gnome-calendar.png
+share/gtk-2.0/demo/gnome-foot.png
+share/gtk-2.0/demo/gnome-gimp.png
+share/gtk-2.0/demo/gnome-gmush.png
+share/gtk-2.0/demo/gnome-gsame.png
+share/gtk-2.0/demo/gnu-keys.png
+share/gtk-2.0/demo/gtk-logo-rgb.gif
+share/gtk-2.0/demo/hypertext.c
+share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/list_store.c
+share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/panes.c
+share/gtk-2.0/demo/pixbufs.c
+share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/stock_browser.c
+share/gtk-2.0/demo/textview.c
+share/gtk-2.0/demo/tree_store.c
+share/gtk-2.0/demo/ui_manager.c
+share/locale/af/LC_MESSAGES/gtk20-properties.mo
+share/locale/af/LC_MESSAGES/gtk20.mo
+share/locale/am/LC_MESSAGES/gtk20-properties.mo
share/locale/am/LC_MESSAGES/gtk20.mo
+share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
+share/locale/az/LC_MESSAGES/gtk20-properties.mo
share/locale/az/LC_MESSAGES/gtk20.mo
+share/locale/be/LC_MESSAGES/gtk20-properties.mo
share/locale/be/LC_MESSAGES/gtk20.mo
+share/locale/bg/LC_MESSAGES/gtk20-properties.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
+share/locale/bn/LC_MESSAGES/gtk20-properties.mo
+share/locale/bn/LC_MESSAGES/gtk20.mo
+share/locale/br/LC_MESSAGES/gtk20-properties.mo
+share/locale/br/LC_MESSAGES/gtk20.mo
+share/locale/ca/LC_MESSAGES/gtk20-properties.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
+share/locale/cs/LC_MESSAGES/gtk20-properties.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20-properties.mo
share/locale/cy/LC_MESSAGES/gtk20.mo
+share/locale/da/LC_MESSAGES/gtk20-properties.mo
share/locale/da/LC_MESSAGES/gtk20.mo
+share/locale/de/LC_MESSAGES/gtk20-properties.mo
share/locale/de/LC_MESSAGES/gtk20.mo
+share/locale/el/LC_MESSAGES/gtk20-properties.mo
share/locale/el/LC_MESSAGES/gtk20.mo
+share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
+share/locale/en_CA/LC_MESSAGES/gtk20.mo
+share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
share/locale/en_GB/LC_MESSAGES/gtk20.mo
+share/locale/es/LC_MESSAGES/gtk20-properties.mo
share/locale/es/LC_MESSAGES/gtk20.mo
+share/locale/et/LC_MESSAGES/gtk20-properties.mo
share/locale/et/LC_MESSAGES/gtk20.mo
+share/locale/eu/LC_MESSAGES/gtk20-properties.mo
share/locale/eu/LC_MESSAGES/gtk20.mo
+share/locale/fa/LC_MESSAGES/gtk20-properties.mo
share/locale/fa/LC_MESSAGES/gtk20.mo
+share/locale/fi/LC_MESSAGES/gtk20-properties.mo
share/locale/fi/LC_MESSAGES/gtk20.mo
+share/locale/fr/LC_MESSAGES/gtk20-properties.mo
share/locale/fr/LC_MESSAGES/gtk20.mo
+share/locale/ga/LC_MESSAGES/gtk20-properties.mo
share/locale/ga/LC_MESSAGES/gtk20.mo
+share/locale/gl/LC_MESSAGES/gtk20-properties.mo
share/locale/gl/LC_MESSAGES/gtk20.mo
+share/locale/he/LC_MESSAGES/gtk20-properties.mo
share/locale/he/LC_MESSAGES/gtk20.mo
+share/locale/hi/LC_MESSAGES/gtk20-properties.mo
share/locale/hi/LC_MESSAGES/gtk20.mo
+share/locale/hr/LC_MESSAGES/gtk20-properties.mo
share/locale/hr/LC_MESSAGES/gtk20.mo
+share/locale/hu/LC_MESSAGES/gtk20-properties.mo
share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/ia/LC_MESSAGES/gtk20-properties.mo
share/locale/ia/LC_MESSAGES/gtk20.mo
+share/locale/id/LC_MESSAGES/gtk20-properties.mo
share/locale/id/LC_MESSAGES/gtk20.mo
-share/locale/is/LC_MESSAGES/gtk20.mo
+share/locale/it/LC_MESSAGES/gtk20-properties.mo
share/locale/it/LC_MESSAGES/gtk20.mo
+share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
+share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
+share/locale/li/LC_MESSAGES/gtk20-properties.mo
+share/locale/li/LC_MESSAGES/gtk20.mo
+share/locale/lt/LC_MESSAGES/gtk20-properties.mo
share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/lv/LC_MESSAGES/gtk20-properties.mo
share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mi/LC_MESSAGES/gtk20-properties.mo
+share/locale/mi/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20-properties.mo
share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/ml/LC_MESSAGES/gtk20-properties.mo
share/locale/ml/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20-properties.mo
share/locale/mn/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20-properties.mo
share/locale/ms/LC_MESSAGES/gtk20.mo
+share/locale/ne/LC_MESSAGES/gtk20-properties.mo
share/locale/ne/LC_MESSAGES/gtk20.mo
+share/locale/nl/LC_MESSAGES/gtk20-properties.mo
share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
+share/locale/no/LC_MESSAGES/gtk20-properties.mo
share/locale/no/LC_MESSAGES/gtk20.mo
+share/locale/pl/LC_MESSAGES/gtk20-properties.mo
share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/pt/LC_MESSAGES/gtk20-properties.mo
share/locale/pt/LC_MESSAGES/gtk20.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+share/locale/ro/LC_MESSAGES/gtk20-properties.mo
share/locale/ro/LC_MESSAGES/gtk20.mo
+share/locale/ru/LC_MESSAGES/gtk20-properties.mo
share/locale/ru/LC_MESSAGES/gtk20.mo
+share/locale/sk/LC_MESSAGES/gtk20-properties.mo
share/locale/sk/LC_MESSAGES/gtk20.mo
+share/locale/sl/LC_MESSAGES/gtk20-properties.mo
share/locale/sl/LC_MESSAGES/gtk20.mo
+share/locale/sq/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr/LC_MESSAGES/gtk20-properties.mo
share/locale/sr/LC_MESSAGES/gtk20.mo
+share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
share/locale/sr@Latn/LC_MESSAGES/gtk20.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20.mo
share/locale/sq/LC_MESSAGES/gtk20.mo
+share/locale/sv/LC_MESSAGES/gtk20-properties.mo
share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/ta/LC_MESSAGES/gtk20-properties.mo
share/locale/ta/LC_MESSAGES/gtk20.mo
+share/locale/th/LC_MESSAGES/gtk20-properties.mo
+share/locale/th/LC_MESSAGES/gtk20.mo
+share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
+share/locale/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/uz/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz/LC_MESSAGES/gtk20.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/vi/LC_MESSAGES/gtk20-properties.mo
share/locale/vi/LC_MESSAGES/gtk20.mo
+share/locale/wa/LC_MESSAGES/gtk20-properties.mo
share/locale/wa/LC_MESSAGES/gtk20.mo
+share/locale/yi/LC_MESSAGES/gtk20-properties.mo
share/locale/yi/LC_MESSAGES/gtk20.mo
+share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Default/gtk-2.0/gtkrc
@@ -297,6 +431,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Emacs
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
+@dirrm share/gtk-2.0/demo
+@dirrm share/gtk-2.0
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index d66a991c4924..97446a409ced 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gtksourceview
-PORTVERSION= 0.7.1
+PORTVERSION= 1.0.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
-USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui
+USE_GNOME= gnomeprefix gnomehack lthack libgnome libgnomeprintui
CONFIGURE_ARGS= --enable-compile-warnings=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lgnuregex"
diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo
index baa85c4fd5d6..ce801f570f5a 100644
--- a/x11-toolkits/gtksourceview/distinfo
+++ b/x11-toolkits/gtksourceview/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtksourceview-0.7.1.tar.bz2) = 0803ae4d035f5146f69e3d5785bb00c6
-SIZE (gnome2/gtksourceview-0.7.1.tar.bz2) = 573783
+MD5 (gnome2/gtksourceview-1.0.0.tar.bz2) = 0c17b39420e36fcdc9688da95b83c110
+SIZE (gnome2/gtksourceview-1.0.0.tar.bz2) = 656205
diff --git a/x11-toolkits/gtksourceview/files/patch-configure b/x11-toolkits/gtksourceview/files/patch-configure
deleted file mode 100644
index 6718d62e1a0f..000000000000
--- a/x11-toolkits/gtksourceview/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Tue Dec 17 05:27:57 2002
-+++ configure Sun Dec 22 17:31:25 2002
-@@ -7270,6 +7270,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/gtksourceview/pkg-descr b/x11-toolkits/gtksourceview/pkg-descr
index d24afadff56d..729f7178053b 100644
--- a/x11-toolkits/gtksourceview/pkg-descr
+++ b/x11-toolkits/gtksourceview/pkg-descr
@@ -1,3 +1,2 @@
-Gtksourceview is a text widget that extends the standard Gtk+ 2.x GtkTextView.
-It improves it by implementing syntax highlighting and other features typical
-of a source editor.
+GtkSourceView is a text widget for Gtk+-2 that provides syntax highlighting
+and other features typically expected in a source code editor.
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index 5609a49fbbbe..bba83ab53074 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -14,27 +14,29 @@ lib/libgtksourceview-1.0.a
lib/libgtksourceview-1.0.so
lib/libgtksourceview-1.0.so.0
libdata/pkgconfig/gtksourceview-1.0.pc
-share/doc/gtksourceview/GtkSourceBuffer.html
-share/doc/gtksourceview/GtkSourceLanguage.html
-share/doc/gtksourceview/GtkSourceLanguagesManager.html
-share/doc/gtksourceview/GtkSourcePrintJob.html
-share/doc/gtksourceview/GtkSourceStyleScheme.html
-share/doc/gtksourceview/GtkSourceTag.html
-share/doc/gtksourceview/GtkSourceTagTable.html
-share/doc/gtksourceview/GtkSourceView.html
-share/doc/gtksourceview/gtksourceview-GtkSourceMarker.html
-share/doc/gtksourceview/gtksourceview-GtkSourceTagStyle.html
-share/doc/gtksourceview/gtksourceview-Searching-in-a-GtkSourceBuffer.html
-share/doc/gtksourceview/gtksourceview.devhelp
-share/doc/gtksourceview/home.png
-share/doc/gtksourceview/index.html
-share/doc/gtksourceview/index.sgml
-share/doc/gtksourceview/left.png
-share/doc/gtksourceview/right.png
-share/doc/gtksourceview/up.png
+%%DOCSDIR%%/GtkSourceBuffer.html
+%%DOCSDIR%%/GtkSourceLanguage.html
+%%DOCSDIR%%/GtkSourceLanguagesManager.html
+%%DOCSDIR%%/GtkSourcePrintJob.html
+%%DOCSDIR%%/GtkSourceStyleScheme.html
+%%DOCSDIR%%/GtkSourceTag.html
+%%DOCSDIR%%/GtkSourceTagTable.html
+%%DOCSDIR%%/GtkSourceView.html
+%%DOCSDIR%%/gtksourceview-GtkSourceMarker.html
+%%DOCSDIR%%/gtksourceview-GtkSourceTagStyle.html
+%%DOCSDIR%%/gtksourceview-Searching-in-a-GtkSourceBuffer.html
+%%DOCSDIR%%/gtksourceview.devhelp
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/rn01.html
+%%DOCSDIR%%/up.png
share/gnome/gtksourceview-1.0/language-specs/ada.lang
share/gnome/gtksourceview-1.0/language-specs/c.lang
share/gnome/gtksourceview-1.0/language-specs/cpp.lang
+share/gnome/gtksourceview-1.0/language-specs/csharp.lang
share/gnome/gtksourceview-1.0/language-specs/desktop.lang
share/gnome/gtksourceview-1.0/language-specs/diff.lang
share/gnome/gtksourceview-1.0/language-specs/html.lang
@@ -42,10 +44,15 @@ share/gnome/gtksourceview-1.0/language-specs/idl.lang
share/gnome/gtksourceview-1.0/language-specs/java.lang
share/gnome/gtksourceview-1.0/language-specs/language.dtd
share/gnome/gtksourceview-1.0/language-specs/latex.lang
+share/gnome/gtksourceview-1.0/language-specs/msil.lang
share/gnome/gtksourceview-1.0/language-specs/perl.lang
+share/gnome/gtksourceview-1.0/language-specs/php.lang
share/gnome/gtksourceview-1.0/language-specs/po.lang
share/gnome/gtksourceview-1.0/language-specs/python.lang
+share/gnome/gtksourceview-1.0/language-specs/sql.lang
+share/gnome/gtksourceview-1.0/language-specs/verilog.lang
share/gnome/gtksourceview-1.0/language-specs/xml.lang
+share/locale/ar/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/az/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/be/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/bn/LC_MESSAGES/gtksourceview-1.0.mo
@@ -55,17 +62,22 @@ share/locale/cy/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/da/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/de/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/el/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/en_CA/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/en_GB/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/es/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/et/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/eu/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/fa/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/fi/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/fr/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/ga/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/he/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/hi/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/hr/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/hu/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/id/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/it/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ja/LC_MESSAGES/gtksourceview-1.0.mo
-share/locale/hi/LC_MESSAGES/gtksourceview-1.0.mo
-share/locale/hu/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ko/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/lt/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/mk/LC_MESSAGES/gtksourceview-1.0.mo
@@ -74,14 +86,15 @@ share/locale/mn/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ms/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/nl/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/no/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/pa/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/pl/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/pt/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/pt_BR/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ru/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sk/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/sq/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sr/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sr@Latn/LC_MESSAGES/gtksourceview-1.0.mo
-share/locale/sq/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sv/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ta/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/tr/LC_MESSAGES/gtksourceview-1.0.mo
@@ -91,6 +104,6 @@ share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo
@dirrm share/gnome/gtksourceview-1.0/language-specs
@dirrm share/gnome/gtksourceview-1.0
-@dirrm share/doc/gtksourceview
+@dirrm %%DOCSDIR%%
@dirrm include/gtksourceview-1.0/gtksourceview
@dirrm include/gtksourceview-1.0
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index dda4ab248728..15cef2fa322c 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libbonoboui
-PORTVERSION= 2.4.3
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,7 +18,8 @@ COMMENT= GUI frontend to the libbonobo component of GNOME 2
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libgnomecanvas libgnome
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack \
+ libgnomecanvas libgnome
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 389b480a34e6..105514cc5b47 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libbonoboui-2.4.3.tar.bz2) = b2e4b0e62d5d32ba713221fb63faa6d1
-SIZE (gnome2/libbonoboui-2.4.3.tar.bz2) = 889106
+MD5 (gnome2/libbonoboui-2.6.0.tar.bz2) = 948dbd0ffe2c460ff2986254a40a5c7f
+SIZE (gnome2/libbonoboui-2.6.0.tar.bz2) = 917849
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 156a4f587188..fcdbe416ba34 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig Sat Jun 14 04:47:53 2003
-+++ Makefile.in Sat Jun 14 04:48:13 2003
-@@ -192,7 +192,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig Fri Jan 16 13:17:47 2004
++++ Makefile.in Fri Jan 16 13:18:13 2004
+@@ -146,7 +146,7 @@
+ am__quote = @am__quote@
+ gnomelocaledir = @gnomelocaledir@
+ install_sh = @install_sh@
-SUBDIRS = bonobo glade samples tests po doc
+SUBDIRS = bonobo glade samples po doc
diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure
deleted file mode 100644
index e33f9e6ceb4e..000000000000
--- a/x11-toolkits/libbonoboui/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/libbonoboui/pkg-descr b/x11-toolkits/libbonoboui/pkg-descr
index 22194d3a1d97..8ca4e661c557 100644
--- a/x11-toolkits/libbonoboui/pkg-descr
+++ b/x11-toolkits/libbonoboui/pkg-descr
@@ -1,9 +1,7 @@
-Bonobo is a set of language and system independant CORBA
-interfaces for creating reusable components and creating compound
-documents.
+Bonobo is a set of language- and system-independant CORBA
+interfaces for creating reusable components and compound documents.
-libbonoboui includes a Gtk+ based implementation of the Bonobo
-interfaces, enabling developers to create reusable components
-and applications that can be used to form more complex documents.
+libbonoboui includes a Gtk+-based implementation of the Bonobo
+interfaces.
WWW: http://www.gnome.org/
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 7360b136d008..a2dba1c8cc79 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -39,40 +39,40 @@ lib/libglade/2.0/libbonobo.so
libdata/bonobo/servers/Bonobo_Sample_Controls.server
libdata/bonobo/servers/CanvDemo.server
libdata/pkgconfig/libbonoboui-2.0.pc
-share/doc/libbonoboui/bonobo-controls.html
-share/doc/libbonoboui/bonobo-support-utilities.html
-share/doc/libbonoboui/bonobo-ui.html
-share/doc/libbonoboui/ch01.html
-share/doc/libbonoboui/control-frame.png
-share/doc/libbonoboui/control.png
-share/doc/libbonoboui/home.png
-share/doc/libbonoboui/index.html
-share/doc/libbonoboui/index.sgml
-share/doc/libbonoboui/left.png
-share/doc/libbonoboui/libbonoboui-bonobo-a11y.html
-share/doc/libbonoboui/libbonoboui-bonobo-control-frame.html
-share/doc/libbonoboui/libbonoboui-bonobo-control.html
-share/doc/libbonoboui/libbonoboui-bonobo-file-selector-util.html
-share/doc/libbonoboui/libbonoboui-bonobo-plug.html
-share/doc/libbonoboui/libbonoboui-bonobo-property-control.html
-share/doc/libbonoboui/libbonoboui-bonobo-selector-widget.html
-share/doc/libbonoboui/libbonoboui-bonobo-selector.html
-share/doc/libbonoboui/libbonoboui-bonobo-socket.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-component.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-container.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-engine-config.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-engine.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-node.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-preferences.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-sync.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-util.html
-share/doc/libbonoboui/libbonoboui-bonobo-widget.html
-share/doc/libbonoboui/libbonoboui-bonobo-window.html
-share/doc/libbonoboui/libbonoboui-bonobo-wrapper.html
-share/doc/libbonoboui/libbonoboui-faq.html
-share/doc/libbonoboui/libbonoboui.devhelp
-share/doc/libbonoboui/right.png
-share/doc/libbonoboui/up.png
+%%DOCSDIR%%/bonobo-controls.html
+%%DOCSDIR%%/bonobo-support-utilities.html
+%%DOCSDIR%%/bonobo-ui.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/control-frame.png
+%%DOCSDIR%%/control.png
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libbonoboui-bonobo-a11y.html
+%%DOCSDIR%%/libbonoboui-bonobo-control-frame.html
+%%DOCSDIR%%/libbonoboui-bonobo-control.html
+%%DOCSDIR%%/libbonoboui-bonobo-file-selector-util.html
+%%DOCSDIR%%/libbonoboui-bonobo-plug.html
+%%DOCSDIR%%/libbonoboui-bonobo-property-control.html
+%%DOCSDIR%%/libbonoboui-bonobo-selector-widget.html
+%%DOCSDIR%%/libbonoboui-bonobo-selector.html
+%%DOCSDIR%%/libbonoboui-bonobo-socket.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-component.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-container.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-engine-config.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-engine.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-node.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-preferences.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-sync.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-util.html
+%%DOCSDIR%%/libbonoboui-bonobo-widget.html
+%%DOCSDIR%%/libbonoboui-bonobo-window.html
+%%DOCSDIR%%/libbonoboui-bonobo-wrapper.html
+%%DOCSDIR%%/libbonoboui-faq.html
+%%DOCSDIR%%/libbonoboui.devhelp
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/up.png
share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
@@ -87,12 +87,16 @@ share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/et/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/fa/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/ga/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/hr/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/is/LC_MESSAGES/libbonoboui-2.0.mo
@@ -111,6 +115,7 @@ share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo
@@ -121,6 +126,7 @@ share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
@@ -134,4 +140,4 @@ share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
@dirrm lib/bonobo-2.0
@dirrm include/libbonoboui-2.0/bonobo
@dirrm include/libbonoboui-2.0
-@dirrm share/doc/libbonoboui
+@dirrm %%DOCSDIR%%
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 449e8de063c6..f7496a9fc5ab 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,21 +6,25 @@
#
PORTNAME= libgnomeprintui
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome print support library
+BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas
+USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas lthack intlhack
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=13
USE_BISON= yes
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index ac074cf8fca4..5364d1a70072 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprintui-2.4.2.tar.bz2) = 5a28283f32efaa6fa401c5e9385b9634
-SIZE (gnome2/libgnomeprintui-2.4.2.tar.bz2) = 509655
+MD5 (gnome2/libgnomeprintui-2.6.0.tar.bz2) = e6a84427a66f75137f3db735aaddacdc
+SIZE (gnome2/libgnomeprintui-2.6.0.tar.bz2) = 551097
diff --git a/x11-toolkits/libgnomeprintui/files/patch-configure b/x11-toolkits/libgnomeprintui/files/patch-configure
deleted file mode 100644
index 188be53fea84..000000000000
--- a/x11-toolkits/libgnomeprintui/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/pkg-descr b/x11-toolkits/libgnomeprintui/pkg-descr
index f7ae47f42231..cbc8ebcc69c3 100644
--- a/x11-toolkits/libgnomeprintui/pkg-descr
+++ b/x11-toolkits/libgnomeprintui/pkg-descr
@@ -1,4 +1,4 @@
-This is a prototype implementation of the Gnome Printing Architecture,
+The user interface for the Gnome Printing Architecture,
as described in:
WWW: http://www.gnome.org/projects/gnome-print/
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index b646179008ff..8d90e43fa5b5 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -1,4 +1,5 @@
include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-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
@@ -13,6 +14,13 @@ share/doc/libgnomeprintui/home.png
share/doc/libgnomeprintui/index.html
share/doc/libgnomeprintui/index.sgml
share/doc/libgnomeprintui/left.png
+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/doc/libgnomeprintui/right.png
share/doc/libgnomeprintui/up.png
@@ -28,6 +36,8 @@ share/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -55,6 +65,7 @@ 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/pa/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
@@ -67,6 +78,7 @@ share/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo
share/locale/sr@Latn/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/th/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
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index f221c12df2f6..c7ac61fe1ea9 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,28 +6,30 @@
#
PORTNAME= libgnomeui
-PORTVERSION= 2.4.0.1
-PORTREVISION= 2
+PORTVERSION= 2.6.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Libraries for the GNOME GUI, a GNU desktop environment
-LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnomekeyring \
+ 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
USE_XPM= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui
+USE_GNOME= gnomeprefix gnomehack lthack gnomehier libbonoboui
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=13
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+PLIST_SUB= GTK_VERSION="2.4.0"
.include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 179b2af4fbe8..18b0a7cd5466 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 196f4a3f1f4a531ff57acaa879e98dd2
-SIZE (gnome2/libgnomeui-2.4.0.1.tar.bz2) = 1269316
+MD5 (gnome2/libgnomeui-2.6.0.tar.bz2) = ef295e03112ed1647de991ad4552ce28
+SIZE (gnome2/libgnomeui-2.6.0.tar.bz2) = 1456029
diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in
index 5eb473f9c1d8..045ff7f723b0 100644
--- a/x11-toolkits/libgnomeui/files/patch-Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- 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@
+--- Makefile.in.orig Mon Mar 22 00:31:40 2004
++++ Makefile.in Mon Mar 22 00:32:06 2004
+@@ -139,7 +139,7 @@
+ YACC = @YACC@
gnomelocaledir = @gnomelocaledir@
--SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests
-+SUBDIRS = libgnomeui glade images demos doc po #tests
+-SUBDIRS = libgnomeui file-chooser glade images demos test-gnome doc po #tests
++SUBDIRS = libgnomeui file-chooser glade images demos doc po #tests
+
+ EXTRA_DIST = COPYING.LIB NEWS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
diff --git a/x11-toolkits/libgnomeui/files/patch-configure b/x11-toolkits/libgnomeui/files/patch-configure
deleted file mode 100644
index 54a31067fcc7..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure 2002/04/26 12:31:45 1.1
-+++ configure 2002/04/26 12:32:10
-@@ -7099,6 +7099,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/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
index 69f8b2e7c4d5..938ac8dbe444 100644
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in
@@ -1,11 +1,11 @@
---- libgnomeui/Makefile.in.orig Fri Jun 13 14:41:05 2003
-+++ libgnomeui/Makefile.in Fri Jun 13 14:41:43 2003
-@@ -148,7 +148,7 @@
- #
- libgnomeuiincludedir = $(includedir)/libgnomeui-2.0/libgnomeui
-
--INCLUDES = -I$(top_builddir) -I$(top_srcdir) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOMEUILIBDIR=\""$(libdir)"\" -DGNOMEUIDATADIR=\""$(datadir)"\" -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" -DGNOMEUIICONDIR=\""$(datadir)/icons"\" -DGNOMEUISERVERDIR=\""$(libexecdir)"\" -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DG_LOG_DOMAIN=\"GnomeUI\" $(WARN_CFLAGS) $(LIBGNOMEUI_CFLAGS)
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOMEUILIBDIR=\""$(libdir)"\" -DGNOMEUIDATADIR=\""$(datadir)"\" -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\" -DGNOMEUISERVERDIR=\""$(libexecdir)"\" -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DG_LOG_DOMAIN=\"GnomeUI\" $(WARN_CFLAGS) $(LIBGNOMEUI_CFLAGS)
-
-
- EXTRA_HEADERS =
+--- libgnomeui/Makefile.in.orig Wed Feb 25 01:08:42 2004
++++ libgnomeui/Makefile.in Wed Feb 25 01:10:01 2004
+@@ -158,7 +158,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/files/patch-libgnomeui_gnome-icon-lookup.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c
deleted file mode 100644
index ecb6739ab17b..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- libgnomeui/gnome-icon-lookup.c.orig Thu Sep 18 02:13:50 2003
-+++ libgnomeui/gnome-icon-lookup.c Thu Sep 18 02:16:19 2003
-@@ -107,6 +107,10 @@
-
- if (vfs_mime_name)
- {
-+ /* Handle absolute files */
-+ if (vfs_mime_name[0] == '/')
-+ return g_strdup (vfs_mime_name);
-+
- p = strrchr(vfs_mime_name, '.');
-
- if (p)
-@@ -293,7 +297,9 @@
- if (mime_type)
- {
- mime_name = get_vfs_mime_name (mime_type);
-- if (mime_name && gnome_icon_theme_has_icon (icon_theme, mime_name))
-+ if (mime_name &&
-+ ((mime_name[0] == '/' && g_file_test (mime_name, G_FILE_TEST_IS_REGULAR) ||
-+ gnome_icon_theme_has_icon (icon_theme, mime_name))))
- return mime_name;
- g_free (mime_name);
-
diff --git a/x11-toolkits/libgnomeui/pkg-descr b/x11-toolkits/libgnomeui/pkg-descr
index 1dc68ad2b699..706980baddfc 100644
--- a/x11-toolkits/libgnomeui/pkg-descr
+++ b/x11-toolkits/libgnomeui/pkg-descr
@@ -1,3 +1,4 @@
-Libraries for the GNOME GUI, a GNU desktop environment
+LibGnomeUI provides backend GUI components common to GNOME
+applications.
WWW: http://www.gnome.org/
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index e7113b5466a7..c4e7ea765f94 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -17,6 +17,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-druid.h
include/libgnomeui-2.0/libgnomeui/gnome-entry.h
include/libgnomeui-2.0/libgnomeui/gnome-file-entry.h
include/libgnomeui-2.0/libgnomeui/gnome-font-picker.h
+include/libgnomeui-2.0/libgnomeui/gnome-help.h
include/libgnomeui-2.0/libgnomeui/gnome-href.h
include/libgnomeui-2.0/libgnomeui/gnome-ice.h
include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h
@@ -42,68 +43,70 @@ 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
+include/libgnomeui-2.0/libgnomeui/gnome-url.h
include/libgnomeui-2.0/libgnomeui/gnome-vfs-util.h
include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h
include/libgnomeui-2.0/libgnomeui/gnome-window.h
include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h
include/libgnomeui-2.0/libgnomeui/libgnomeui.h
+lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so
lib/libglade/2.0/libgnome.so
lib/libgnomeui-2.a
lib/libgnomeui-2.so
-lib/libgnomeui-2.so.400
+lib/libgnomeui-2.so.600
libdata/pkgconfig/libgnomeui-2.0.pc
libexec/gnome_segv2
-share/doc/libgnomeui/GnomeAbout.html
-share/doc/libgnomeui/GnomeApp.html
-share/doc/libgnomeui/GnomeAppBar.html
-share/doc/libgnomeui/GnomeClient.html
-share/doc/libgnomeui/GnomeColorPicker.html
-share/doc/libgnomeui/GnomeDateEdit.html
-share/doc/libgnomeui/GnomeDialog.html
-share/doc/libgnomeui/GnomeDruid.html
-share/doc/libgnomeui/GnomeDruidPage.html
-share/doc/libgnomeui/GnomeDruidPageEdge.html
-share/doc/libgnomeui/GnomeDruidPageStandard.html
-share/doc/libgnomeui/GnomeEntry.html
-share/doc/libgnomeui/GnomeFileEntry.html
-share/doc/libgnomeui/GnomeFontPicker.html
-share/doc/libgnomeui/GnomeHRef.html
-share/doc/libgnomeui/GnomeIconEntry.html
-share/doc/libgnomeui/GnomeIconList.html
-share/doc/libgnomeui/GnomeIconSelection.html
-share/doc/libgnomeui/GnomeMDI.html
-share/doc/libgnomeui/GnomeMDIChild.html
-share/doc/libgnomeui/GnomeMDIGenericChild.html
-share/doc/libgnomeui/GnomeMessageBox.html
-share/doc/libgnomeui/GnomePixmap.html
-share/doc/libgnomeui/GnomePixmapEntry.html
-share/doc/libgnomeui/GnomePropertyBox.html
-share/doc/libgnomeui/GnomeScores.html
-share/doc/libgnomeui/application-mgmt.html
-share/doc/libgnomeui/ch01.html
-share/doc/libgnomeui/deprecated.html
-share/doc/libgnomeui/druids.html
-share/doc/libgnomeui/fixme.html
-share/doc/libgnomeui/index.html
-share/doc/libgnomeui/index.sgml
-share/doc/libgnomeui/libgnomeui-GnomeIconLookup.html
-share/doc/libgnomeui/libgnomeui-GnomeIconTheme.html
-share/doc/libgnomeui/libgnomeui-GnomeThemeFile.html
-share/doc/libgnomeui/libgnomeui-GnomeThumbnail.html
-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-mdi-session.html
-share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html
-share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html
-share/doc/libgnomeui/libgnomeui-gnome-types.html
-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-gnometypebuiltins.html
-share/doc/libgnomeui/libgnomeui-objects.html
-share/doc/libgnomeui/miscellaneous.html
+%%DOCSDIR%%/GnomeAbout.html
+%%DOCSDIR%%/GnomeApp.html
+%%DOCSDIR%%/GnomeAppBar.html
+%%DOCSDIR%%/GnomeClient.html
+%%DOCSDIR%%/GnomeColorPicker.html
+%%DOCSDIR%%/GnomeDateEdit.html
+%%DOCSDIR%%/GnomeDialog.html
+%%DOCSDIR%%/GnomeDruid.html
+%%DOCSDIR%%/GnomeDruidPage.html
+%%DOCSDIR%%/GnomeDruidPageEdge.html
+%%DOCSDIR%%/GnomeDruidPageStandard.html
+%%DOCSDIR%%/GnomeEntry.html
+%%DOCSDIR%%/GnomeFileEntry.html
+%%DOCSDIR%%/GnomeFontPicker.html
+%%DOCSDIR%%/GnomeHRef.html
+%%DOCSDIR%%/GnomeIconEntry.html
+%%DOCSDIR%%/GnomeIconList.html
+%%DOCSDIR%%/GnomeIconSelection.html
+%%DOCSDIR%%/GnomeMDI.html
+%%DOCSDIR%%/GnomeMDIChild.html
+%%DOCSDIR%%/GnomeMDIGenericChild.html
+%%DOCSDIR%%/GnomeMessageBox.html
+%%DOCSDIR%%/GnomePixmap.html
+%%DOCSDIR%%/GnomePixmapEntry.html
+%%DOCSDIR%%/GnomePropertyBox.html
+%%DOCSDIR%%/GnomeScores.html
+%%DOCSDIR%%/application-mgmt.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/deprecated.html
+%%DOCSDIR%%/druids.html
+%%DOCSDIR%%/fixme.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html
+%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html
+%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html
+%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html
+%%DOCSDIR%%/libgnomeui-gnome-app-helper.html
+%%DOCSDIR%%/libgnomeui-gnome-app-util.html
+%%DOCSDIR%%/libgnomeui-gnome-dialog-util.html
+%%DOCSDIR%%/libgnomeui-gnome-mdi-session.html
+%%DOCSDIR%%/libgnomeui-gnome-popup-menu.html
+%%DOCSDIR%%/libgnomeui-gnome-stock-icons.html
+%%DOCSDIR%%/libgnomeui-gnome-types.html
+%%DOCSDIR%%/libgnomeui-gnome-ui-init.html
+%%DOCSDIR%%/libgnomeui-gnome-uidefs.html
+%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html
+%%DOCSDIR%%/libgnomeui-gnome-window.html
+%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html
+%%DOCSDIR%%/libgnomeui-objects.html
+%%DOCSDIR%%/miscellaneous.html
share/gnome/pixmaps/gnome-about-logo.png
share/gnome/pixmaps/gnome-default-dlg.png
share/gnome/pixmaps/gnome-error.png
@@ -122,6 +125,7 @@ share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/eo/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
@@ -132,6 +136,7 @@ share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ga/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/hr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
@@ -145,6 +150,7 @@ share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
@@ -159,8 +165,10 @@ share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
@@ -168,6 +176,7 @@ share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
-@dirrm share/doc/libgnomeui
+@dirrm %%DOCSDIR%%
@dirrm include/libgnomeui-2.0/libgnomeui
@dirrm include/libgnomeui-2.0
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index e8d0dcc183c7..18271418f8be 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libwnck
-PORTVERSION= 2.4.0.1
-PORTREVISION= 1
+PORTVERSION= 2.6.0.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,7 +20,7 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gtk20
+USE_GNOME= gnomehack lthack gtk20
USE_BISON= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=13
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 259371461094..049453299bed 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libwnck-2.4.0.1.tar.bz2) = 7a7007b285a4e3c39a7bb113cb2be45b
-SIZE (gnome2/libwnck-2.4.0.1.tar.bz2) = 310490
+MD5 (gnome2/libwnck-2.6.0.1.tar.bz2) = 86b0258fa7dc8b66e3314a05862bb10f
+SIZE (gnome2/libwnck-2.6.0.1.tar.bz2) = 329697
diff --git a/x11-toolkits/libwnck/files/patch-configure b/x11-toolkits/libwnck/files/patch-configure
deleted file mode 100644
index c607938f6e76..000000000000
--- a/x11-toolkits/libwnck/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure 2002/04/26 13:54:14 1.1
-+++ configure 2002/04/26 13:54:34
-@@ -6400,6 +6400,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/libwnck/pkg-descr b/x11-toolkits/libwnck/pkg-descr
index ada0fd869e07..685bf95e056d 100644
--- a/x11-toolkits/libwnck/pkg-descr
+++ b/x11-toolkits/libwnck/pkg-descr
@@ -1,5 +1,5 @@
-libwnck is aWindow Navigator Construction Kit, i.e. a library to use
-for writing pagers and taskslists and stuff. It is needed for the
+libwnck is a Window Navigator Construction Kit, i.e. a library used
+for writing pagers and taskslists. It is needed for the
GNOME 2.0 desktop.
WWW: http://www.gnome.org/
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 8094fd6082e1..049e9e39f755 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -1,4 +1,5 @@
include/libwnck-1.0/libwnck/application.h
+include/libwnck-1.0/libwnck/class-group.h
include/libwnck-1.0/libwnck/libwnck.h
include/libwnck-1.0/libwnck/pager.h
include/libwnck-1.0/libwnck/screen.h
@@ -11,7 +12,7 @@ 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.11
+lib/libwnck-1.so.13
libdata/pkgconfig/libwnck-1.0.pc
share/locale/am/LC_MESSAGES/libwnck.mo
share/locale/ar/LC_MESSAGES/libwnck.mo
@@ -25,6 +26,8 @@ share/locale/cy/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/en_CA/LC_MESSAGES/libwnck.mo
+share/locale/en_GB/LC_MESSAGES/libwnck.mo
share/locale/eo/LC_MESSAGES/libwnck.mo
share/locale/es/LC_MESSAGES/libwnck.mo
share/locale/et/LC_MESSAGES/libwnck.mo
@@ -35,6 +38,7 @@ share/locale/ga/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/hr/LC_MESSAGES/libwnck.mo
share/locale/hu/LC_MESSAGES/libwnck.mo
share/locale/id/LC_MESSAGES/libwnck.mo
share/locale/is/LC_MESSAGES/libwnck.mo
@@ -48,10 +52,12 @@ share/locale/lv/LC_MESSAGES/libwnck.mo
share/locale/mk/LC_MESSAGES/libwnck.mo
share/locale/ml/LC_MESSAGES/libwnck.mo
share/locale/mn/LC_MESSAGES/libwnck.mo
+share/locale/mr/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
share/locale/no/LC_MESSAGES/libwnck.mo
+share/locale/pa/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
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 7124c70c878b..5aae206ceffb 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= pango
-PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTVERSION= 1.4.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
- ftp://ftp.gtk.org/pub/gtk/v2.2/
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.4,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.3/
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -33,7 +32,7 @@ CONFIGURE_ARGS= --with-qt=no \
--with-html-dir=${PREFIX}/share/doc \
--enable-static
PKGINSTALL= ${WRKDIR}/pkg-install
-# Hmm.. tough one. Found this one when I had science/hdf installed
+# Hmm.. tough one. Found this one when I had graphics/hdf installed
# (which installs glist.h) which is picked up before the glib-2.0
# stuff, with Bad Results[tm]
#
@@ -42,11 +41,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
${GLIB2_CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-PLIST_SUB= VERSION="1.2.0"
+PLIST_SUB= VERSION="1.4.0"
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
+MAN1= pango-querymodules.1
+
post-patch:
@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index a6d34f66c3f8..91ee4b4a4267 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/pango-1.2.5.tar.bz2) = df00fe3e71cd297010f24f439b6c8ee6
-SIZE (gnome2/pango-1.2.5.tar.bz2) = 865495
+MD5 (gnome2/pango-1.4.0.tar.bz2) = 9b5d9a5dcce5b3899d401f9c2cd6873f
+SIZE (gnome2/pango-1.4.0.tar.bz2) = 921472
diff --git a/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h b/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h
deleted file mode 100644
index 9e6a2e4292d0..000000000000
--- a/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/indic/indic-ot.h.orig Tue Mar 16 16:23:13 2004
-+++ modules/indic/indic-ot.h Tue Mar 16 16:23:38 2004
-@@ -9,7 +9,8 @@
- #ifndef __INDIC_OT_H__
- #define __INDIC_OT_H__
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <pango/pango-glyph.h>
- #include <pango/pango-types.h>
- #include "mprefixups.h"
diff --git a/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h b/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h
deleted file mode 100644
index 25a937a88ef1..000000000000
--- a/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- pango/opentype/ftxopen.h.orig Tue Mar 16 16:19:27 2004
-+++ pango/opentype/ftxopen.h Tue Mar 16 16:19:45 2004
-@@ -22,7 +22,8 @@
- #ifndef FTXOPEN_H
- #define FTXOPEN_H
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #ifdef __cplusplus
- extern "C" {
diff --git a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c b/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c
deleted file mode 100644
index 0deb4b92e48c..000000000000
--- a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pango/opentype/pango-ot-info.c.orig Tue Mar 16 16:18:19 2004
-+++ pango/opentype/pango-ot-info.c Tue Mar 16 16:17:38 2004
-@@ -22,7 +22,7 @@
- #include "pango-ot-private.h"
- #include "fterrcompat.h"
- #include <freetype/internal/ftobjs.h>
--#include <freetype/ftmodule.h>
-+#include <freetype/ftmodapi.h>
-
- static void pango_ot_info_class_init (GObjectClass *object_class);
- static void pango_ot_info_finalize (GObject *object);
diff --git a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h b/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h
deleted file mode 100644
index 0d2e0c944177..000000000000
--- a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- pango/opentype/pango-ot-private.h.orig Tue Mar 16 16:16:35 2004
-+++ pango/opentype/pango-ot-private.h Tue Mar 16 16:18:53 2004
-@@ -22,7 +22,8 @@
- #ifndef __PANGO_OT_PRIVATE_H__
- #define __PANGO_OT_PRIVATE_H__
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #include <glib-object.h>
-
diff --git a/x11-toolkits/pango/files/patch-pango_pango-ot.h b/x11-toolkits/pango/files/patch-pango_pango-ot.h
deleted file mode 100644
index 61e68f7207e7..000000000000
--- a/x11-toolkits/pango/files/patch-pango_pango-ot.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- pango/pango-ot.h.orig Tue Mar 16 16:21:00 2004
-+++ pango/pango-ot.h Tue Mar 16 16:21:18 2004
-@@ -22,7 +22,8 @@
- #ifndef __PANGO_OT_H__
- #define __PANGO_OT_H__
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <pango/pango-glyph.h>
-
- G_BEGIN_DECLS
diff --git a/x11-toolkits/pango/files/patch-pango_pangoft2.c b/x11-toolkits/pango/files/patch-pango_pangoft2.c
deleted file mode 100644
index f1d05cd84dfd..000000000000
--- a/x11-toolkits/pango/files/patch-pango_pangoft2.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- pango/pangoft2.c.orig Tue Mar 16 16:21:59 2004
-+++ pango/pangoft2.c Tue Mar 16 16:22:20 2004
-@@ -28,7 +28,8 @@
- #include <glib.h>
- #include <glib/gprintf.h>
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #include "pango-utils.h"
- #include "pangoft2.h"
diff --git a/x11-toolkits/pango/files/patch-pango_pangoft2.h b/x11-toolkits/pango/files/patch-pango_pangoft2.h
deleted file mode 100644
index af7dcded906f..000000000000
--- a/x11-toolkits/pango/files/patch-pango_pangoft2.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- pango/pangoft2.h.orig Tue Mar 16 16:14:49 2004
-+++ pango/pangoft2.h Tue Mar 16 16:15:21 2004
-@@ -23,7 +23,8 @@
- #ifndef __PANGOFT2_H__
- #define __PANGOFT2_H__
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #include <fontconfig/fontconfig.h>
-
diff --git a/x11-toolkits/pango/files/pkg-install.in b/x11-toolkits/pango/files/pkg-install.in
index d734df0dddfc..2eefcdfcd015 100644
--- a/x11-toolkits/pango/files/pkg-install.in
+++ b/x11-toolkits/pango/files/pkg-install.in
@@ -3,7 +3,9 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin
export PATH
-if [ "$2" = "POST-INSTALL" ]; then
+case $2 in
+POST-INSTALL)
echo "Running fc-cache to build fontconfig cache..."
fc-cache -f -v
-fi
+ ;;
+esac
diff --git a/x11-toolkits/pango/pkg-descr b/x11-toolkits/pango/pkg-descr
index 49eeb62d0df3..9ff793b51135 100644
--- a/x11-toolkits/pango/pkg-descr
+++ b/x11-toolkits/pango/pkg-descr
@@ -1,8 +1,6 @@
-The goal of the Pango project is to provide an open-source framework for the
-layout and rendering of internationalized text. Pango is an offshoot of the
-GTK+ and GNOME projects, and the initial focus is operation in those
-environments, however there is nothing fundamentally GTK+ or GNOME specific
-about Pango. Pango uses Unicode for all of its encoding, and will eventually
-support output in all the world's major languages.
+Pango provides a framework to render and control the layout of
+internationalized text, and is the backend for right-to-left text.
+Pango is an integral part of the GTK+ and GNOME projects, but its
+code is platform- and toolkit-independent.
WWW: http://www.pango.org/
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 575d51a21f62..cbb44b3091ae 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -12,56 +12,47 @@ 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
include/pango-1.0/pango/pango-layout.h
include/pango-1.0/pango/pango-modules.h
include/pango-1.0/pango/pango-ot.h
+include/pango-1.0/pango/pango-script.h
include/pango-1.0/pango/pango-tabs.h
include/pango-1.0/pango/pango-types.h
include/pango-1.0/pango/pango-utils.h
include/pango-1.0/pango/pango.h
+include/pango-1.0/pango/pangofc-font.h
+include/pango-1.0/pango/pangofc-fontmap.h
include/pango-1.0/pango/pangoft2.h
include/pango-1.0/pango/pangox.h
include/pango-1.0/pango/pangoxft.h
lib/libpango-1.0.a
lib/libpango-1.0.so
-lib/libpango-1.0.so.200
+lib/libpango-1.0.so.399
lib/libpangoft2-1.0.a
lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.200
+lib/libpangoft2-1.0.so.399
lib/libpangox-1.0.a
lib/libpangox-1.0.so
-lib/libpangox-1.0.so.200
+lib/libpangox-1.0.so.399
lib/libpangoxft-1.0.a
lib/libpangoxft-1.0.so
-lib/libpangoxft-1.0.so.200
-lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so
-lib/pango/%%VERSION%%/modules/pango-arabic-x.so
-lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
-lib/pango/%%VERSION%%/modules/pango-basic-ft2.so
+lib/libpangoxft-1.0.so.399
+lib/pango/%%VERSION%%/modules/pango-arabic-fc.so
+lib/pango/%%VERSION%%/modules/pango-basic-fc.so
lib/pango/%%VERSION%%/modules/pango-basic-x.so
-lib/pango/%%VERSION%%/modules/pango-basic-xft.so
-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
-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
-lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
-lib/pango/%%VERSION%%/modules/pango-indic-xft.so
-lib/pango/%%VERSION%%/modules/pango-indic-ft2.so
-lib/pango/%%VERSION%%/modules/pango-myanmar-x.so
-lib/pango/%%VERSION%%/modules/pango-tamil-x.so
-lib/pango/%%VERSION%%/modules/pango-thai-x.so
-lib/pango/%%VERSION%%/modules/pango-thai-xft.so
-lib/pango/%%VERSION%%/modules/pango-thai-ft2.so
+lib/pango/%%VERSION%%/modules/pango-hangul-fc.so
+lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so
+lib/pango/%%VERSION%%/modules/pango-indic-fc.so
+lib/pango/%%VERSION%%/modules/pango-thai-fc.so
libdata/pkgconfig/pango.pc
libdata/pkgconfig/pangoft2.pc
libdata/pkgconfig/pangox.pc
libdata/pkgconfig/pangoxft.pc
+share/doc/pango/PangoEngineLang.html
+share/doc/pango/PangoEngineShape.html
+share/doc/pango/PangoFcFont.html
+share/doc/pango/PangoFcFontMap.html
share/doc/pango/home.png
share/doc/pango/index.html
share/doc/pango/index.sgml
@@ -75,20 +66,22 @@ 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-Scripts.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-querymodules.html
share/doc/pango/pango.devhelp
share/doc/pango/pango.html
share/doc/pango/rendering.html
share/doc/pango/right.png
+share/doc/pango/tools.html
share/doc/pango/up.png
@dirrm share/doc/pango
@dirrm lib/pango/%%VERSION%%/modules