summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-spi/Makefile7
-rw-r--r--accessibility/at-spi/distinfo2
-rw-r--r--accessibility/at-spi/files/patch-Makefile.in10
-rw-r--r--accessibility/at-spi/files/patch-libspi::Makefile.in23
-rw-r--r--accessibility/at-spi/files/patch-util::magnifier.c14
-rw-r--r--accessibility/at-spi/pkg-plist14
-rw-r--r--accessibility/atk/Makefile6
-rw-r--r--accessibility/gail/Makefile5
-rw-r--r--accessibility/gail/distinfo2
-rw-r--r--accessibility/gail/pkg-plist2
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/ORBit2/distinfo2
-rw-r--r--devel/atk/Makefile6
-rw-r--r--devel/bonobo-activation/Makefile6
-rw-r--r--devel/bonobo-activation/distinfo2
-rw-r--r--devel/bonobo-activation/pkg-plist2
-rw-r--r--devel/gconf2/Makefile5
-rw-r--r--devel/gconf2/distinfo2
-rw-r--r--devel/gconf2/pkg-plist4
-rw-r--r--devel/glib20/Makefile4
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfs/distinfo2
-rw-r--r--devel/gnome-vfs/files/patch-aa22
-rw-r--r--devel/gnome-vfs/files/patch-ab19
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in13
-rw-r--r--devel/gnome-vfs/files/patch-modules_ssh-method.c10
-rw-r--r--devel/gnomevfs2/Makefile4
-rw-r--r--devel/gnomevfs2/distinfo2
-rw-r--r--devel/gnomevfs2/files/patch-aa22
-rw-r--r--devel/gnomevfs2/files/patch-ab19
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in13
-rw-r--r--devel/gnomevfs2/files/patch-modules_ssh-method.c10
-rw-r--r--devel/libIDL/Makefile4
-rw-r--r--devel/libIDL/distinfo2
-rw-r--r--devel/libbonobo/Makefile5
-rw-r--r--devel/libbonobo/distinfo2
-rw-r--r--devel/libglade2/Makefile4
-rw-r--r--devel/libglade2/distinfo2
-rw-r--r--devel/libglade2/pkg-plist1
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libgnomecanvas/distinfo2
-rw-r--r--graphics/libgnomecanvas/pkg-plist19
-rw-r--r--net/linc/Makefile4
-rw-r--r--net/linc/distinfo2
-rw-r--r--net/linc/pkg-plist1
-rw-r--r--print/libgnomeprint/Makefile8
-rw-r--r--print/libgnomeprint/distinfo2
-rw-r--r--print/libgnomeprint/files/patch-ab10
-rw-r--r--print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c15
-rw-r--r--print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in20
-rw-r--r--print/libgnomeprint/pkg-plist32
-rw-r--r--x11-toolkits/at-spi/Makefile7
-rw-r--r--x11-toolkits/at-spi/distinfo2
-rw-r--r--x11-toolkits/at-spi/files/patch-Makefile.in10
-rw-r--r--x11-toolkits/at-spi/files/patch-libspi::Makefile.in23
-rw-r--r--x11-toolkits/at-spi/files/patch-util::magnifier.c14
-rw-r--r--x11-toolkits/at-spi/pkg-plist14
-rw-r--r--x11-toolkits/gail/Makefile5
-rw-r--r--x11-toolkits/gail/distinfo2
-rw-r--r--x11-toolkits/gail/pkg-plist2
-rw-r--r--x11-toolkits/gtk20/Makefile4
-rw-r--r--x11-toolkits/gtk30/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/distinfo2
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist2
-rw-r--r--x11-toolkits/libgail-gnome/Makefile6
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo2
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist2
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/distinfo2
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist51
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11/libgnome/Makefile7
-rw-r--r--x11/libgnome/distinfo2
-rw-r--r--x11/libgnome/pkg-plist21
76 files changed, 317 insertions, 284 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a2085a3ad436..29a9c078dba7 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= at-spi
-PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gailutil.13:${PORTSDIR}/x11-toolkits/gail \
+LIB_DEPENDS= gailutil.15:${PORTSDIR}/x11-toolkits/gail \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
USE_BZIP2= yes
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index c754cbdcda08..433a7d1b6e1e 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-0.12.1.tar.bz2) = 8aa7aff16abb53181299c1e5938ac665
+MD5 (gnome2/at-spi-1.0.0.tar.bz2) = 1488f9a0d9c4f5dd83f9adbb2bbd4107
diff --git a/accessibility/at-spi/files/patch-Makefile.in b/accessibility/at-spi/files/patch-Makefile.in
index 5760d4d8e1ef..8931c3ba0ddc 100644
--- a/accessibility/at-spi/files/patch-Makefile.in
+++ b/accessibility/at-spi/files/patch-Makefile.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- Makefile.in 2002/04/26 13:13:43 1.1
-+++ Makefile.in 2002/04/26 13:14:02
-@@ -129,7 +129,7 @@
+--- Makefile.in.orig Tue Jun 11 03:51:37 2002
++++ Makefile.in Tue Jun 11 03:52:06 2002
+@@ -127,7 +127,7 @@
X_LIBS = @X_LIBS@
cxxflags_set = @cxxflags_set@
--SUBDIRS = docs idl libspi registryd atk-bridge cspi util test
-+SUBDIRS = docs idl libspi registryd atk-bridge cspi util
+-SUBDIRS = docs idl libspi registryd atk-bridge cspi test
++SUBDIRS = docs idl libspi registryd atk-bridge cspi
pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc
diff --git a/accessibility/at-spi/files/patch-libspi::Makefile.in b/accessibility/at-spi/files/patch-libspi::Makefile.in
deleted file mode 100644
index c4336dce6717..000000000000
--- a/accessibility/at-spi/files/patch-libspi::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- libspi/Makefile.in.orig Fri Apr 26 16:03:02 2002
-+++ libspi/Makefile.in Fri Apr 26 17:30:41 2002
-@@ -140,7 +140,7 @@
-
- libspiincludedir = $(includedir)/at-spi-1.0/libspi
-
--libspiinclude_HEADERS = Accessibility.h accessible.h eventlistener.h action.h application.h base.h component.h editabletext.h hyperlink.h hypertext.h image.h keystrokelistener.h keymasks.h libspi.h listener.h relation.h remoteobject.h selection.h table.h text.h value.h
-+libspiinclude_HEADERS = Accessibility.h accessible.h eventlistener.h action.h application.h base.h component.h editabletext.h hyperlink.h hypertext.h image.h keystrokelistener.h keymasks.h libspi.h listener.h relation.h remoteobject.h selection.h stateset.h table.h text.h value.h
-
-
- IDL_OUT = Accessibility.h Accessibility-stubs.c Accessibility-skels.c Accessibility-common.c
-@@ -160,7 +160,7 @@
- orbittypelibdir = $(libdir)/orbit-2.0
- orbittypelib_LTLIBRARIES = Accessibility_module.la
-
--Accessibility_module_la_LDFLAGS = -export-dynamic -module
-+Accessibility_module_la_LDFLAGS = -export-dynamic -module -avoid-version
-
- Accessibility_module_la_SOURCES = Accessibility-imodule.c
-
diff --git a/accessibility/at-spi/files/patch-util::magnifier.c b/accessibility/at-spi/files/patch-util::magnifier.c
deleted file mode 100644
index a19760e4297f..000000000000
--- a/accessibility/at-spi/files/patch-util::magnifier.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- util/magnifier.c 2002/04/12 09:58:25 1.1
-+++ util/magnifier.c 2002/04/12 10:07:31
-@@ -11,7 +11,7 @@
- */
- #define PARENT_TYPE BONOBO_OBJECT_TYPE
-
--struct sockaddr_un mag_server = { AF_UNIX , "/tmp/magnifier_socket" };
-+struct sockaddr_un mag_server = { 0, AF_UNIX , "/tmp/magnifier_socket" };
-
- typedef struct {
- gchar *target_display;
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 7c038ce97b40..2e4daa9665c9 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -1,5 +1,3 @@
-bin/at-spi-registryd
-bin/magnifier
include/at-spi-1.0/cspi/spi-impl.h
include/at-spi-1.0/cspi/spi-listener.h
include/at-spi-1.0/cspi/spi-roletypes.h
@@ -27,23 +25,17 @@ include/at-spi-1.0/libspi/stateset.h
include/at-spi-1.0/libspi/table.h
include/at-spi-1.0/libspi/text.h
include/at-spi-1.0/libspi/value.h
-lib/libat-util.a
-lib/libat-util.so
-lib/libat-util.so.0
-lib/libatk-bridge.a
-lib/libatk-bridge.so
-lib/libatk-bridge.so.0
lib/libcspi.a
lib/libcspi.so
-lib/libcspi.so.1
+lib/libcspi.so.0
lib/libspi.a
lib/libspi.so
-lib/libspi.so.1
+lib/libspi.so.0
lib/orbit-2.0/Accessibility_module.so
libdata/bonobo/servers/Accessibility_Registry.server
-libdata/bonobo/servers/Accessibility_Util.server
libdata/pkgconfig/cspi-1.0.pc
libdata/pkgconfig/libspi-1.0.pc
+libexec/at-spi-registryd
share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html
share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html
share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index b6c9ce7daf80..4f6106272e63 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -8,9 +8,9 @@
PORTNAME= atk
PORTVERSION= 1.0.2
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \
- ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITES= ${MASTER_SITE_GNOME}
+ ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 2b7ccfc29608..d8e51f340a4f 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gail
-PORTVERSION= 0.13
-PORTREVISION= 1
+PORTVERSION= 0.15
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 5f5022674b2d..b265e9eacde6 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.13.tar.bz2) = 1ac6af8a34eeb244633caadf80d76e67
+MD5 (gnome2/gail-0.15.tar.bz2) = cbaa1e22a3015a35c50eb7836615c420
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 2b126a5937c0..5a3823ae4d5d 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -5,7 +5,7 @@ lib/gtk-2.0/modules/libferret.so
lib/gtk-2.0/modules/libgail.so
lib/libgailutil.a
lib/libgailutil.so
-lib/libgailutil.so.13
+lib/libgailutil.so.15
libdata/pkgconfig/gail.pc
@dirrm lib/gtk-2.0/modules
@dirrm include/gail-1.0/libgail-util
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index c2c59471377e..d664df46fcbe 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= ORBit2
-PORTVERSION= 2.3.110
+PORTVERSION= 2.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index e52aa19ede8a..49db27d467af 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.110.tar.bz2) = 302dfd638348b950272aef8038f6d9b6
+MD5 (gnome2/ORBit2-2.4.0.tar.bz2) = 25eb93f5dae655db2806e6462a52a8ee
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index b6c9ce7daf80..4f6106272e63 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -8,9 +8,9 @@
PORTNAME= atk
PORTVERSION= 1.0.2
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \
- ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITES= ${MASTER_SITE_GNOME}
+ ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 866910f15e84..7387720879d4 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= bonobo-activation
-PORTVERSION= 0.9.9
+PORTVERSION= 1.0.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -28,6 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+MAN1= bonobo-activation-server.1
+
pre-patch:
@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 3cdd9b57aa00..486cd9fdf4b0 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.9.tar.bz2) = 088decd1510740ff16b2e5e6940e4a18
+MD5 (gnome2/bonobo-activation-1.0.0.tar.bz2) = 4cd1154d61ada02892224729275b9df0
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index 8211ea59d255..d8a6d29cf364 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -64,7 +64,9 @@ share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
share/locale/az/LC_MESSAGES/bonobo-activation.mo
+share/locale/ar/LC_MESSAGES/bonobo-activation.mo
share/locale/bg/LC_MESSAGES/bonobo-activation.mo
+share/locale/ca/LC_MESSAGES/bonobo-activation.mo
share/locale/da/LC_MESSAGES/bonobo-activation.mo
share/locale/de/LC_MESSAGES/bonobo-activation.mo
share/locale/el/LC_MESSAGES/bonobo-activation.mo
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 1d6588037493..aa5b5468d33e 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gconf2
-PORTVERSION= 1.1.10
+PORTVERSION= 1.1.11
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -26,7 +26,6 @@ INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-db3-includes=${LOCALBASE}/include \
--with-html-dir=${PREFIX}/share/doc
-# --enable-bdbbackend
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index bc4d3effea82..f78e0554b25a 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/GConf-1.1.10.tar.bz2) = e30615bf27ea2ee84f411bd7a7077394
+MD5 (gnome2/GConf-1.1.11.tar.bz2) = c1107d92e7e3b0837af49b7273897c74
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 30bf0b789414..e9ea1a42d2ce 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -47,6 +47,7 @@ share/doc/gconf/x289.html
share/doc/gconf/x42.html
share/doc/gconf/x462.html
share/doc/gconf/x485.html
+share/locale/ar/LC_MESSAGES/GConf2.mo
share/locale/az/LC_MESSAGES/GConf2.mo
share/locale/ca/LC_MESSAGES/GConf2.mo
share/locale/cs/LC_MESSAGES/GConf2.mo
@@ -54,6 +55,7 @@ share/locale/da/LC_MESSAGES/GConf2.mo
share/locale/de/LC_MESSAGES/GConf2.mo
share/locale/el/LC_MESSAGES/GConf2.mo
share/locale/es/LC_MESSAGES/GConf2.mo
+share/locale/eu/LC_MESSAGES/GConf2.mo
share/locale/fi/LC_MESSAGES/GConf2.mo
share/locale/fr/LC_MESSAGES/GConf2.mo
share/locale/ga/LC_MESSAGES/GConf2.mo
@@ -62,6 +64,7 @@ share/locale/hu/LC_MESSAGES/GConf2.mo
share/locale/it/LC_MESSAGES/GConf2.mo
share/locale/ja/LC_MESSAGES/GConf2.mo
share/locale/ko/LC_MESSAGES/GConf2.mo
+share/locale/ms/LC_MESSAGES/GConf2.mo
share/locale/nl/LC_MESSAGES/GConf2.mo
share/locale/nn/LC_MESSAGES/GConf2.mo
share/locale/no/LC_MESSAGES/GConf2.mo
@@ -75,6 +78,7 @@ share/locale/sl/LC_MESSAGES/GConf2.mo
share/locale/sv/LC_MESSAGES/GConf2.mo
share/locale/tr/LC_MESSAGES/GConf2.mo
share/locale/uk/LC_MESSAGES/GConf2.mo
+share/locale/vi/LC_MESSAGES/GConf2.mo
share/locale/zh_CN/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
@dirrm share/doc/gconf
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index de1993d2abe7..b1f6d603c8b8 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -8,8 +8,8 @@
PORTNAME= glib
PORTVERSION= 2.0.3
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \
- ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020607,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 4b6686cde745..4c0072a9e5a2 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 1.9.16
+PORTVERSION= 1.9.17
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 2bb5f1f241e0..e6a7da0eb71f 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
+MD5 (gnome2/gnome-vfs-1.9.17.tar.bz2) = 28d11daba54ab8627e4e6faaf75433e1
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 9eb96806f017..fe31e4719654 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon May 27 14:03:09 2002
-+++ configure Mon May 27 14:04:14 2002
-@@ -7224,6 +7224,7 @@
+--- configure.orig Mon Jun 10 13:08:18 2002
++++ configure Mon Jun 10 13:09:52 2002
+@@ -7493,6 +7493,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12140,8 +12141,8 @@
+@@ -12412,8 +12413,8 @@
done
fi
--echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12143: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12415: checking for BZ2_bzCompressInit in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12157,11 +12158,11 @@
+@@ -12429,11 +12430,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -33,16 +33,16 @@
;
return 0;
}
-@@ -12490,7 +12491,7 @@
+@@ -12762,7 +12763,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat >conftest.$ac_ext <<_ACEOF
- #line 12495 "configure"
+ #line 12767 "configure"
#include "confdefs.h"
-@@ -12541,9 +12542,9 @@
+@@ -12813,9 +12814,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
fi
if true; then
-@@ -14134,7 +14135,7 @@
+@@ -14018,7 +14019,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index cd5b093a93d8..535e326cd949 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,11 +1,10 @@
---- Makefile.in.orig Mon May 27 13:58:39 2002
-+++ Makefile.in Mon May 27 13:59:22 2002
-@@ -169,7 +169,7 @@
+--- Makefile.in.orig Mon Jun 10 13:10:15 2002
++++ Makefile.in Mon Jun 10 13:10:42 2002
+@@ -182,7 +182,6 @@
+ schemas \
+ devel-docs \
+ doc \
+- test \
+ monikers \
+ po
- SUBDIRS_GNOME = monikers doc schemas
-
--SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po
-+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po
-
-
- EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index 0ab33d483231..2884f343c186 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- libgnomevfs/Makefile.in 2002/02/16 13:12:02 1.1
-+++ libgnomevfs/Makefile.in 2002/02/16 13:13:00
-@@ -190,7 +190,7 @@
+--- libgnomevfs/Makefile.in.orig Mon Jun 10 13:10:56 2002
++++ libgnomevfs/Makefile.in Mon Jun 10 13:11:51 2002
+@@ -330,7 +330,7 @@
# Platform specific includes
-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h
-
+ libgnomevfsplatforminclude_HEADERS = \
+ gnome-vfs-file-size.h
diff --git a/devel/gnome-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c
new file mode 100644
index 000000000000..14b2cf886863
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_ssh-method.c
@@ -0,0 +1,10 @@
+--- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002
++++ modules/ssh-method.c Mon Jun 10 13:28:51 2002
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <unistd.h>
+
+ typedef struct {
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 4b6686cde745..4c0072a9e5a2 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 1.9.16
+PORTVERSION= 1.9.17
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 2bb5f1f241e0..e6a7da0eb71f 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
+MD5 (gnome2/gnome-vfs-1.9.17.tar.bz2) = 28d11daba54ab8627e4e6faaf75433e1
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 9eb96806f017..fe31e4719654 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon May 27 14:03:09 2002
-+++ configure Mon May 27 14:04:14 2002
-@@ -7224,6 +7224,7 @@
+--- configure.orig Mon Jun 10 13:08:18 2002
++++ configure Mon Jun 10 13:09:52 2002
+@@ -7493,6 +7493,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12140,8 +12141,8 @@
+@@ -12412,8 +12413,8 @@
done
fi
--echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12143: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12415: checking for BZ2_bzCompressInit in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12157,11 +12158,11 @@
+@@ -12429,11 +12430,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -33,16 +33,16 @@
;
return 0;
}
-@@ -12490,7 +12491,7 @@
+@@ -12762,7 +12763,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat >conftest.$ac_ext <<_ACEOF
- #line 12495 "configure"
+ #line 12767 "configure"
#include "confdefs.h"
-@@ -12541,9 +12542,9 @@
+@@ -12813,9 +12814,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
fi
if true; then
-@@ -14134,7 +14135,7 @@
+@@ -14018,7 +14019,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index cd5b093a93d8..535e326cd949 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,11 +1,10 @@
---- Makefile.in.orig Mon May 27 13:58:39 2002
-+++ Makefile.in Mon May 27 13:59:22 2002
-@@ -169,7 +169,7 @@
+--- Makefile.in.orig Mon Jun 10 13:10:15 2002
++++ Makefile.in Mon Jun 10 13:10:42 2002
+@@ -182,7 +182,6 @@
+ schemas \
+ devel-docs \
+ doc \
+- test \
+ monikers \
+ po
- SUBDIRS_GNOME = monikers doc schemas
-
--SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po
-+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po
-
-
- EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 0ab33d483231..2884f343c186 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- libgnomevfs/Makefile.in 2002/02/16 13:12:02 1.1
-+++ libgnomevfs/Makefile.in 2002/02/16 13:13:00
-@@ -190,7 +190,7 @@
+--- libgnomevfs/Makefile.in.orig Mon Jun 10 13:10:56 2002
++++ libgnomevfs/Makefile.in Mon Jun 10 13:11:51 2002
+@@ -330,7 +330,7 @@
# Platform specific includes
-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h
-
+ libgnomevfsplatforminclude_HEADERS = \
+ gnome-vfs-file-size.h
diff --git a/devel/gnomevfs2/files/patch-modules_ssh-method.c b/devel/gnomevfs2/files/patch-modules_ssh-method.c
new file mode 100644
index 000000000000..14b2cf886863
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_ssh-method.c
@@ -0,0 +1,10 @@
+--- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002
++++ modules/ssh-method.c Mon Jun 10 13:28:51 2002
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <unistd.h>
+
+ typedef struct {
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 40d0971313b1..267ed1cbaab5 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libIDL
-PORTVERSION= 0.7.4
+PORTVERSION= 0.8.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo
index 40e3cc956a93..fd17db3527c4 100644
--- a/devel/libIDL/distinfo
+++ b/devel/libIDL/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libIDL-0.7.4.tar.bz2) = 837b1b11e411d58dd5472715c0b1e68f
+MD5 (gnome2/libIDL-0.8.0.tar.bz2) = 4f5f60b0b9cc9a6994d8b4792091595d
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 78ae5443577e..5c4d14a1f0bb 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libbonobo
-PORTVERSION= 1.117.0
-PORTREVISION= 1
+PORTVERSION= 2.0.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 23c1f81a5c1e..ad14705f4368 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.117.0.tar.bz2) = e3ecc01f2f250b3143f0dee600f42e80
+MD5 (gnome2/libbonobo-2.0.0.tar.bz2) = fee1e4af2e5f04a7f6bcce6c066de957
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 956bce6087e1..d85aeeb3b797 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libglade2
-PORTVERSION= 1.99.12
+PORTVERSION= 2.0.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 0dd43447d59b..56f60f53f724 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.12.tar.bz2) = a907318f6d84537b72f64c0c4aebe5a8
+MD5 (gnome2/libglade-2.0.0.tar.bz2) = 3f56880824523fe24381c03a411dea6a
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 2266d9bb1e82..26d93e2c2867 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -13,7 +13,6 @@ share/doc/libglade/libglade-dtd.html
share/doc/libglade/libglade-dtd-exceptions.html
share/doc/libglade/libglade-embedding.html
share/doc/libglade/libglade-extending.html
-share/doc/libglade/libglade-gnome.html
share/doc/libglade/libglade-i18n.html
share/doc/libglade/libglade-lib.html
share/doc/libglade/libglade-libglade-build.html
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 456e58b64d43..9cba9911b6e7 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomecanvas
-PORTVERSION= 1.117.0
+PORTVERSION= 2.0.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index 3c71005309f8..c3a2578fbbcb 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-1.117.0.tar.bz2) = e294e835dd6e6ed48466ae40f39a0d8b
+MD5 (gnome2/libgnomecanvas-2.0.0.tar.bz2) = 3b01a0633a5503e518d7bfd87ecdfbc0
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index ce02109aeb87..6363360995aa 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -17,6 +17,25 @@ lib/libgnomecanvas-2.a
lib/libgnomecanvas-2.so
lib/libgnomecanvas-2.so.0
libdata/pkgconfig/libgnomecanvas-2.0.pc
+share/doc/libgnomecanvas/c4.html
+share/doc/libgnomecanvas/index.html
+share/doc/libgnomecanvas/index.sgml
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspathdef.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasre.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrect.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html
share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 7aae851e2ee0..61a43c590ef6 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= linc
-PORTVERSION= 0.1.22
+PORTVERSION= 0.5.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/net/linc/distinfo b/net/linc/distinfo
index a2bc689e414d..f0791edaf22c 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1 +1 @@
-MD5 (gnome2/linc-0.1.22.tar.bz2) = e1238441707b4650aeecd3a1ad45c406
+MD5 (gnome2/linc-0.5.0.tar.bz2) = 2793b19b769be65ed3cb7df786b8032e
diff --git a/net/linc/pkg-plist b/net/linc/pkg-plist
index 88d517c254d7..add2dfb025f8 100644
--- a/net/linc/pkg-plist
+++ b/net/linc/pkg-plist
@@ -1,3 +1,4 @@
+bin/linc-cleanup-sockets
bin/linc-config
include/linc-1.0/linc/linc-config.h
include/linc-1.0/linc/linc-connection.h
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 45f5e9065058..e177b972b8a8 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomeprint
-PORTVERSION= 1.113.0
+PORTVERSION= 1.115.0
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,7 +24,9 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+ --datadir=${PREFIX}/share/gnome \
+ --with-html-dir=${PREFIX}/share/doc \
+ --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index e35ad5e2380e..b4055f4259ee 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.113.0.tar.bz2) = fc99e013dd40450c8ff93ed2cb58f908
+MD5 (gnome2/libgnomeprint-1.115.0.tar.bz2) = e44cf8558c5d82a49c495a894f48539a
diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab
index c20623cb30c4..0abd2128a5d0 100644
--- a/print/libgnomeprint/files/patch-ab
+++ b/print/libgnomeprint/files/patch-ab
@@ -1,14 +1,14 @@
$FreeBSD$
---- Makefile.in.orig Mon Feb 11 12:42:17 2002
-+++ Makefile.in Tue Mar 19 18:17:21 2002
-@@ -116,7 +116,7 @@
+--- Makefile.in.orig Mon Jun 10 22:13:33 2002
++++ Makefile.in Mon Jun 10 22:14:58 2002
+@@ -105,7 +105,7 @@
WARN_CFLAGS = @WARN_CFLAGS@
cxxflags_set = @cxxflags_set@
--SUBDIRS = libgnomeprint fonts installer tests data po
-+SUBDIRS = libgnomeprint fonts installer data po
+-SUBDIRS = libgnomeprint fonts installer tests data po doc
++SUBDIRS = libgnomeprint fonts installer data po doc
EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c b/print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c
deleted file mode 100644
index fc5f161554aa..000000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint::gnome-print-meta.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- libgnomeprint/gnome-print-meta.c 2002/03/19 16:19:47 1.1
-+++ libgnomeprint/gnome-print-meta.c 2002/03/19 16:20:00
-@@ -28,8 +28,8 @@
-
- #include <math.h>
- #include <string.h>
--#include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
index 9ced5d89bd2a..fd2c0da7ea23 100644
--- a/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
+++ b/print/libgnomeprint/files/patch-libgnomeprint::transports::Makefile.in
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- libgnomeprint/transports/Makefile.in 2002/03/19 16:46:00 1.1
-+++ libgnomeprint/transports/Makefile.in 2002/03/19 16:48:02
-@@ -131,7 +131,7 @@
+--- libgnomeprint/transports/Makefile.in.orig Mon Jun 10 22:16:36 2002
++++ libgnomeprint/transports/Makefile.in Mon Jun 10 22:22:35 2002
+@@ -121,7 +121,7 @@
libgnomeprint_file_la_SOURCES = $(FILE_SRC)
@@ -12,7 +9,7 @@ $FreeBSD$
libgnomeprint_file_la_LIBADD =
-@@ -142,7 +142,7 @@
+@@ -132,7 +132,7 @@
libgnomeprint_lpr_la_SOURCES = $(LPR_SRC)
@@ -20,4 +17,13 @@ $FreeBSD$
+libgnomeprint_lpr_la_LDFLAGS = -avoid-version -module
libgnomeprint_lpr_la_LIBADD =
+
+@@ -143,7 +143,7 @@
+
+ libgnomeprint_custom_la_SOURCES = $(CUSTOM_SRC)
+
+-libgnomeprint_custom_la_LDFLAGS = -version-info 0:0:0 -module
++libgnomeprint_custom_la_LDFLAGS = -avoid-version -module
+
+ libgnomeprint_custom_la_LIBADD =
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 876f27c60a1a..6455b5accdb1 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -4,26 +4,43 @@ include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-bonobo-client.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-bonobo.h
include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-meta.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-multipage.h
include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-private.h
include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
-include/libgnomeprint-2.0/libgnomeprint/gpa-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h
lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
+lib/gnome-print-2.0/transports/libgnomeprint-custom.so
lib/gnome-print-2.0/transports/libgnomeprint-file.so
lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
lib/libgnomeprint-2.a
lib/libgnomeprint-2.so
lib/libgnomeprint-2.so.0
libdata/pkgconfig/libgnomeprint-2.0.pc
+share/doc/libgnomeprint/index.html
+share/doc/libgnomeprint/index.sgml
+share/doc/libgnomeprint/libgnomeprint-building.html
+share/doc/libgnomeprint/libgnomeprint-compiling.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font.html
+share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
+share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print.html
+share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
+share/doc/libgnomeprint/libgnomeprint-question-index.html
+share/doc/libgnomeprint/libgnomeprint-resources.html
+share/doc/libgnomeprint/libgnomeprint.html
+share/doc/libgnomeprint/libgnomeprintunsorted.html
share/gnome/fonts/README.installer
share/gnome/gnome-print-2.0/media/media.xml
share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
@@ -42,6 +59,7 @@ share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -68,8 +86,10 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
@dirrm share/gnome/gnome-print-2.0/media
@dirrm share/gnome/gnome-print-2.0
@dirrm share/gnome/fonts
+@dirrm share/doc/libgnomeprint
@dirrm lib/gnome-print-2.0/transports
@dirrm lib/gnome-print-2.0/drivers
@dirrm lib/gnome-print-2.0
+@dirrm include/libgnomeprint-2.0/libgnomeprint/private
@dirrm include/libgnomeprint-2.0/libgnomeprint
@dirrm include/libgnomeprint-2.0
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index a2085a3ad436..29a9c078dba7 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= at-spi
-PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= gailutil.13:${PORTSDIR}/x11-toolkits/gail \
+LIB_DEPENDS= gailutil.15:${PORTSDIR}/x11-toolkits/gail \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
USE_BZIP2= yes
diff --git a/x11-toolkits/at-spi/distinfo b/x11-toolkits/at-spi/distinfo
index c754cbdcda08..433a7d1b6e1e 100644
--- a/x11-toolkits/at-spi/distinfo
+++ b/x11-toolkits/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-0.12.1.tar.bz2) = 8aa7aff16abb53181299c1e5938ac665
+MD5 (gnome2/at-spi-1.0.0.tar.bz2) = 1488f9a0d9c4f5dd83f9adbb2bbd4107
diff --git a/x11-toolkits/at-spi/files/patch-Makefile.in b/x11-toolkits/at-spi/files/patch-Makefile.in
index 5760d4d8e1ef..8931c3ba0ddc 100644
--- a/x11-toolkits/at-spi/files/patch-Makefile.in
+++ b/x11-toolkits/at-spi/files/patch-Makefile.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- Makefile.in 2002/04/26 13:13:43 1.1
-+++ Makefile.in 2002/04/26 13:14:02
-@@ -129,7 +129,7 @@
+--- Makefile.in.orig Tue Jun 11 03:51:37 2002
++++ Makefile.in Tue Jun 11 03:52:06 2002
+@@ -127,7 +127,7 @@
X_LIBS = @X_LIBS@
cxxflags_set = @cxxflags_set@
--SUBDIRS = docs idl libspi registryd atk-bridge cspi util test
-+SUBDIRS = docs idl libspi registryd atk-bridge cspi util
+-SUBDIRS = docs idl libspi registryd atk-bridge cspi test
++SUBDIRS = docs idl libspi registryd atk-bridge cspi
pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc
diff --git a/x11-toolkits/at-spi/files/patch-libspi::Makefile.in b/x11-toolkits/at-spi/files/patch-libspi::Makefile.in
deleted file mode 100644
index c4336dce6717..000000000000
--- a/x11-toolkits/at-spi/files/patch-libspi::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- libspi/Makefile.in.orig Fri Apr 26 16:03:02 2002
-+++ libspi/Makefile.in Fri Apr 26 17:30:41 2002
-@@ -140,7 +140,7 @@
-
- libspiincludedir = $(includedir)/at-spi-1.0/libspi
-
--libspiinclude_HEADERS = Accessibility.h accessible.h eventlistener.h action.h application.h base.h component.h editabletext.h hyperlink.h hypertext.h image.h keystrokelistener.h keymasks.h libspi.h listener.h relation.h remoteobject.h selection.h table.h text.h value.h
-+libspiinclude_HEADERS = Accessibility.h accessible.h eventlistener.h action.h application.h base.h component.h editabletext.h hyperlink.h hypertext.h image.h keystrokelistener.h keymasks.h libspi.h listener.h relation.h remoteobject.h selection.h stateset.h table.h text.h value.h
-
-
- IDL_OUT = Accessibility.h Accessibility-stubs.c Accessibility-skels.c Accessibility-common.c
-@@ -160,7 +160,7 @@
- orbittypelibdir = $(libdir)/orbit-2.0
- orbittypelib_LTLIBRARIES = Accessibility_module.la
-
--Accessibility_module_la_LDFLAGS = -export-dynamic -module
-+Accessibility_module_la_LDFLAGS = -export-dynamic -module -avoid-version
-
- Accessibility_module_la_SOURCES = Accessibility-imodule.c
-
diff --git a/x11-toolkits/at-spi/files/patch-util::magnifier.c b/x11-toolkits/at-spi/files/patch-util::magnifier.c
deleted file mode 100644
index a19760e4297f..000000000000
--- a/x11-toolkits/at-spi/files/patch-util::magnifier.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- util/magnifier.c 2002/04/12 09:58:25 1.1
-+++ util/magnifier.c 2002/04/12 10:07:31
-@@ -11,7 +11,7 @@
- */
- #define PARENT_TYPE BONOBO_OBJECT_TYPE
-
--struct sockaddr_un mag_server = { AF_UNIX , "/tmp/magnifier_socket" };
-+struct sockaddr_un mag_server = { 0, AF_UNIX , "/tmp/magnifier_socket" };
-
- typedef struct {
- gchar *target_display;
diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist
index 7c038ce97b40..2e4daa9665c9 100644
--- a/x11-toolkits/at-spi/pkg-plist
+++ b/x11-toolkits/at-spi/pkg-plist
@@ -1,5 +1,3 @@
-bin/at-spi-registryd
-bin/magnifier
include/at-spi-1.0/cspi/spi-impl.h
include/at-spi-1.0/cspi/spi-listener.h
include/at-spi-1.0/cspi/spi-roletypes.h
@@ -27,23 +25,17 @@ include/at-spi-1.0/libspi/stateset.h
include/at-spi-1.0/libspi/table.h
include/at-spi-1.0/libspi/text.h
include/at-spi-1.0/libspi/value.h
-lib/libat-util.a
-lib/libat-util.so
-lib/libat-util.so.0
-lib/libatk-bridge.a
-lib/libatk-bridge.so
-lib/libatk-bridge.so.0
lib/libcspi.a
lib/libcspi.so
-lib/libcspi.so.1
+lib/libcspi.so.0
lib/libspi.a
lib/libspi.so
-lib/libspi.so.1
+lib/libspi.so.0
lib/orbit-2.0/Accessibility_module.so
libdata/bonobo/servers/Accessibility_Registry.server
-libdata/bonobo/servers/Accessibility_Util.server
libdata/pkgconfig/cspi-1.0.pc
libdata/pkgconfig/libspi-1.0.pc
+libexec/at-spi-registryd
share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html
share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html
share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 2b7ccfc29608..d8e51f340a4f 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= gail
-PORTVERSION= 0.13
-PORTREVISION= 1
+PORTVERSION= 0.15
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index 5f5022674b2d..b265e9eacde6 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.13.tar.bz2) = 1ac6af8a34eeb244633caadf80d76e67
+MD5 (gnome2/gail-0.15.tar.bz2) = cbaa1e22a3015a35c50eb7836615c420
diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist
index 2b126a5937c0..5a3823ae4d5d 100644
--- a/x11-toolkits/gail/pkg-plist
+++ b/x11-toolkits/gail/pkg-plist
@@ -5,7 +5,7 @@ lib/gtk-2.0/modules/libferret.so
lib/gtk-2.0/modules/libgail.so
lib/libgailutil.a
lib/libgailutil.so
-lib/libgailutil.so.13
+lib/libgailutil.so.15
libdata/pkgconfig/gail.pc
@dirrm lib/gtk-2.0/modules
@dirrm include/gail-1.0/libgail-util
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 06f529bf6283..f57ac72ef512 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,8 +8,8 @@
PORTNAME= gtk
PORTVERSION= 2.0.3
CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \
- ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020607,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 06f529bf6283..f57ac72ef512 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,8 +8,8 @@
PORTNAME= gtk
PORTVERSION= 2.0.3
CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \
- ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020607,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index dcf56d4909ce..369685cb7147 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libbonoboui
-PORTVERSION= 1.117.0
+PORTVERSION= 2.0.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 439a9a5594b7..671739538492 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-1.117.0.tar.bz2) = 291b7ff71a5c7b6e2a8dc022eaa965a4
+MD5 (gnome2/libbonoboui-2.0.0.tar.bz2) = eadb6803b4aacc8848b702343fc31e97
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 16af03bc8e47..b82c4b34ed79 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -40,9 +40,11 @@ lib/libglade/2.0/libbonobo.so
libdata/bonobo/servers/Bonobo_Sample_Controls.server
libdata/pkgconfig/libbonoboui-2.0.pc
share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 668cb234cd53..7f992f3ddda7 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,16 +7,16 @@
PORTNAME= libgail-gnome
PORTVERSION= 0.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
- spi.1:${PORTSDIR}/x11-toolkits/at-spi
+ spi.0:${PORTSDIR}/x11-toolkits/at-spi
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 9f8b25beb260..9603f37ffaf3 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomeprintui
-PORTVERSION= 1.113.0
+PORTVERSION= 1.115.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index b4836483bb2c..25f4c09f56de 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprintui-1.113.0.tar.bz2) = 0e6b2263d3f606679fa729a7f5105025
+MD5 (gnome2/libgnomeprintui-1.115.0.tar.bz2) = f0dea2bc7071c1e149f379a9b267e5b3
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 3652d7f959ef..1df0f33b71d3 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -15,10 +15,12 @@ share/locale/de/LC_MESSAGES/libgnomeprintui.mo
share/locale/es/LC_MESSAGES/libgnomeprintui.mo
share/locale/et/LC_MESSAGES/libgnomeprintui.mo
share/locale/eu/LC_MESSAGES/libgnomeprintui.mo
+share/locale/hi/LC_MESSAGES/libgnomeprintui.mo
share/locale/ko/LC_MESSAGES/libgnomeprintui.mo
share/locale/ms/LC_MESSAGES/libgnomeprintui.mo
share/locale/pl/LC_MESSAGES/libgnomeprintui.mo
share/locale/pt/LC_MESSAGES/libgnomeprintui.mo
+share/locale/ru/LC_MESSAGES/libgnomeprintui.mo
share/locale/sl/LC_MESSAGES/libgnomeprintui.mo
share/locale/sv/LC_MESSAGES/libgnomeprintui.mo
share/locale/ta/LC_MESSAGES/libgnomeprintui.mo
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index d6e10e0a7c75..507affa98273 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomeui
-PORTVERSION= 1.117.1
+PORTVERSION= 2.0.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 0b79ddb87c2e..7d5c861f3091 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-1.117.1.tar.bz2) = db23a8f8c7ede92c057a94eea40981fa
+MD5 (gnome2/libgnomeui-2.0.0.tar.bz2) = c18856f24c64552cc4392460e3cf6d4f
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 5dbf8c42cdd1..46c494611138 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -47,6 +47,55 @@ lib/libgnomeui-2.a
lib/libgnomeui-2.so
lib/libgnomeui-2.so.0
libdata/pkgconfig/libgnomeui-2.0.pc
+share/doc/libgnomeui/c4.html
+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/index.html
+share/doc/libgnomeui/index.sgml
+share/doc/libgnomeui/libgnomeui-gnome-app-helper.html
+share/doc/libgnomeui/libgnomeui-gnome-app-util.html
+share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html
+share/doc/libgnomeui/libgnomeui-gnome-gconf-ui.html
+share/doc/libgnomeui/libgnomeui-gnome-ice.html
+share/doc/libgnomeui/libgnomeui-gnome-macros.html
+share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html
+share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html
+share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html
+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/x1495.html
+share/doc/libgnomeui/x18387.html
+share/doc/libgnomeui/x5974.html
+share/doc/libgnomeui/x7693.html
share/gnome/pixmaps/gnome-about-logo.png
share/gnome/pixmaps/gnome-default-dlg.png
share/gnome/pixmaps/gnome-error.png
@@ -54,6 +103,8 @@ share/gnome/pixmaps/gnome-info.png
share/gnome/pixmaps/gnome-question.png
share/gnome/pixmaps/gnome-warning.png
share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/cs/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_GB/LC_MESSAGES/libgnomeui-2.0.mo
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 2c74e6825c52..cf174215e67b 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,8 +8,8 @@
PORTNAME= pango
PORTVERSION= 1.0.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \
- ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020607,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
http://www.ameth.org/gimp/gtk/v1.3/
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index c82d2bf4216c..bfc611a2039b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnome
-PORTVERSION= 1.117.1
+PORTVERSION= 2.0.0
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
@@ -27,7 +27,8 @@ INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
- --with-html-dir=${PREFIX}/share/doc
+ --with-html-dir=${PREFIX}/share/doc \
+ --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 8b21e2b0e9f0..5303a4ed6d25 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.117.1.tar.bz2) = 665b6c80370b4ecf1737db59a8582ea8
+MD5 (gnome2/libgnome-2.0.0.tar.bz2) = feac6f82e707527b97e97167ff4a64bf
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index e0345d2ccc86..e9a4666200a7 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -80,6 +80,27 @@ lib/libgnome-2.so
lib/libgnome-2.so.0
libdata/bonobo/servers/GNOME_Moniker_std.server
libdata/pkgconfig/libgnome-2.0.pc
+share/doc/libgnome/index.html
+share/doc/libgnome/index.sgml
+share/doc/libgnome/libgnome-gnome-config.html
+share/doc/libgnome/libgnome-gnome-exec.html
+share/doc/libgnome/libgnome-gnome-gconf.html
+share/doc/libgnome/libgnome-gnome-help.html
+share/doc/libgnome/libgnome-gnome-i18n.html
+share/doc/libgnome/libgnome-gnome-init.html
+share/doc/libgnome/libgnome-gnome-program.html
+share/doc/libgnome/libgnome-gnome-score.html
+share/doc/libgnome/libgnome-gnome-sound.html
+share/doc/libgnome/libgnome-gnome-triggers.html
+share/doc/libgnome/libgnome-gnome-url.html
+share/doc/libgnome/libgnome-gnome-util.html
+share/doc/libgnome/libgnome-libgnometypebuiltins.html
+share/doc/libgnome/libgnome.html
+share/doc/libgnome/x1277.html
+share/doc/libgnome/x2848.html
+share/doc/libgnome/x3292.html
+share/doc/libgnome/x4134.html
+share/doc/libgnome/x9.html
share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml