7 files changed, 13 insertions, 76 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 50fbbf5f8739..0e017e7a10aa 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	1.32.0
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,14 +18,13 @@ USES+=		tar:bzip2
 
 RUN_DEPENDS=	at-spi2-atk>2.6.0:${PORTSDIR}/accessibility/at-spi2-atk
 
-USES+=		gmake gettext libtool:oldver pathfix pkgconfig python:2
+USES+=		gmake gettext libtool pathfix pkgconfig python:2
 USE_GNOME=	gnomehier intlhack gtk20 gconf2 libbonobo
 USE_XORG=	x11 xtst
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-static
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	at-spi.schemas
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 377907ba8ee3..f8f90ec4eabe 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -33,23 +33,16 @@ include/at-spi-1.0/libspi/text.h
 include/at-spi-1.0/libspi/value.h
 include/at-spi-1.0/login-helper/Accessibility_LoginHelper.h
 include/at-spi-1.0/login-helper/login-helper.h
-lib/libcspi.a
-lib/libcspi.la
 lib/libcspi.so
-lib/libcspi.so.10
-lib/libloginhelper.a
-lib/libloginhelper.la
+lib/libcspi.so.0
+lib/libcspi.so.0.10.11
 lib/libloginhelper.so
 lib/libloginhelper.so.0
-lib/libspi.a
-lib/libspi.la
+lib/libloginhelper.so.0.0.0
 lib/libspi.so
-lib/libspi.so.10
-lib/orbit-2.0/Accessibility_LoginHelper_module.a
-lib/orbit-2.0/Accessibility_LoginHelper_module.la
+lib/libspi.so.0
+lib/libspi.so.0.10.11
 lib/orbit-2.0/Accessibility_LoginHelper_module.so
-lib/orbit-2.0/Accessibility_module.a
-lib/orbit-2.0/Accessibility_module.la
 lib/orbit-2.0/Accessibility_module.so
 %%PYTHON_SITELIBDIR%%/pyatspi/__init__.py
 %%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyc
@@ -187,58 +180,3 @@ share/locale/xh/LC_MESSAGES/at-spi.mo
 share/locale/zh_CN/LC_MESSAGES/at-spi.mo
 share/locale/zh_HK/LC_MESSAGES/at-spi.mo
 share/locale/zh_TW/LC_MESSAGES/at-spi.mo
-@dirrm share/idl/at-spi-1.0
-@dirrm %%PYTHON_SITELIBDIR%%/pyatspi
-@dirrm include/at-spi-1.0/login-helper
-@dirrm include/at-spi-1.0/libspi
-@dirrm include/at-spi-1.0/cspi
-@dirrm include/at-spi-1.0
-@dirrmtry lib/orbit-2.0
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/ang/LC_MESSAGES
-@dirrmtry share/locale/ang
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 772bd1a038ab..59d8cb6bc111 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	dasher
 PORTVERSION=	4.10.1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	GNOME
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 2ba2a14ac5ea..8fa326b1fb29 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-mag
 PORTVERSION=	0.16.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 7aed13056a54..0e0f685d936f 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnopernicus
 PORTVERSION=	1.1.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index afa1d4173296..de88a4a3ce30 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gok
 PORTVERSION=	2.30.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	GNOME
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index a07d1cc52e1c..c9d3e28d9cb0 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	java-access-bridge
 PORTVERSION=	1.18.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	accessibility java gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2