ports/133998: [patch] x11-drivers/xf86-input-synaptics: upgrade to 1.1.0

[Eygene Ryabinkin]

>Number:         133998
>Category:       ports
>Synopsis:       [patch] x11-drivers/xf86-input-synaptics: upgrade to 1.1.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 25 12:40:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Eygene Ryabinkin
>Release:        FreeBSD 7.2-PRERELEASE amd64
>Organization:
Code Labs
>Environment:

System: FreeBSD 7.2-PRERELEASE amd64

>Description:

Synaptics touchpad driver version 1.1.0 for Xorg is out: [1].
FreeBSD port is still at 0.99.3.

>How-To-Repeat:

[1] http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/tag/?id=xf86-input-synaptics-1.1.0

>Fix:

The following patch upgrades the port, adds some new @dirrmtry
directives, creates directory for HAL policy and patches configure to
install header files to the place specified by the port, not by
pkg-config.

It works for my laptop without problems for around a week.

--- port-upgrade-to-1.1.0.diff begins here ---
>From 38b9e6aa03c734daaebd27e87c5deef304f7b1bd Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
Date: Sat, 25 Apr 2009 00:25:16 +0400

Upstream package was recently updated to 1.1.0, so we should catch
these changes.

Signed-off-by: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
---
 x11-drivers/xf86-input-synaptics/Makefile          |    4 ++--
 x11-drivers/xf86-input-synaptics/distinfo          |    6 +++---
 .../xf86-input-synaptics/files/patch-configure     |   15 +++++++++++++++
 x11-drivers/xf86-input-synaptics/pkg-plist         |    4 ++++
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 x11-drivers/xf86-input-synaptics/files/patch-configure

diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 4c691d7..e94ccd5 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	0.99.3
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -24,6 +23,7 @@ MAN1=		syndaemon.1 \
 MAN4=		synaptics.4x
 
 post-install:
+	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 	${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
 		${PREFIX}/share/hal/fdi/policy/10osvendor/
 
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index b7ce9b8..6df7613 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 735a798e0f68c65d98e3d6b092b56d29
-SHA256 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 1a31962e05ff8480e1d97e0cd33b071fdc9a128cf71c5ad05428e5761be4f4b2
-SIZE (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 284946
+MD5 (xorg/driver/xf86-input-synaptics-1.1.0.tar.bz2) = d9a05d53c728400e00e6bc146758c6e5
+SHA256 (xorg/driver/xf86-input-synaptics-1.1.0.tar.bz2) = a72288348d27dd1d075aacb7286aac4e2182f518c069b177e72f3179de56bfc4
+SIZE (xorg/driver/xf86-input-synaptics-1.1.0.tar.bz2) = 294645
diff --git a/x11-drivers/xf86-input-synaptics/files/patch-configure b/x11-drivers/xf86-input-synaptics/files/patch-configure
new file mode 100644
index 0000000..89d24af
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/patch-configure
@@ -0,0 +1,15 @@
+sdkdir hunk: we want the port to install header files to the
+location specified during the port build and not to the location
+specified by Xorg's pkg-config file.
+
+--- configure.orig	2009-04-25 15:11:21.000000000 +0400
++++ configure	2009-04-25 15:14:27.000000000 +0400
+@@ -21128,7 +21128,7 @@
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++sdkdir="${prefix}/include/xorg"
+ 
+ 
+ CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index b270639..7fa2267 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -10,3 +10,7 @@ share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
 @dirrmtry include/xorg
+ at dirrmtry share/hal/fdi/policy/10osvendor
+ at dirrmtry share/hal/fdi/policy
+ at dirrmtry share/hal/fdi
+ at dirrmtry share/hal
-- 
1.6.2.4
--- port-upgrade-to-1.1.0.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: