diff options
author | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-03-18 16:48:14 +0000 |
---|---|---|
committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-03-18 16:48:14 +0000 |
commit | 5cff2d259947d77ae225d01297f5f4738c460a40 (patch) | |
tree | c6fcf4f4a9a4191280c34fe01d2389a91d6ccf31 /x11-drivers/synaptics | |
parent | Fix MASTERSITES. (diff) |
Add synaptics-0.14.4, is a driver for the Synaptics TouchPad
for XOrg/XFree86 4.x.
WWW: http://web.telia.com/~u89404340/touchpad/
Notes
Notes:
svn path=/head/; revision=157567
Diffstat (limited to 'x11-drivers/synaptics')
-rw-r--r-- | x11-drivers/synaptics/Makefile | 73 | ||||
-rw-r--r-- | x11-drivers/synaptics/distinfo | 12 | ||||
-rw-r--r-- | x11-drivers/synaptics/files/patch-Makefile | 90 | ||||
-rw-r--r-- | x11-drivers/synaptics/files/patch-eventcomm.c | 20 | ||||
-rw-r--r-- | x11-drivers/synaptics/pkg-descr | 6 | ||||
-rw-r--r-- | x11-drivers/synaptics/pkg-message | 59 | ||||
-rw-r--r-- | x11-drivers/synaptics/pkg-plist | 3 |
7 files changed, 263 insertions, 0 deletions
diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile new file mode 100644 index 000000000000..230be746bd2a --- /dev/null +++ b/x11-drivers/synaptics/Makefile @@ -0,0 +1,73 @@ +# New ports collection makefile for: synaptics +# Date created: 2004-01-02 +# Whom: nork@FreeBSD.org +# +# $FreeBSD$ +# + +PORTNAME= synaptics +PORTVERSION= 0.14.4 +CATEGORIES= x11-servers +MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ + ${X_DISTFILES:C/$/:x11/} +EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} + +MAINTAINER= nork@FreeBSD.org +COMMENT= The Synaptics touchpad X driver + +BUILD_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT} +RUN_DEPENDS= ${BUILD_DEPENDS} + +USE_BZIP2= yes +USE_GMAKE= yes +USE_X_PREFIX= yes + +.include <bsd.port.pre.mk> + +X11VERSION!= ${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \ + -VPORTVERSION + +.if ${X_WINDOW_SYSTEM:L} == xorg + +MASTER_SITES+= ${MASTER_SITE_XORG:C/$/:x11/} +MASTER_SITE_SUBDIR= X11R${X11VERSION}/src/:x11 +DIST_SUBDIR= xorg +X_DISTFILES= X11R${X11VERSION}-src3.tar.gz + +.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 + +MASTER_SITES+= ${MASTER_SITE_XFREE:C/$/:x11/} +MASTER_SITE_SUBDIR= ${X11VERSION}/:x11 +DIST_SUBDIR= xc +X_DISTFILES= XFree86-${X11VERSION}-src-3.tgz + +.else + +BROKEN= no support yet + +.endif + +MAKE_ENV= TOP=${WRKDIR}/xc CFLAGSCLIENT="${CFLAGS}" + +MAN1= synclient.1 # syndaemon.1 +MAN5= synaptics.5 +PORTDOCS= COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR \ + README README.alps TODO + +post-extract: +.for FILE in ${X_DISTFILES} + @cd ${WRKDIR} && \ + ${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf - +.endfor + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for FILE in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} +.endfor +.endif + @${CAT} ${PKGMESSAGE} + +.include <bsd.port.post.mk> diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo new file mode 100644 index 000000000000..cc18b3e33401 --- /dev/null +++ b/x11-drivers/synaptics/distinfo @@ -0,0 +1,12 @@ +MD5 (xorg/synaptics-0.14.4.tar.bz2) = ae9aef7a146346fbfc7edfdd63cdd273 +SHA256 (xorg/synaptics-0.14.4.tar.bz2) = 20cdf5884082a4072f45a7f049dfc2b0b8ad9cf24706d741def7f2a09467d43b +SIZE (xorg/synaptics-0.14.4.tar.bz2) = 125524 +MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 +SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 +SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +MD5 (xc/synaptics-0.14.4.tar.bz2) = ae9aef7a146346fbfc7edfdd63cdd273 +SHA256 (xc/synaptics-0.14.4.tar.bz2) = 20cdf5884082a4072f45a7f049dfc2b0b8ad9cf24706d741def7f2a09467d43b +SIZE (xc/synaptics-0.14.4.tar.bz2) = 125524 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-drivers/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile new file mode 100644 index 000000000000..f93650e377e1 --- /dev/null +++ b/x11-drivers/synaptics/files/patch-Makefile @@ -0,0 +1,90 @@ +--- Makefile.orig Mon Nov 7 00:29:18 2005 ++++ Makefile Sun Mar 19 01:11:07 2006 +@@ -9,11 +9,11 @@ + + INSTALLED_X = $(DESTDIR)/usr/X11R6 + LOCAL_X = Xincludes/usr/X11R6 +-BINDIR = $(DESTDIR)/usr/local/bin +-MANDIR = $(DESTDIR)/usr/local/man ++BINDIR = $(DESTDIR)${PREFIX}/bin ++MANDIR = $(DESTDIR)${PREFIX}/man + + ifeq ($(ARCH),) +- ARCH = $(shell /bin/arch) ++ ARCH = $(shell uname -m) + endif + ifeq ($(ARCH),amd64) + ARCH = x86_64 +@@ -44,12 +44,16 @@ + else + SERVERSRC = $(TOP)/programs/Xserver + ALLINCLUDES = -I. \ ++ -I${X11BASE}/include \ ++ -I${X11BASE}/include/X11 \ ++ -I$(SERVERSRC)/hw/xfree86 \ + -I$(SERVERSRC)/hw/xfree86/common \ + -I$(SERVERSRC)/hw/xfree86/os-support \ ++ -I$(SERVERSRC)/hw/xfree86/os-support/bus \ + -I$(SERVERSRC)/mi \ + -I$(SERVERSRC)/include \ + -I$(TOP)/include +- X_INCLUDES_ROOT = $(TOP) ++ X_INCLUDES_ROOT = $(X11BASE) + endif + + MODULE_DEFINES = -DIN_MODULE -DXFree86Module +@@ -63,11 +67,11 @@ + CCOPTIONS := -pedantic -Wall -Wpointer-arith + CCOPTIONS += $(call check_gcc,-fno-merge-constants,) + CCOPTIONS += $(call check_gcc,-fno-pic,) +-CDEBUGFLAGS = -O2 +-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" +-CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include ++#CDEBUGFLAGS = -O2 ++CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" ++CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include + +-CC = gcc ++#CC = gcc + + LDCOMBINEFLAGS = -r + +@@ -78,29 +82,29 @@ + $(RM) $@ + $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + +-all:: synaptics_drv.o synclient syndaemon ++all:: synaptics_drv.o synclient + +-install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man ++install: $(BINDIR)/synclient $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man + +-install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5 ++install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man5/synaptics.5 + + $(MANDIR)/man1/synclient.1: manpages/synclient.1 +- install --mode=0644 -D $< $@ ++ ${BSD_INSTALL_MAN} $< $@ + + $(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1 +- install --mode=0644 -D $< $@ ++ ${BSD_INSTALL_MAN} $< $@ + + $(MANDIR)/man5/synaptics.5: manpages/synaptics.5 +- install --mode=0644 -D $< $@ ++ ${BSD_INSTALL_MAN} $< $@ + + $(BINDIR)/synclient : synclient +- install -D $< $@ ++ ${BSD_INSTALL_PROGRAM} $< $@ + + $(BINDIR)/syndaemon : syndaemon +- install -D $< $@ ++ ${BSD_INSTALL_PROGRAM} $< $@ + + $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o : synaptics_drv.o +- install --mode=0644 -D $< $@ ++ ${BSD_INSTALL_DATA} $< $@ + + synaptics_drv.o: $(OBJS) + $(RM) $@ diff --git a/x11-drivers/synaptics/files/patch-eventcomm.c b/x11-drivers/synaptics/files/patch-eventcomm.c new file mode 100644 index 000000000000..0fbcfefe6d27 --- /dev/null +++ b/x11-drivers/synaptics/files/patch-eventcomm.c @@ -0,0 +1,20 @@ +--- eventcomm.c.orig Mon Aug 8 04:44:04 2005 ++++ eventcomm.c Sat Mar 18 18:54:22 2006 +@@ -55,6 +55,7 @@ + static Bool + event_query_is_touchpad(int fd) + { ++#if 0 + int ret; + unsigned long evbits[NBITS(KEY_MAX)]; + +@@ -83,6 +84,9 @@ + return FALSE; + + return TRUE; ++#else ++ return FALSE; ++#endif + } + + static Bool diff --git a/x11-drivers/synaptics/pkg-descr b/x11-drivers/synaptics/pkg-descr new file mode 100644 index 000000000000..009694de864a --- /dev/null +++ b/x11-drivers/synaptics/pkg-descr @@ -0,0 +1,6 @@ +This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x. +A Synaptics touchpad by default operates in compatibility mode by +emulating a standard mouse. However, by using a dedicated driver, +more advanced features of the touchpad becomes available. + +WWW: http://web.telia.com/~u89404340/touchpad/ diff --git a/x11-drivers/synaptics/pkg-message b/x11-drivers/synaptics/pkg-message new file mode 100644 index 000000000000..9fda7c093e07 --- /dev/null +++ b/x11-drivers/synaptics/pkg-message @@ -0,0 +1,59 @@ +=============================================================================== + + * SETUP NOTE * SETUP NOTE * + +o Don't run moused(8) daemon. + + Do kill moused. + # killall moused + and + Dont' set moused_enable="YES" in /etc/rc.conf. + +/etc/rc.conf -------------------------------------- +moused_enable="NO" +--------------------------------------------------- + +o Set your /etc/xorg.conf (or /etc/XF86Config) + +/etc/xorg.conf (/etc/XF86Config) ------------------ + : +Section "Module" + : + Load "synaptics" +EndSection + +Section "ServerLayout" + : + InputDevice "Synaptics_Touchpad" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Synaptics_Touchpad" + Driver "synaptics" + + Option "Device" "/dev/psm0" + Option "Protocol" "psm" + Option "LeftEdge" "1700" + Option "RightEdge" "5300" + Option "TopEdge" "1700" + Option "BottomEdge" "4200" + Option "FingerLow" "25" + Option "FingerHigh" "30" + Option "MaxTapTime" "180" + Option "MaxTapMove" "220" + Option "VertScrollDelta" "100" + Option "MinSpeed" "0.06" + Option "MaxSpeed" "0.06" + Option "AccelFactor" "0.0010" + + # I didn't test, yet. So I recommended "off". + Option "SHMConfig" "off" + + # If you use circular touchpad, uncomment them. +# Option "CircularScrolling" "on" +# Option "CircularPad" "on" +EndSection + : +/etc/xorg.conf (/etc/XF86Config) ------------------ + +=============================================================================== diff --git a/x11-drivers/synaptics/pkg-plist b/x11-drivers/synaptics/pkg-plist new file mode 100644 index 000000000000..9eb476975db3 --- /dev/null +++ b/x11-drivers/synaptics/pkg-plist @@ -0,0 +1,3 @@ +bin/synclient +@comment bin/syndaemon +lib/modules/input/synaptics_drv.o |