11 files changed, 44 insertions, 51 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index d697ed290cdb..c96a5932b7c2 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	1.32.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,14 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Assistive Technology Service Provider Interface
 
-USE_BZIP2=	yes
+USES+=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
 RUN_DEPENDS=	at-spi2-atk>2.6.0:${PORTSDIR}/accessibility/at-spi2-atk
 
-USES=		gmake gettext pkgconfig
-USE_GNOME=	gnomehack gnomehier intlhack gtk20 gconf2 libbonobo
+USES+=		gmake gettext libtool:oldver pathfix pkgconfig
+USE_GNOME=	gnomehier intlhack gtk20 gconf2 libbonobo
 USE_XORG=	x11 xtst
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
@@ -27,6 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	at-spi.schemas
 
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 97decff1aeea..2ba2a14ac5ea 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-mag
 PORTVERSION=	0.16.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,14 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen magnifier
 
-USE_BZIP2=	yes
 USE_XORG=	xfixes xdamage ice xcomposite sm
-USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
-USES=		gmake gettext pkgconfig
-USE_AUTOTOOLS=	libtool
+USE_GNOME=	gnomeprefix atspi libbonobo intlhack
+USES=		gmake gettext libtool pathfix pkgconfig tar:bzip2
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 DOCSDIR=	${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
 
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index 0c4a8abdd9b2..15c2050f72dd 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -1,11 +1,8 @@
 bin/magnifier
 include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
-lib/libgnome-mag.a
-lib/libgnome-mag.la
 lib/libgnome-mag.so
 lib/libgnome-mag.so.2
-lib/orbit-2.0/GNOME_Magnifier_module.a
-lib/orbit-2.0/GNOME_Magnifier_module.la
+lib/libgnome-mag.so.2.4.3
 lib/orbit-2.0/GNOME_Magnifier_module.so
 libdata/bonobo/servers/GNOME_Magnifier.server
 libdata/pkgconfig/gnome-mag-1.0.pc
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 48db0f062cf8..b7326523c888 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-speech
 PORTVERSION=	0.4.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,9 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME text-to-speech API
 
-USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix libbonobo
-USES=		gmake pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/accessibility/gnome-speech/pkg-plist b/accessibility/gnome-speech/pkg-plist
index 099c20920d60..7fa36c9704b7 100644
--- a/accessibility/gnome-speech/pkg-plist
+++ b/accessibility/gnome-speech/pkg-plist
@@ -8,6 +8,7 @@ lib/libgnomespeech.a
 lib/libgnomespeech.la
 lib/libgnomespeech.so
 lib/libgnomespeech.so.7
+lib/libgnomespeech.so.7.0.1
 lib/orbit-2.0/GNOME_Speech_module.a
 lib/orbit-2.0/GNOME_Speech_module.la
 lib/orbit-2.0/GNOME_Speech_module.so
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index c5a35c926cf1..f033770987bb 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnopernicus
 PORTVERSION=	1.1.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -14,25 +14,24 @@ COMMENT=	Collection of accessibility apps for GNOME 2
 
 LIB_DEPENDS=	libgnome-mag.so:${PORTSDIR}/accessibility/gnome-mag
 
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
+USE_GNOME=	gnomeprefix intlhack libgnomeui atspi gnomespeech
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	SED="${SED}"
+INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	brlmonitor.schemas gnopernicus.schemas remote.schemas
-SHLIB_VERSION=	2
-PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^F||' \
 		${WRKSRC}/help/braille_monitor/C/brlmonitor-C.omf \
 		${WRKSRC}/help/braille_monitor/es/brlmonitor-es.omf
 	@${CP} ${FILESDIR}/gnopernicus-mag-config ${WRKSRC}/gnopi
+	@${REINPLACE_CMD} -e 's|test$$||' ${WRKSRC}/*/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index 0abc6cf4449c..38c29b64026f 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -22,27 +22,27 @@ include/gnopernicus-1.0/libsrutil/sru-glib.h
 include/gnopernicus-1.0/libsrutil/sru-module.h
 include/gnopernicus-1.0/libsrutil/sru-test.h
 include/gnopernicus-1.0/libsrutil/util.h
-lib/gnopernicus-1.0/libbrl.la
 lib/gnopernicus-1.0/libbrl.so
-lib/gnopernicus-1.0/libbrl.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libke.la
+lib/gnopernicus-1.0/libbrl.so.2
+lib/gnopernicus-1.0/libbrl.so.2.0.0
 lib/gnopernicus-1.0/libke.so
-lib/gnopernicus-1.0/libke.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libmag.la
+lib/gnopernicus-1.0/libke.so.2
+lib/gnopernicus-1.0/libke.so.2.0.0
 lib/gnopernicus-1.0/libmag.so
-lib/gnopernicus-1.0/libmag.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrconf.la
+lib/gnopernicus-1.0/libmag.so.2
+lib/gnopernicus-1.0/libmag.so.2.0.0
 lib/gnopernicus-1.0/libsrconf.so
-lib/gnopernicus-1.0/libsrconf.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrlow.la
+lib/gnopernicus-1.0/libsrconf.so.2
+lib/gnopernicus-1.0/libsrconf.so.2.0.0
 lib/gnopernicus-1.0/libsrlow.so
-lib/gnopernicus-1.0/libsrlow.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrs.la
+lib/gnopernicus-1.0/libsrlow.so.2
+lib/gnopernicus-1.0/libsrlow.so.2.0.0
 lib/gnopernicus-1.0/libsrs.so
-lib/gnopernicus-1.0/libsrs.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrutil.la
+lib/gnopernicus-1.0/libsrs.so.2
+lib/gnopernicus-1.0/libsrs.so.2.0.0
 lib/gnopernicus-1.0/libsrutil.so
-lib/gnopernicus-1.0/libsrutil.so.%%SHLIB_VERSION%%
+lib/gnopernicus-1.0/libsrutil.so.2
+lib/gnopernicus-1.0/libsrutil.so.2.0.0
 libdata/pkgconfig/gnopernicus-1.0.pc
 libexec/brlmonitor
 share/applications/gnopernicus.desktop
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 6f659aaa297e..afa1d4173296 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gok
 PORTVERSION=	2.30.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	GNOME
@@ -16,10 +16,9 @@ COMMENT=	GNOME On-Screen Keyboard (GOK)
 LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
     		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USE_BZIP2=	yes
-USES=		gmake gettext pkgconfig
+USES=		gmake gettext libtool pathfix pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
+USE_GNOME=	gnomeprefix intlhack libgnomeui atspi libwnck \
 		gnomespeech libxml2
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index 2e9ab979d4c3..a07d1cc52e1c 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -15,10 +15,9 @@ COMMENT=	Gnome Java Accessibility Bridge
 BUILD_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 RUN_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		gmake pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-USE_GNOME=	atspi gnomehack
+USE_GNOME=	atspi
 USE_JAVA=	yes
 JAVA_OS=	native
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 58b5298e433e..ab84dd64a9e2 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	mousetweaks
 PORTVERSION=	2.32.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -13,9 +13,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mouse accessibility enhancements for the GNOME desktop
 
 USE_XORG=	x11 xfixes xcursor xtst
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
-USES=		gmake gettext pkgconfig
+USE_GNOME=	gnomeprefix gnomepanel intlhack
+USES=		gmake gettext pathfix pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 576b926fd14f..4c4882768aec 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -20,10 +20,9 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
-USE_BZIP2=	yes
-USES=		gmake gettext pkgconfig
+USES=		gmake gettext pkgconfig tar:bzip2
 USE_PYTHON=	2
-USE_GNOME=	gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
+USE_GNOME=	gnomeprefix libgnomeui gnomespeech pygnome2 \
 		pygnomedesktop
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes