aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-input-synaptics
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
commit47be7a61c97731aa5fe34c56767ad5e10bb5c5d2 (patch)
tree2df88f8b6e2af92b78ac24eb382268b7c290efab /x11-drivers/xf86-input-synaptics
parent7b9110d87c22c27df1baa93f8cb4cf30e205efc7 (diff)
downloadports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.tar.gz
ports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.zip
Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG= to /etc/make.conf to get the old version. Update several xorg related ports, including: x11/libxcb 1.9.1 -> 1.9.3 graphics/libdrm 2.4.46 -> 2.4.50 x11/pixman 0.30.2 -> 0.32.4 x11/xkeyboard-config 2.9 -> 2.10.1 x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0 Fix dissapearing cursor in xf86-video-vmware [2] Stagify all x11@-owned ports Bump portrevisions for xf86-* ports due to xserver version change. Fix fallout from updates where needed. Thanks to: all testersi, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/184684 [1], ports/181385 [2] Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2] Approved by: portmgr (bdrewery), core (jhb) [0]
Notes
Notes: svn path=/head/; revision=336621
Diffstat (limited to 'x11-drivers/xf86-input-synaptics')
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile31
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo4
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist10
3 files changed, 7 insertions, 38 deletions
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 9434c1eee5e2..d0e1183787ea 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -10,29 +10,12 @@ COMMENT= X.Org synaptics input driver
CONFLICTS= synaptics-[0-9]*
-OPTIONS_DEFINE= HAL
-OPTIONS_DEFAULT=HAL
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
USES= pathfix
USE_XORG= x11 xtst
XORG_CAT= driver
-.if ${PORT_OPTIONS:MHAL}
-PLIST_SUB+= HAL=""
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-.else
-PLIST_SUB+= HAL="@comment "
-.endif
-
-MAN1= syndaemon.1 \
- synclient.1
-MAN4= synaptics.4x
-
.if defined(WITH_NEW_XORG)
-SYNAPTICS_VERSION= 1.7.1
+SYNAPTICS_VERSION= 1.7.2
SYNAPTICS_REVISION= 0
PLIST_SUB+= NEW="" OLD="@comment "
.else
@@ -42,16 +25,4 @@ PLIST_SUB+= NEW="@comment " OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
.endif
-post-install:
-.if ${PORT_OPTIONS:MHAL}
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
- ${PREFIX}/share/hal/fdi/policy/10osvendor/
-.if !defined(WITH_NEW_XORG)
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
- ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
- ${PREFIX}/share/hal/fdi/policy/20thirdparty/
-.endif
-.endif
-
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index bad1c22f40ed..a82a418573c0 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,4 +1,4 @@
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.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
-SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
+SHA256 (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
+SIZE (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 448170
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index 3f9ad117dbf2..d29caf256087 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -5,14 +5,12 @@ include/xorg/synaptics-properties.h
lib/xorg/modules/input/synaptics_drv.la
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
-%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
@dirrmtry include/xorg
-%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
-%%HAL%%@dirrmtry share/hal/fdi/policy
-%%HAL%%@dirrmtry share/hal/fdi
-%%HAL%%@dirrmtry share/hal