4 files changed, 27 insertions, 19 deletions

diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index f7ca366d8ae5..76cd38e67c5a 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -1,26 +1,24 @@
-# created by: Norikatsu Shigemura <nork@FreeBSD.org>
+# Created by: Norikatsu Shigemura <nork@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gsynaptics
-PORTVERSION=	0.9.9
-PORTREVISION=	14
+PORTVERSION=	0.9.16
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	gsynaptics/21527
+MASTER_SITES=	SFJP/${PORTNAME}/38463
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME Synaptics Touchpad setting tool
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LICENSE=	GPLv2
 
-USE_GNOME=	lthack intlhack intltool gtk20 libgnome libglade2 libgnomeui
+RUN_DEPENDS=	xf86-input-synaptics>0:${PORTSDIR}/x11-drivers/xf86-input-synaptics
+
+USE_GNOME=	gconf2 gnomehack libglade2 gnomedocutils
+USE_GETTEXT=	yes
 USE_PKGCONFIG=	build
-USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-
-RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/xf86-input-synaptics
+MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gsynaptics/distinfo b/x11/gsynaptics/distinfo
index e749cd099528..cf2c5a54b172 100644
--- a/x11/gsynaptics/distinfo
+++ b/x11/gsynaptics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gsynaptics-0.9.9.tar.gz) = 46c7009c2b8f61e6453a448037180fab8863f19f6bcd91218d455908f33b1ded
-SIZE (gsynaptics-0.9.9.tar.gz) = 387003
+SHA256 (gsynaptics-0.9.16.tar.gz) = 1afcc57ff6f74d7255f9af1e65a0fddaf0315ab61a00271b7acb04d7fd10476c
+SIZE (gsynaptics-0.9.16.tar.gz) = 357950
diff --git a/x11/gsynaptics/pkg-message b/x11/gsynaptics/pkg-message
index c96ace91b71a..619d2f546ccd 100644
--- a/x11/gsynaptics/pkg-message
+++ b/x11/gsynaptics/pkg-message
@@ -2,11 +2,11 @@
 
 			* SETUP NOTE * SETUP NOTE *
 
-o Enable "SHMConfig on" in /etc/xorg.conf (or /etc/XF86Config)
+o Enable "SHMConfig on" in /etc/X11/xorg.conf
   This tools can be used only if "SHMConfig" "on" in the section
-  of synaptics driver in /etc/xorg.conf or /etc/XF86Config.
+  of synaptics driver in /etc/X11/xorg.conf.
 
-/etc/xorg.conf (/etc/XF86Config) ------------------
+/etc/X11/xorg.conf --------------------------------
 	:
 Section "InputDevice"
 	Driver		"synaptics"
@@ -15,7 +15,7 @@ Section "InputDevice"
 		:
 EndSection
 	:
-/etc/xorg.conf (/etc/XF86Config) ------------------
+/etc/X11/xorg.conf --------------------------------
 
 o To use your setting value at each time of starting of Xserver,
   you have to run gsynaptics-init at starting time of Xserver.
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 65810d0a7be5..6042d508ab74 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -2,12 +2,22 @@ bin/gsynaptics
 bin/gsynaptics-init
 share/applications/gsynaptics.desktop
 share/gnome/autostart/gsynaptics-init.desktop
-share/gsynaptics/gsynaptics.glade
+share/gnome/help/gsynaptics/C/gsynaptics.xml
+share/gnome/help/gsynaptics/C/legal.xml
+%%DATADIR%%/gsynaptics.glade
+share/locale/ar/LC_MESSAGES/gsynaptics.mo
+share/locale/el/LC_MESSAGES/gsynaptics.mo
 share/locale/es/LC_MESSAGES/gsynaptics.mo
 share/locale/fr/LC_MESSAGES/gsynaptics.mo
+share/locale/hu/LC_MESSAGES/gsynaptics.mo
 share/locale/ja/LC_MESSAGES/gsynaptics.mo
+share/locale/nb/LC_MESSAGES/gsynaptics.mo
+share/locale/pl/LC_MESSAGES/gsynaptics.mo
+share/locale/ru/LC_MESSAGES/gsynaptics.mo
 share/locale/zh_CN/LC_MESSAGES/gsynaptics.mo
 share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
 share/pixmaps/touchpad.png
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/gsynaptics/C
+@dirrm share/gnome/help/gsynaptics
 @dirrmtry share/applications
-@dirrm share/gsynaptics