Add CONFLICTS with the each others.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15835 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 375 insertions, 3 deletions

diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
new file mode 100644
index 000000000..3a22cb841
--- /dev/null
+++ b/accessibility/mousetweaks/Makefile
@@ -0,0 +1,33 @@
+# Ports collection makefile for:	mousetweaks
+# Date created:			2008 01 10
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD: ports/accessibility/mousetweaks/Makefile,v 1.19 2010/11/20 15:36:24 kwm Exp $
+#   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.53 2010/11/15 21:25:36 kwm Exp $
+#
+
+PORTNAME=	mousetweaks
+PORTVERSION=	2.32.1
+CATEGORIES=	accessibility
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Mouse accessibility enhancements for the GNOME desktop
+
+CONFLICTS=	mousetweaks-3.[0-9]*
+
+USE_XORG=	x11 xfixes xcursor xtst
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	mousetweaks.schemas pointer-capture-applet.schemas
+MAN1=		dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
+
+.include <bsd.port.mk>
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
new file mode 100644
index 000000000..d70b80607
--- /dev/null
+++ b/accessibility/mousetweaks/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/mousetweaks-2.32.1.tar.bz2) = 70d2e8ba0f5021a9e70fecab2ea5cb5f2c03941e676607bec37f2304d9b86d08
+SIZE (gnome2/mousetweaks-2.32.1.tar.bz2) = 2195347
diff --git a/accessibility/mousetweaks/pkg-descr b/accessibility/mousetweaks/pkg-descr
new file mode 100644
index 000000000..9290a7414
--- /dev/null
+++ b/accessibility/mousetweaks/pkg-descr
@@ -0,0 +1,17 @@
+The Mousetweaks package provides mouse accessibility enhancements for the 
+GNOME desktop. 
+
+These enhancements are:
+	
+1. It offers a way to perform the various clicks without using any 
+hardware button.
+
+2. It allows users to perform a right click by doing a click&hold of the 
+left mouse button. (For a left-handed mouse user, the terms left and right 
+have to be inverted.) 
+
+3. It provides an applet that the user can install on a panel. This applet 
+creates an area on the panel into which the pointer can be captured until 
+the user releases it with a predefined button and modifier combination.
+
+WWW: https://launchpad.net/mousetweaks/
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
new file mode 100644
index 000000000..bbb40e78f
--- /dev/null
+++ b/accessibility/mousetweaks/pkg-plist
@@ -0,0 +1,314 @@
+bin/dwell-click-applet
+bin/mousetweaks
+bin/pointer-capture-applet
+libdata/bonobo/servers/DwellClick_Factory.server
+libdata/bonobo/servers/PointerCapture_Factory.server
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/C/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/C/legal.xml
+share/gnome/help/mousetweaks/C/mousetweaks.xml
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/ca/mousetweaks.xml
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/cs/mousetweaks.xml
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/de/mousetweaks.xml
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/el/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/el/mousetweaks.xml
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/en_GB/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/en_GB/mousetweaks.xml
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/es/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/es/mousetweaks.xml
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/fr/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/fr/mousetweaks.xml
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/it/mousetweaks.xml
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/oc/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/oc/mousetweaks.xml
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/sv/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/sv/mousetweaks.xml
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/zh_CN/mousetweaks.xml
+share/locale/ar/LC_MESSAGES/mousetweaks.mo
+share/locale/as/LC_MESSAGES/mousetweaks.mo
+share/locale/ast/LC_MESSAGES/mousetweaks.mo
+share/locale/bg/LC_MESSAGES/mousetweaks.mo
+share/locale/bn/LC_MESSAGES/mousetweaks.mo
+share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
+share/locale/ca/LC_MESSAGES/mousetweaks.mo
+share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
+share/locale/cs/LC_MESSAGES/mousetweaks.mo
+share/locale/da/LC_MESSAGES/mousetweaks.mo
+share/locale/de/LC_MESSAGES/mousetweaks.mo
+share/locale/el/LC_MESSAGES/mousetweaks.mo
+share/locale/en_GB/LC_MESSAGES/mousetweaks.mo
+share/locale/en@shaw/LC_MESSAGES/mousetweaks.mo
+share/locale/es/LC_MESSAGES/mousetweaks.mo
+share/locale/et/LC_MESSAGES/mousetweaks.mo
+share/locale/eu/LC_MESSAGES/mousetweaks.mo
+share/locale/fi/LC_MESSAGES/mousetweaks.mo
+share/locale/fr/LC_MESSAGES/mousetweaks.mo
+share/locale/gl/LC_MESSAGES/mousetweaks.mo
+share/locale/gu/LC_MESSAGES/mousetweaks.mo
+share/locale/he/LC_MESSAGES/mousetweaks.mo
+share/locale/hi/LC_MESSAGES/mousetweaks.mo
+share/locale/hu/LC_MESSAGES/mousetweaks.mo
+share/locale/id/LC_MESSAGES/mousetweaks.mo
+share/locale/it/LC_MESSAGES/mousetweaks.mo
+share/locale/ja/LC_MESSAGES/mousetweaks.mo
+share/locale/kn/LC_MESSAGES/mousetweaks.mo
+share/locale/ko/LC_MESSAGES/mousetweaks.mo
+share/locale/lt/LC_MESSAGES/mousetweaks.mo
+share/locale/mai/LC_MESSAGES/mousetweaks.mo
+share/locale/mk/LC_MESSAGES/mousetweaks.mo
+share/locale/ml/LC_MESSAGES/mousetweaks.mo
+share/locale/mr/LC_MESSAGES/mousetweaks.mo
+share/locale/nb/LC_MESSAGES/mousetweaks.mo
+share/locale/nl/LC_MESSAGES/mousetweaks.mo
+share/locale/nn/LC_MESSAGES/mousetweaks.mo
+share/locale/oc/LC_MESSAGES/mousetweaks.mo
+share/locale/or/LC_MESSAGES/mousetweaks.mo
+share/locale/pa/LC_MESSAGES/mousetweaks.mo
+share/locale/pl/LC_MESSAGES/mousetweaks.mo
+share/locale/pt/LC_MESSAGES/mousetweaks.mo
+share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
+share/locale/ro/LC_MESSAGES/mousetweaks.mo
+share/locale/ru/LC_MESSAGES/mousetweaks.mo
+share/locale/sk/LC_MESSAGES/mousetweaks.mo
+share/locale/sl/LC_MESSAGES/mousetweaks.mo
+share/locale/sq/LC_MESSAGES/mousetweaks.mo
+share/locale/sr/LC_MESSAGES/mousetweaks.mo
+share/locale/sr@latin/LC_MESSAGES/mousetweaks.mo
+share/locale/sv/LC_MESSAGES/mousetweaks.mo
+share/locale/ta/LC_MESSAGES/mousetweaks.mo
+share/locale/te/LC_MESSAGES/mousetweaks.mo
+share/locale/th/LC_MESSAGES/mousetweaks.mo
+share/locale/tr/LC_MESSAGES/mousetweaks.mo
+share/locale/uk/LC_MESSAGES/mousetweaks.mo
+share/locale/vi/LC_MESSAGES/mousetweaks.mo
+share/locale/zh_CN/LC_MESSAGES/mousetweaks.mo
+share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo
+share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
+%%DATADIR%%/DwellClick.xml
+%%DATADIR%%/PointerCapture.xml
+%%DATADIR%%/double-click.png
+%%DATADIR%%/drag-click.png
+%%DATADIR%%/dwell-click-applet.ui
+%%DATADIR%%/mousetweaks.ui
+%%DATADIR%%/pointer-capture-applet.ui
+%%DATADIR%%/right-click.png
+%%DATADIR%%/single-click.png
+share/omf/mousetweaks/mousetweaks-C.omf
+share/omf/mousetweaks/mousetweaks-ca.omf
+share/omf/mousetweaks/mousetweaks-cs.omf
+share/omf/mousetweaks/mousetweaks-de.omf
+share/omf/mousetweaks/mousetweaks-el.omf
+share/omf/mousetweaks/mousetweaks-en_GB.omf
+share/omf/mousetweaks/mousetweaks-es.omf
+share/omf/mousetweaks/mousetweaks-fr.omf
+share/omf/mousetweaks/mousetweaks-it.omf
+share/omf/mousetweaks/mousetweaks-oc.omf
+share/omf/mousetweaks/mousetweaks-sv.omf
+share/omf/mousetweaks/mousetweaks-zh_CN.omf
+@dirrm share/omf/mousetweaks
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/mousetweaks/zh_CN/figures
+@dirrm share/gnome/help/mousetweaks/zh_CN
+@dirrm share/gnome/help/mousetweaks/sv/figures
+@dirrm share/gnome/help/mousetweaks/sv
+@dirrm share/gnome/help/mousetweaks/oc/figures
+@dirrm share/gnome/help/mousetweaks/oc
+@dirrm share/gnome/help/mousetweaks/it/figures
+@dirrm share/gnome/help/mousetweaks/it
+@dirrm share/gnome/help/mousetweaks/fr/figures
+@dirrm share/gnome/help/mousetweaks/fr
+@dirrm share/gnome/help/mousetweaks/es/figures
+@dirrm share/gnome/help/mousetweaks/es
+@dirrm share/gnome/help/mousetweaks/en_GB/figures
+@dirrm share/gnome/help/mousetweaks/en_GB
+@dirrm share/gnome/help/mousetweaks/el/figures
+@dirrm share/gnome/help/mousetweaks/el
+@dirrm share/gnome/help/mousetweaks/cs/figures
+@dirrm share/gnome/help/mousetweaks/cs
+@dirrm share/gnome/help/mousetweaks/ca/figures
+@dirrm share/gnome/help/mousetweaks/ca
+@dirrm share/gnome/help/mousetweaks/de/figures
+@dirrm share/gnome/help/mousetweaks/de
+@dirrm share/gnome/help/mousetweaks/C/figures
+@dirrm share/gnome/help/mousetweaks/C
+@dirrm share/gnome/help/mousetweaks
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/accessibility/mousetweaks3/Makefile b/accessibility/mousetweaks3/Makefile
index 806ab3fb0..4c83e4568 100644
--- a/accessibility/mousetweaks3/Makefile
+++ b/accessibility/mousetweaks3/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/mousetweaks3/Makefile,v 1.6 2011/03/22 10:21:56 kwm Exp $
+#   $MCom: ports/accessibility/mousetweaks3/Makefile,v 1.7 2011/04/05 13:32:52 kwm Exp $
 #
 
 PORTNAME=	mousetweaks
@@ -18,6 +18,8 @@ COMMENT=	Mouse accessibility enhancements for the GNOME desktop
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0.1.0:${PORTSDIR}/devel/gsettings-desktop-schemas
 RUN_DEPENDS=	gsettings-desktop-schemas>=0.1.0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
+CONFLICTS=	mousetweaks-2.[0-9]*
+
 USE_XORG=	x11 xfixes xcursor xtst
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack gnomedocutils gtk30
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index cf88d9e4a..7f3ef76cf 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.152 2011/03/07 09:13:18 kwm Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.153 2011/04/10 19:41:35 mezz Exp $
 #
 
 PORTNAME=	gnome-utils
@@ -19,6 +19,8 @@ COMMENT=	GNOME 2 support utilities
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 
+CONFLICTS=	gnome-utils-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
diff --git a/deskutils/gnome-utils3/Makefile b/deskutils/gnome-utils3/Makefile
index e700576e0..fa9cdb079 100644
--- a/deskutils/gnome-utils3/Makefile
+++ b/deskutils/gnome-utils3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils3/Makefile,v 1.6 2011/04/05 13:40:20 kwm Exp $
+#   $MCom: ports/deskutils/gnome-utils3/Makefile,v 1.7 2011/04/10 19:41:35 mezz Exp $
 #
 
 PORTNAME=	gnome-utils
@@ -20,6 +20,8 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
+CONFLICTS=	gnome-utils-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes