10 files changed, 19 insertions, 66 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