4 files changed, 3 insertions, 35 deletions
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index cd070ccbee43..064b462ba894 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	${SYNAPTICS_VERSION}
-PORTREVISION=	${SYNAPTICS_REVISION}
+PORTVERSION=	1.7.4
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,17 +14,4 @@ USES=		pathfix
 USE_XORG=	x11 xtst
 XORG_CAT=	driver
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-SYNAPTICS_VERSION=	1.7.4
-SYNAPTICS_REVISION=	2
-PLIST_SUB+=	NEW="" OLD="@comment "
-.else
-SYNAPTICS_VERSION=	1.6.4
-SYNAPTICS_REVISION=	2
-PLIST_SUB+=	NEW="@comment " OLD=""
-EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index a7440fb036c0..47b09f20ac7f 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
-SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
 SHA256 (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 56a2d2df7bd39e29f56102c62f153e023f3e9b2f5e255309d33fab8e81945af7
 SIZE (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 451614
diff --git a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
deleted file mode 100644
index 957f9fcdbc51..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-04-04 14:47:16.881259598 +0200
-+++ Makefile.in	2013-04-04 14:47:20.568244417 +0200
-@@ -321,7 +321,7 @@
- 	--with-sdkdir='$${includedir}/xorg' \
- 	--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
- 
--SUBDIRS = include src man tools conf test
-+SUBDIRS = include src man tools test
- MAINTAINERCLEANFILES = ChangeLog INSTALL
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = xorg-synaptics.pc
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index 10ce5a3a27a0..bcb4e1ca5a39 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -1,15 +1,9 @@
 bin/synclient
 bin/syndaemon
 include/xorg/synaptics-properties.h
-%%OLD%%include/xorg/synaptics.h
 lib/xorg/modules/input/synaptics_drv.so
 libdata/pkgconfig/xorg-synaptics.pc
 man/man1/synclient.1.gz
 man/man1/syndaemon.1.gz
 man/man4/synaptics.4x.gz
-%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-%%NEW%%@dirrmtry share/X11/xorg.conf.d
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
-@dirrmtry include/xorg
+share/X11/xorg.conf.d/50-synaptics.conf