6 files changed, 58 insertions, 26 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 43121bd21a09..553b6210ba23 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 54ca92afb782..1c53333d61c8 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1 +1 @@
-MD5 (gnome2/at-spi-1.2.1.tar.bz2) = 562620310d9150e4803a275311f0088d
+MD5 (gnome2/at-spi-1.3.7.tar.bz2) = c5ee8c9ae592c547ac557fa58003b021
diff --git a/accessibility/at-spi/files/patch-atk-bridge_Makefile.in b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
new file mode 100644
index 000000000000..9c50885971b2
--- /dev/null
+++ b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
@@ -0,0 +1,11 @@
+--- atk-bridge/Makefile.in.orig	Sat Apr 12 01:06:28 2003
++++ atk-bridge/Makefile.in	Sat Apr 12 01:06:48 2003
+@@ -147,7 +147,7 @@
+ 
+ LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version
+ 
+-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la
++libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la
+ 
+ CFLAGS = @CFLAGS@ $(ATK_BRIDGE_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/accessibility/at-spi/files/patch-libspi_Makefile.in b/accessibility/at-spi/files/patch-libspi_Makefile.in
new file mode 100644
index 000000000000..cfb55a212a86
--- /dev/null
+++ b/accessibility/at-spi/files/patch-libspi_Makefile.in
@@ -0,0 +1,11 @@
+--- libspi/Makefile.in.orig	Fri May  2 13:36:07 2003
++++ libspi/Makefile.in	Fri May  2 13:36:37 2003
+@@ -539,7 +539,7 @@
+ mostlyclean distclean maintainer-clean
+ 
+ 
+-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h
++accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h
+ 
+ $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
+ 	$(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
diff --git a/accessibility/at-spi/files/patch-registryd_Makefile.in b/accessibility/at-spi/files/patch-registryd_Makefile.in
new file mode 100644
index 000000000000..7729e9da1400
--- /dev/null
+++ b/accessibility/at-spi/files/patch-registryd_Makefile.in
@@ -0,0 +1,11 @@
+--- registryd/Makefile.in.orig	Fri Aug  8 12:15:34 2003
++++ registryd/Makefile.in	Fri Aug  8 12:20:05 2003
+@@ -150,7 +150,7 @@
+ at_spi_registryd_SOURCES =  	desktop.c			desktop.h			deviceeventcontroller.c		deviceeventcontroller.h		registry-main.c			registry.c			registry.h
+ 
+ 
+-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
++LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
+ 
+ serverinfodir = $(prefix)/libdata/bonobo/servers
+ serverinfo_DATA = Accessibility_Registry.server
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 54c07250ed45..fe058837b88e 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -23,42 +23,41 @@ include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
 include/at-spi-1.0/libspi/stateset.h
+include/at-spi-1.0/libspi/streamablecontent.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/libcspi.a
 lib/libcspi.so
-lib/libcspi.so.0
+lib/libcspi.so.9
 lib/libspi.a
 lib/libspi.so
-lib/libspi.so.0
+lib/libspi.so.9
 lib/gtk-2.0/modules/libatk-bridge.so
 lib/orbit-2.0/Accessibility_module.so
 libdata/bonobo/servers/Accessibility_Registry.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
-share/doc/at-spi-cspi/at-spi-cspi-accessiblecomponent-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleeditabletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehyperlink-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehypertext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleimage-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblerelations-and-relationsets.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleselection-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletable-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblevalue-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-event-listener-support.html
-share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html
-share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html
-share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html
-share/doc/at-spi-cspi/book1.html
-share/doc/at-spi-cspi/c5968.html
-share/doc/at-spi-cspi/c7152.html
-share/doc/at-spi-cspi/index.sgml
+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
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleComponent-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleEditableText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHyperlink-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHypertext-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleImage-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleRelations-and-RelationSets.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleSelection-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleTable-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleValue-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-Event-Listener-Support.html
+share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html
+share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html
+share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html
+share/doc/at-spi-cspi/ch05.html
+share/doc/at-spi-cspi/index.html
 share/doc/at-spi-cspi/spi-accessible.html
 share/doc/at-spi-cspi/spi-application.html
 share/doc/at-spi-cspi/spi-component.html