aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2008-06-18 14:03:48 +0000
committerFlorent Thoumie <flz@FreeBSD.org>2008-06-18 14:03:48 +0000
commitf34ee8f90af0868603db02378e4b0edb91ce355a (patch)
tree10492731845767f7a1dd5632cccaca5c2d95ce1d /x11-drivers
parentc3a8fc33703fee02a84d2fb8ceb0a6cb36807329 (diff)
downloadports-f34ee8f90af0868603db02378e4b0edb91ce355a.tar.gz
ports-f34ee8f90af0868603db02378e4b0edb91ce355a.zip
- Fix x11-drivers/synaptics after latest xorg-server update.
- Clean up a bit while I'm here (use hardcoded xorg-server version). Reported by: droso
Notes
Notes: svn path=/head/; revision=215074
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/synaptics/Makefile8
-rw-r--r--x11-drivers/synaptics/distinfo6
-rw-r--r--x11-drivers/synaptics/pkg-plist9
3 files changed, 9 insertions, 14 deletions
diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile
index 907c4e8c6215..a7c3ee4e49c4 100644
--- a/x11-drivers/synaptics/Makefile
+++ b/x11-drivers/synaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= synaptics
PORTVERSION= 0.14.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -23,14 +23,10 @@ USE_GMAKE= yes
.include <bsd.port.pre.mk>
-X11VERSION!= ${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \
- -VPORTVERSION
-
MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
http://xorg.freedesktop.org/releases/individual/xserver/:x11
DIST_SUBDIR= xorg/xserver
-X_DISTFILES= xorg-server-${X11VERSION}.tar.bz2
-PLIST_SUB+= XORG="" XFREE86="@comment "
+X_DISTFILES= xorg-server-1.4.2.tar.bz2
EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4
post-patch:
diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo
index ef38106a3c7a..1712be2a2998 100644
--- a/x11-drivers/synaptics/distinfo
+++ b/x11-drivers/synaptics/distinfo
@@ -1,6 +1,6 @@
MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833
-MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
-SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b
+SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
+SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638
diff --git a/x11-drivers/synaptics/pkg-plist b/x11-drivers/synaptics/pkg-plist
index 46e202c29d17..342a06bea1e8 100644
--- a/x11-drivers/synaptics/pkg-plist
+++ b/x11-drivers/synaptics/pkg-plist
@@ -1,7 +1,6 @@
bin/synclient
@comment bin/syndaemon
-%%XORG%%lib/xorg/modules/input/synaptics_drv.so
-%%XORG%%@dirrmtry lib/xorg/modules/input
-%%XORG%%@dirrmtry lib/xorg/modules
-%%XORG%%@dirrmtry lib/xorg
-%%XFREE86%%lib/modules/input/synaptics_drv.o
+lib/xorg/modules/input/synaptics_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg