From d11d5d4447b2698a09c02c54fed69ac96ccd0a68 Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Sat, 6 Oct 2007 13:57:12 +0000 Subject: Change to new x11-drivers category. Repo copied by: marcus (portmgr) --- x11-servers/Makefile | 1 - x11-servers/synaptics/Makefile | 86 -------------------- x11-servers/synaptics/distinfo | 12 --- x11-servers/synaptics/files/extra-xorg-server-1.4 | 63 --------------- x11-servers/synaptics/files/patch-Makefile | 99 ----------------------- x11-servers/synaptics/files/patch-eventcomm.c | 20 ----- x11-servers/synaptics/pkg-descr | 6 -- x11-servers/synaptics/pkg-message | 88 -------------------- x11-servers/synaptics/pkg-plist | 7 -- 9 files changed, 382 deletions(-) delete mode 100644 x11-servers/synaptics/Makefile delete mode 100644 x11-servers/synaptics/distinfo delete mode 100644 x11-servers/synaptics/files/extra-xorg-server-1.4 delete mode 100644 x11-servers/synaptics/files/patch-Makefile delete mode 100644 x11-servers/synaptics/files/patch-eventcomm.c delete mode 100644 x11-servers/synaptics/pkg-descr delete mode 100644 x11-servers/synaptics/pkg-message delete mode 100644 x11-servers/synaptics/pkg-plist (limited to 'x11-servers') diff --git a/x11-servers/Makefile b/x11-servers/Makefile index f738afdd03b5..971f630a0a31 100644 --- a/x11-servers/Makefile +++ b/x11-servers/Makefile @@ -11,7 +11,6 @@ SUBDIR += Xfstt SUBDIR += driglide SUBDIR += mga_hal - SUBDIR += synaptics SUBDIR += x2vnc SUBDIR += x2x SUBDIR += xorg-dmx diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile deleted file mode 100644 index 857b3ed766a6..000000000000 --- a/x11-servers/synaptics/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# New ports collection makefile for: synaptics -# Date created: 2004-01-02 -# Whom: nork@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= synaptics -PORTVERSION= 0.14.6 -PORTREVISION= 2 -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 - -X11VERSION!= ${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \ - -VPORTVERSION - -.if ${X_WINDOW_SYSTEM:L} == xorg - -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 " -EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4 - -post-patch: - @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \ - ${WRKSRC}/Makefile - -.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 -PLIST_SUB+= XORG="@comment " XFREE86="" - -.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 - -.if ${X_WINDOW_SYSTEM:L} == xorg -pre-install: - ${MKDIR} ${X11BASE}/lib/xorg/modules/input/ -.endif - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor -.endif - @${CAT} ${PKGMESSAGE} - -.include diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo deleted file mode 100644 index 2028c8c16605..000000000000 --- a/x11-servers/synaptics/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -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 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af -SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 -SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833 -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-servers/synaptics/files/extra-xorg-server-1.4 b/x11-servers/synaptics/files/extra-xorg-server-1.4 deleted file mode 100644 index d6f2ab11f0a7..000000000000 --- a/x11-servers/synaptics/files/extra-xorg-server-1.4 +++ /dev/null @@ -1,63 +0,0 @@ -diff -u Makefile.orig Makefile ---- Makefile.orig 2006-07-15 17:58:26.000000000 +0200 -+++ Makefile 2007-09-07 15:03:17.386179198 +0200 -@@ -34,10 +34,9 @@ - LDCOMBINEFLAGS = -shared -lc - PICFLAG = $(call check_gcc,-fPIC,) - X_INCLUDES_ROOT = $(INSTALLED_X) -- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) - ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ - -I$(INSTALLED_X)/include/X11/extensions \ -- -I$(SDKDIR) -+ `pkg-config xorg-server --cflags` - else - INSTALLED_X = /usr/X11R6 - INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input -diff -u synaptics.c.orig synaptics.c ---- synaptics.c.orig 2006-07-15 17:54:29.000000000 +0200 -+++ synaptics.c 2007-09-07 15:10:24.910542275 +0200 -@@ -321,7 +321,9 @@ - local->private_flags = 0; - local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; - local->conf_idev = dev; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - local->motion_history_proc = xf86GetMotionEvents; -+#endif - local->history_size = 0; - local->always_core_feedback = 0; - -@@ -613,8 +615,17 @@ - - InitPointerDeviceStruct((DevicePtr)dev, map, - SYN_MAX_BUTTONS, -- miPointerGetMotionEvents, SynapticsCtrl, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -+ miPointerGetMotionEvents, -+#else -+ GetMotionHistory, -+#endif -+ SynapticsCtrl, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - miPointerGetMotionBufferSize()); -+#else -+ GetMotionHistorySize(), 2); -+#endif - - /* X valuator */ - xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); -diff -u synaptics.h.orig synaptics.h ---- synaptics.h.orig 2006-07-15 17:54:29.000000000 +0200 -+++ synaptics.h 2007-09-07 15:10:12.409829887 +0200 -@@ -226,5 +226,11 @@ - - #endif /* SYNAPTICS_PRIVATE */ - -+/* Previously found in xf86Xinput.h */ -+#ifdef DBG -+#undef DBG -+#endif -+ -+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} - - #endif /* _SYNAPTICS_H_ */ - diff --git a/x11-servers/synaptics/files/patch-Makefile b/x11-servers/synaptics/files/patch-Makefile deleted file mode 100644 index 1ae3cbea89ad..000000000000 --- a/x11-servers/synaptics/files/patch-Makefile +++ /dev/null @@ -1,99 +0,0 @@ ---- Makefile.orig Sun Jul 16 00:58:26 2006 -+++ Makefile Sun Aug 13 10:47:35 2006 -@@ -12,14 +12,14 @@ - MANDIR = $(DESTDIR)$(PREFIX)/man - - ifeq ($(ARCH),) -- ARCH = $(shell /bin/arch) -+ ARCH = $(shell uname -m) - endif - ifeq ($(ARCH),amd64) - ARCH = x86_64 - endif - ifeq ($(ARCH),x86_64) - ARCH_DEFINES = -D__x86_64__ -D_XSERVER64 -- LIBDIR = lib64 -+ LIBDIR = lib - else - ARCH_DEFINES = -D__i386__ - LIBDIR = lib -@@ -39,7 +39,7 @@ - -I$(INSTALLED_X)/include/X11/extensions \ - -I$(SDKDIR) - else -- INSTALLED_X = /usr/X11R6 -+ INSTALLED_X = ${X11BASE} - INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input - SYNAPTICS_DRV = synaptics_drv.o - LDCOMBINEFLAGS = -r -@@ -62,12 +62,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 - endif - -@@ -81,11 +85,11 @@ - - CCOPTIONS := -pedantic -Wall -Wpointer-arith - CCOPTIONS += $(call check_gcc,-fno-merge-constants,) --CDEBUGFLAGS = -O2 --CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(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) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -+CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include - --CC = gcc -+#CC = gcc - - SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c - OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o -@@ -94,29 +98,29 @@ - $(RM) $@ - $(CC) -c $(CFLAGS) $(_NOOP_) $*.c - --all:: $(SYNAPTICS_DRV) synclient syndaemon -+all:: $(SYNAPTICS_DRV) synclient - --install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man -+install: $(BINDIR)/synclient $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) 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 $< $@ - - $(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 $< $@ - - $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV) -- install --mode=0644 -D $< $@ -+ ${BSD_INSTALL_DATA} $< $@ - - $(SYNAPTICS_DRV): $(OBJS) - $(RM) $@ diff --git a/x11-servers/synaptics/files/patch-eventcomm.c b/x11-servers/synaptics/files/patch-eventcomm.c deleted file mode 100644 index 0fbcfefe6d27..000000000000 --- a/x11-servers/synaptics/files/patch-eventcomm.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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-servers/synaptics/pkg-descr b/x11-servers/synaptics/pkg-descr deleted file mode 100644 index 009694de864a..000000000000 --- a/x11-servers/synaptics/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -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-servers/synaptics/pkg-message b/x11-servers/synaptics/pkg-message deleted file mode 100644 index 7f6039d68c45..000000000000 --- a/x11-servers/synaptics/pkg-message +++ /dev/null @@ -1,88 +0,0 @@ -=============================================================================== - - * SETUP NOTE * SETUP NOTE * - -o Please remove ${X11BASE}/lib/modules/input/synaptics_drv.so - manually, If you have installed synaptics-0.14.4_1. I forgot - to chase pkg-plist on 0.14.4_1. - -o Add boot time tunable to /boot/loader.conf. - Set hw.psm.synaptics_support=1 and shutdown -r now! - -/boot/loader.conf --------------------------------- -hw.psm.synaptics_support=1 ---------------------------------------------------- - -o Don't run moused(8) daemon. - Dont' set moused_enable="YES" in /etc/rc.conf. - -/etc/rc.conf -------------------------------------- -moused_enable="NO" ---------------------------------------------------- - -o Set your /etc/xorg.conf (or /etc/XF86Config) - Adopt your environment. This is a sample configration, and - following setting is mine. You may want to change the - values of *Edge and *Delta. - - *NOTE* - Please disable your existing "CorePointer" in "ServerLayout" - section, only use "Synaptics_Touchpad" CorePointer. - -/etc/xorg.conf (or /etc/XF86Config) --------------- - : -Section "Module" - : - Load "synaptics" -EndSection - -Section "ServerLayout" - : -# InputDevice "Standard_PS/2_Mouse" "CorePointer" - 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 "HorizScrollDelta" "100" - - Option "MinSpeed" "0.06" - Option "MaxSpeed" "0.06" - Option "AccelFactor" "0.0010" - - Option "ScrollButtonRepeat" "100" - Option "UpDownScrolling" "on" - Option "UpDownRepeat" "on" - Option "LeftRightScrolling" "on" - Option "LeftRightRepeat" "on" - - # "SHMConfig on" seems good works with synclient(1). But this - # options is insecure. I recommended "off" as default. - Option "SHMConfig" "off" - - # If you use circular touchpad, uncomment them. -# Option "CircularPad" "on" -# Option "CircularScrolling" "on" -# Option "CircScrollDelta" "0.5" -EndSection - : -/etc/xorg.conf (or /etc/XF86Config) --------------- - -=============================================================================== diff --git a/x11-servers/synaptics/pkg-plist b/x11-servers/synaptics/pkg-plist deleted file mode 100644 index 46e202c29d17..000000000000 --- a/x11-servers/synaptics/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -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 -- cgit v1.2.3