8 files changed, 8 insertions, 68 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a26db29e7fad..f9d2870b4c45 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	at-spi
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
@@ -17,12 +17,16 @@ COMMENT=	An Assistive Technology Service Provider Interface
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo
+USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo lthack intlhack
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index f3dd7b26c3f8..1915820e340f 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/at-spi-1.3.12.tar.bz2) = f6a45cbe7497e9522ac3a2ca86d3a7aa
-SIZE (gnome2/at-spi-1.3.12.tar.bz2) = 428156
+MD5 (gnome2/at-spi-1.3.13.tar.bz2) = 73a451166fe07906dacc335c803963b2
+SIZE (gnome2/at-spi-1.3.13.tar.bz2) = 457567
diff --git a/accessibility/at-spi/files/patch-Makefile.in b/accessibility/at-spi/files/patch-Makefile.in
deleted file mode 100644
index 8931c3ba0ddc..000000000000
--- a/accessibility/at-spi/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 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-atk-bridge_Makefile.in b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
deleted file mode 100644
index 9c50885971b2..000000000000
--- a/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-configure b/accessibility/at-spi/files/patch-configure
deleted file mode 100644
index 5b9571dfd74e..000000000000
--- a/accessibility/at-spi/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/26 13:02:36	1.1
-+++ configure	2002/04/26 13:02:46
-@@ -6712,6 +6712,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/accessibility/at-spi/files/patch-docs::reference::cspi::Makefile.in b/accessibility/at-spi/files/patch-docs::reference::cspi::Makefile.in
deleted file mode 100644
index 5b20d1928ef5..000000000000
--- a/accessibility/at-spi/files/patch-docs::reference::cspi::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- docs/reference/cspi/Makefile.in	2002/04/12 10:18:10	1.1
-+++ docs/reference/cspi/Makefile.in	2002/04/12 10:18:49
-@@ -146,7 +146,7 @@
- 
- INSTALLDIR = $(prefix)/share/gtk-doc
- 
--HTML_DIR = ${datadir}/gtk-doc/html
-+HTML_DIR = ${prefix}/share/doc
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/accessibility/at-spi/files/patch-intltool-merge.in b/accessibility/at-spi/files/patch-intltool-merge.in
deleted file mode 100644
index 54c8a233119d..000000000000
--- a/accessibility/at-spi/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	Wed Nov 12 15:29:28 2003
-+++ intltool-merge.in	Wed Nov 12 15:31:54 2003
-@@ -858,7 +858,7 @@
-     if ($MULTIPLE_OUTPUT) {
-         for my $lang (sort keys %po_files_by_lang) {
- 	    if ( ! -e $lang ) {
--	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+	        mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
-             }
-             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-             my $tree = readXml($FILE);
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 241cbe052ad5..cf351e46b23a 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -60,7 +60,6 @@ share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
 share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
 @dirrm share/gnome/idl/at-spi-1.0
-@dirrm share/doc/at-spi-cspi
 @dirrm lib/orbit-2.0
 @dirrm include/at-spi-1.0/libspi
 @dirrm include/at-spi-1.0/cspi