From 9f890b8d83dac42354b19dbd586fbd11ab15c8be Mon Sep 17 00:00:00 2001 From: Niclas Zeising Date: Tue, 15 Oct 2019 10:49:14 +0000 Subject: [PATCH] Remove deprecated x11 ports Remove deprecated ports owned by x11: * x11/xsetmode * x11/xsetpointer * x11/libxkbui * x11/xrx * x11/libXevie * x11/liboldX * x11-fonts/font-bitstream-speedo * x11-fonts/libXfontcache * x11-drivers/xf86-input-hyperpen * x11-drivers/xf86-input-mutouch * x11-drivers/xf86-input-acecad * x11-drivers/xf86-input-penmount * x11-drivers/xf86-input-fpit Remove libraries from the USES framework and Mk/Uses/xorg.mk as needed to adjust for their removal. Add entries to MOVED and remove from port categories makefiles. --- MOVED | 13 ++ Mk/Uses/xorg.mk | 8 - x11-drivers/Makefile | 5 - x11-drivers/xf86-input-acecad/Makefile | 16 -- x11-drivers/xf86-input-acecad/distinfo | 2 - .../files/patch-git_01_fd61e53 | 86 --------- .../files/patch-git_02_1fea653 | 34 ---- .../files/patch-git_04_ef1e9cf | 165 ------------------ .../files/patch-git_05_21f7f17 | 121 ------------- .../files/patch-git_06_9385ae9 | 97 ---------- .../files/patch-git_07_ec2c4ea | 25 --- .../files/patch-git_08_39b97cc | 26 --- .../files/patch-git_09_e76e20d | 26 --- .../files/patch-git_10_2f1a5b4 | 72 -------- .../files/patch-src_acecad.c | 31 ---- x11-drivers/xf86-input-acecad/pkg-descr | 3 - x11-drivers/xf86-input-acecad/pkg-plist | 2 - x11-drivers/xf86-input-fpit/Makefile | 17 -- x11-drivers/xf86-input-fpit/distinfo | 2 - .../files/patch-git_01_38fde65 | 59 ------- .../files/patch-git_02_508d879 | 25 --- .../files/patch-git_03_4b47b4a | 29 --- .../files/patch-git_04_dc40c58 | 29 --- .../files/patch-git_05_7a1245d | 23 --- .../files/patch-git_06_270607a | 22 --- .../files/patch-git_07_5772c7f | 26 --- .../files/patch-git_09_00742d9 | 28 --- .../files/patch-src_xf86Fpit.c | 52 ------ x11-drivers/xf86-input-fpit/pkg-descr | 3 - x11-drivers/xf86-input-fpit/pkg-plist | 3 - x11-drivers/xf86-input-hyperpen/Makefile | 16 -- x11-drivers/xf86-input-hyperpen/distinfo | 2 - .../files/patch-git_01_161f414 | 27 --- .../files/patch-git_02_b2ef09f | 33 ---- .../files/patch-git_03_02a74cf | 25 --- .../files/patch-git_04_6d660b0 | 29 --- .../files/patch-git_06_2c03719 | 21 --- .../files/patch-src_xf86HyperPen.c | 85 --------- x11-drivers/xf86-input-hyperpen/pkg-descr | 3 - x11-drivers/xf86-input-hyperpen/pkg-plist | 1 - x11-drivers/xf86-input-mutouch/Makefile | 16 -- x11-drivers/xf86-input-mutouch/distinfo | 2 - .../files/patch-git_01_066b889 | 29 --- .../files/patch-git_02_7b06397 | 25 --- .../files/patch-git_03_7bf5e0d | 36 ---- .../files/patch-git_04_ea858f9 | 32 ---- .../files/patch-git_05_7bd05fe | 30 ---- .../files/patch-src_xf86MuTouch.c | 60 ------- x11-drivers/xf86-input-mutouch/pkg-descr | 3 - x11-drivers/xf86-input-mutouch/pkg-plist | 2 - x11-drivers/xf86-input-penmount/Makefile | 16 -- x11-drivers/xf86-input-penmount/distinfo | 2 - .../files/patch-git_01_f5aede2 | 28 --- .../files/patch-git_02_ff389f9 | 82 --------- .../files/patch-src_xf86PM.c | 69 -------- x11-drivers/xf86-input-penmount/pkg-descr | 4 - x11-drivers/xf86-input-penmount/pkg-plist | 2 - x11-fonts/Makefile | 2 - x11-fonts/font-bitstream-speedo/Makefile | 16 -- x11-fonts/font-bitstream-speedo/distinfo | 2 - x11-fonts/font-bitstream-speedo/pkg-descr | 3 - x11-fonts/font-bitstream-speedo/pkg-plist | 8 - x11-fonts/libXfontcache/Makefile | 17 -- x11-fonts/libXfontcache/distinfo | 2 - x11-fonts/libXfontcache/pkg-descr | 3 - x11-fonts/libXfontcache/pkg-plist | 11 -- x11/Makefile | 5 - x11/libXevie/Makefile | 19 -- x11/libXevie/distinfo | 2 - x11/libXevie/pkg-descr | 3 - x11/libXevie/pkg-plist | 12 -- x11/liboldX/Makefile | 17 -- x11/liboldX/distinfo | 2 - x11/liboldX/pkg-descr | 3 - x11/liboldX/pkg-plist | 6 - x11/libxkbui/Makefile | 17 -- x11/libxkbui/distinfo | 2 - x11/libxkbui/pkg-descr | 3 - x11/libxkbui/pkg-plist | 6 - x11/xrx/Makefile | 23 --- x11/xrx/distinfo | 2 - x11/xrx/pkg-descr | 3 - x11/xrx/pkg-plist | 7 - x11/xsetmode/Makefile | 18 -- x11/xsetmode/distinfo | 2 - x11/xsetmode/pkg-descr | 2 - x11/xsetpointer/Makefile | 18 -- x11/xsetpointer/distinfo | 2 - x11/xsetpointer/pkg-descr | 2 - 89 files changed, 13 insertions(+), 1957 deletions(-) delete mode 100644 x11-drivers/xf86-input-acecad/Makefile delete mode 100644 x11-drivers/xf86-input-acecad/distinfo delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_01_fd61e53 delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_02_1fea653 delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_04_ef1e9cf delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_05_21f7f17 delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_06_9385ae9 delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_07_ec2c4ea delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_08_39b97cc delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_09_e76e20d delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-git_10_2f1a5b4 delete mode 100644 x11-drivers/xf86-input-acecad/files/patch-src_acecad.c delete mode 100644 x11-drivers/xf86-input-acecad/pkg-descr delete mode 100644 x11-drivers/xf86-input-acecad/pkg-plist delete mode 100644 x11-drivers/xf86-input-fpit/Makefile delete mode 100644 x11-drivers/xf86-input-fpit/distinfo delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_01_38fde65 delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_02_508d879 delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_03_4b47b4a delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_04_dc40c58 delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_05_7a1245d delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_06_270607a delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_07_5772c7f delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-git_09_00742d9 delete mode 100644 x11-drivers/xf86-input-fpit/files/patch-src_xf86Fpit.c delete mode 100644 x11-drivers/xf86-input-fpit/pkg-descr delete mode 100644 x11-drivers/xf86-input-fpit/pkg-plist delete mode 100644 x11-drivers/xf86-input-hyperpen/Makefile delete mode 100644 x11-drivers/xf86-input-hyperpen/distinfo delete mode 100644 x11-drivers/xf86-input-hyperpen/files/patch-git_01_161f414 delete mode 100644 x11-drivers/xf86-input-hyperpen/files/patch-git_02_b2ef09f delete mode 100644 x11-drivers/xf86-input-hyperpen/files/patch-git_03_02a74cf delete mode 100644 x11-drivers/xf86-input-hyperpen/files/patch-git_04_6d660b0 delete mode 100644 x11-drivers/xf86-input-hyperpen/files/patch-git_06_2c03719 delete mode 100644 x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c delete mode 100644 x11-drivers/xf86-input-hyperpen/pkg-descr delete mode 100644 x11-drivers/xf86-input-hyperpen/pkg-plist delete mode 100644 x11-drivers/xf86-input-mutouch/Makefile delete mode 100644 x11-drivers/xf86-input-mutouch/distinfo delete mode 100644 x11-drivers/xf86-input-mutouch/files/patch-git_01_066b889 delete mode 100644 x11-drivers/xf86-input-mutouch/files/patch-git_02_7b06397 delete mode 100644 x11-drivers/xf86-input-mutouch/files/patch-git_03_7bf5e0d delete mode 100644 x11-drivers/xf86-input-mutouch/files/patch-git_04_ea858f9 delete mode 100644 x11-drivers/xf86-input-mutouch/files/patch-git_05_7bd05fe delete mode 100644 x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c delete mode 100644 x11-drivers/xf86-input-mutouch/pkg-descr delete mode 100644 x11-drivers/xf86-input-mutouch/pkg-plist delete mode 100644 x11-drivers/xf86-input-penmount/Makefile delete mode 100644 x11-drivers/xf86-input-penmount/distinfo delete mode 100644 x11-drivers/xf86-input-penmount/files/patch-git_01_f5aede2 delete mode 100644 x11-drivers/xf86-input-penmount/files/patch-git_02_ff389f9 delete mode 100644 x11-drivers/xf86-input-penmount/files/patch-src_xf86PM.c delete mode 100644 x11-drivers/xf86-input-penmount/pkg-descr delete mode 100644 x11-drivers/xf86-input-penmount/pkg-plist delete mode 100644 x11-fonts/font-bitstream-speedo/Makefile delete mode 100644 x11-fonts/font-bitstream-speedo/distinfo delete mode 100644 x11-fonts/font-bitstream-speedo/pkg-descr delete mode 100644 x11-fonts/font-bitstream-speedo/pkg-plist delete mode 100644 x11-fonts/libXfontcache/Makefile delete mode 100644 x11-fonts/libXfontcache/distinfo delete mode 100644 x11-fonts/libXfontcache/pkg-descr delete mode 100644 x11-fonts/libXfontcache/pkg-plist delete mode 100644 x11/libXevie/Makefile delete mode 100644 x11/libXevie/distinfo delete mode 100644 x11/libXevie/pkg-descr delete mode 100644 x11/libXevie/pkg-plist delete mode 100644 x11/liboldX/Makefile delete mode 100644 x11/liboldX/distinfo delete mode 100644 x11/liboldX/pkg-descr delete mode 100644 x11/liboldX/pkg-plist delete mode 100644 x11/libxkbui/Makefile delete mode 100644 x11/libxkbui/distinfo delete mode 100644 x11/libxkbui/pkg-descr delete mode 100644 x11/libxkbui/pkg-plist delete mode 100644 x11/xrx/Makefile delete mode 100644 x11/xrx/distinfo delete mode 100644 x11/xrx/pkg-descr delete mode 100644 x11/xrx/pkg-plist delete mode 100644 x11/xsetmode/Makefile delete mode 100644 x11/xsetmode/distinfo delete mode 100644 x11/xsetmode/pkg-descr delete mode 100644 x11/xsetpointer/Makefile delete mode 100644 x11/xsetpointer/distinfo delete mode 100644 x11/xsetpointer/pkg-descr diff --git a/MOVED b/MOVED index 34fe096a4f0d..12e8ffc7a9f1 100644 --- a/MOVED +++ b/MOVED @@ -13080,3 +13080,16 @@ x11-toolkits/gai||2019-10-10|Abandonware since 2005 palm/synce-libsynce||2019-10-14|Has expired: obsolete technology french/py-grammalecte|french/py-grammalecte-fr|2019-10-14|Port was incorrectly named different to upstream deskutils/xmaddressbook||2019-10-15|Depends on deprecated x11/liboldX +x11/xsetmode||2019-10-15|Deprecatd upstream +x11/xsetpointer||2019-10-15|Deprecatd upstream +x11/libxkbui||2019-10-15|Deprecatd upstream +x11/xrx||2019-10-15|Deprecatd upstream +x11/libXevie||2019-10-15|Deprecatd upstream +x11/liboldX||2019-10-15|Deprecatd upstream +x11-fonts/font-bitstream-speedo||2019-10-15|Deprecatd upstream +x11-fonts/libXfontcache||2019-10-15|Deprecatd upstream +x11-drivers/xf86-input-hyperpen||2019-10-15|Deprecatd upstream +x11-drivers/xf86-input-mutouch||2019-10-15|Deprecatd upstream +x11-drivers/xf86-input-acecad||2019-10-15|Deprecatd upstream +x11-drivers/xf86-input-penmount||2019-10-15|Deprecatd upstream +x11-drivers/xf86-input-fpit||2019-10-15|Deprecatd upstream diff --git a/Mk/Uses/xorg.mk b/Mk/Uses/xorg.mk index 48ef4177d3bb..3f85761f2629 100644 --- a/Mk/Uses/xorg.mk +++ b/Mk/Uses/xorg.mk @@ -41,7 +41,6 @@ XORG_MODULES= dmx \ fontutil \ ice \ libfs \ - oldx \ pciaccess \ pixman \ sm \ @@ -56,17 +55,14 @@ XORG_MODULES= dmx \ xcursor \ xdamage \ xdmcp \ - xevie \ xext \ xfixes \ xfont \ xfont2 \ - xfontcache \ xft \ xi \ xinerama \ xkbfile \ - xkbui \ xmu \ xmuu \ xorg-macros \ @@ -96,7 +92,6 @@ fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/lib fontutil_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS -oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:devel/libpciaccess pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman sm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM @@ -111,17 +106,14 @@ xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libX xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor xdamage_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage xdmcp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp -xevie_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xevie.pc:x11/libXevie xext_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext xfixes_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes xfont_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont xfont2_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont2.pc:x11-fonts/libXfont2 -xfontcache_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:x11-fonts/libXfontcache xft_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft xi_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi xinerama_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama xkbfile_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile -xkbui_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:x11/libxkbui xmu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu xorg-macros_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile index 4db175c7b049..b681de419d2d 100644 --- a/x11-drivers/Makefile +++ b/x11-drivers/Makefile @@ -3,18 +3,13 @@ COMMENT = X11 drivers - SUBDIR += xf86-input-acecad SUBDIR += xf86-input-egalax SUBDIR += xf86-input-elographics SUBDIR += xf86-input-evdev - SUBDIR += xf86-input-fpit - SUBDIR += xf86-input-hyperpen SUBDIR += xf86-input-joystick SUBDIR += xf86-input-keyboard SUBDIR += xf86-input-libinput SUBDIR += xf86-input-mouse - SUBDIR += xf86-input-mutouch - SUBDIR += xf86-input-penmount SUBDIR += xf86-input-synaptics SUBDIR += xf86-input-vmmouse SUBDIR += xf86-input-void diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile deleted file mode 100644 index 7021f9df8e2a..000000000000 --- a/x11-drivers/xf86-input-acecad/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-input-acecad -PORTVERSION= 1.5.0 -PORTREVISION= 10 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org acecad input driver - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= driver - -.include diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo deleted file mode 100644 index 4382553e2927..000000000000 --- a/x11-drivers/xf86-input-acecad/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = c3032f38a07b54772299ce8832e16109a685ee63eeefbb17cef9fe1dd100a448 -SIZE (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = 262818 diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_01_fd61e53 b/x11-drivers/xf86-input-acecad/files/patch-git_01_fd61e53 deleted file mode 100644 index 0d49ebad3837..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_01_fd61e53 +++ /dev/null @@ -1,86 +0,0 @@ -From fd61e53ed08cec2b3af688a55507477f6ef30544 Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois -Date: Fri, 3 Jun 2011 15:59:14 +0200 -Subject: =?UTF-8?q?Avoid=20=E2=80=9C'ReverseConvertProc'=20defined=20but?= - =?UTF-8?q?=20not=20used=E2=80=9D=20warning.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Move this function next to its unique caller (AceCadPreInit), and only -declare/define it when the input ABI is strictly less than 12. - -Reviewed-by: Peter Hutterer -Reviewed-by: Daniel Stone -Signed-off-by: Cyril Brulebois - -diff --git a/src/acecad.c b/src/acecad.c -index 6259f21..f5a2213 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -370,6 +370,21 @@ SetupProc_fail: - return NULL; - } - -+static Bool -+ReverseConvertProc (InputInfoPtr local, -+ int x, int y, -+ int *valuators) -+{ -+ AceCadPrivatePtr priv = (AceCadPrivatePtr)(local->private); -+ -+ // xf86Msg(X_INFO, "%s: reverse coordinate conversion in : %d, %d\n", local->name, x, y); -+ valuators[0] = x * priv->acecadMaxX / screenInfo.screens[0]->width; -+ valuators[1] = y * priv->acecadMaxY / screenInfo.screens[0]->height; -+ // xf86Msg(X_INFO, "%s: reverse coordinate conversion out: %d, %d\n", local->name, valuators[0], valuators[1]); -+ -+ return TRUE; -+} -+ - static int - NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - #else -@@ -1071,22 +1086,6 @@ ConvertProc (InputInfoPtr local, int first, int num, - } - - --static Bool --ReverseConvertProc (InputInfoPtr local, -- int x, int y, -- int *valuators) --{ -- AceCadPrivatePtr priv = (AceCadPrivatePtr)(local->private); -- -- // xf86Msg(X_INFO, "%s: reverse coordinate conversion in : %d, %d\n", local->name, x, y); -- valuators[0] = x * priv->acecadMaxX / screenInfo.screens[0]->width; -- valuators[1] = y * priv->acecadMaxY / screenInfo.screens[0]->height; -- // xf86Msg(X_INFO, "%s: reverse coordinate conversion out: %d, %d\n", local->name, valuators[0], valuators[1]); -- -- return TRUE; --} -- -- - #define WriteString(str)\ - XisbWrite (priv->buffer, (unsigned char *)(str), strlen(str)) - -diff --git a/src/acecad.h b/src/acecad.h -index a2b5c66..bd8e997 100644 ---- src/acecad.h -+++ src/acecad.h -@@ -102,12 +102,12 @@ static Bool DeviceClose (DeviceIntPtr); - static Bool DeviceInit (DeviceIntPtr); - static void ReadInput (InputInfoPtr); - static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *); --static Bool ReverseConvertProc(InputInfoPtr , int , int , int*); - static Bool QueryHardware (AceCadPrivatePtr); - static void NewPacket (AceCadPrivatePtr priv); - static Bool AceCadGetPacket (AceCadPrivatePtr); - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - static InputInfoPtr AceCadPreInit(InputDriverPtr, IDevPtr , int); -+static Bool ReverseConvertProc(InputInfoPtr , int , int , int*); - #else - static int AceCadPreInit(InputDriverPtr, InputInfoPtr , int); - #endif --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_02_1fea653 b/x11-drivers/xf86-input-acecad/files/patch-git_02_1fea653 deleted file mode 100644 index a3949712be0d..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_02_1fea653 +++ /dev/null @@ -1,34 +0,0 @@ -From 1fea6530eeca06b0d8d15a9327f87063292e1e6d Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois -Date: Fri, 3 Jun 2011 15:59:14 +0200 -Subject: Silence gcc: report_{x, y} are getting initialized. - -Get us rid of: -| CC acecad.lo -| acecad.c: In function 'USBReadInput': -| acecad.c:1052:43: warning: 'report_y' may be used uninitialized in this function [-Wuninitialized] -| acecad.c:1052:43: warning: 'report_x' may be used uninitialized in this function [-Wuninitialized] - -Both code paths (with XORG_BOTCHED_INPUT or not) will lead report_x and -report_y to be set, but make sure the compiler stops guessing. - -Reviewed-by: Peter Hutterer -Reviewed-by: Daniel Stone -Signed-off-by: Cyril Brulebois - -diff --git a/src/acecad.c b/src/acecad.c -index f5a2213..1e2f0c0 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -919,7 +919,7 @@ USBReadInput (InputInfoPtr local) - int x = priv->acecadOldX; - int y = priv->acecadOldY; - int z = priv->acecadOldZ; -- int report_x, report_y; -+ int report_x = 0, report_y = 0; - int prox = priv->acecadOldProximity; - int buttons = priv->acecadOldButtons; - int is_core_pointer = 0; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_04_ef1e9cf b/x11-drivers/xf86-input-acecad/files/patch-git_04_ef1e9cf deleted file mode 100644 index 3ea550b194f4..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_04_ef1e9cf +++ /dev/null @@ -1,165 +0,0 @@ -From ef1e9cf34e8f1ec2513dd6bd36d824b54e841ea7 Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois -Date: Fri, 3 Jun 2011 15:59:15 +0200 -Subject: Drop support for pre-input ABI 12 servers. - -Reviewed-by: Peter Hutterer -Reviewed-by: Daniel Stone -Signed-off-by: Cyril Brulebois - -diff --git a/configure.ac b/configure.ac -index 4c76754..d4a404d 100644 ---- configure.ac -+++ configure.ac -@@ -55,7 +55,7 @@ AC_CHECK_HEADERS([linux/input.h sysfs/libsysfs.h]) - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - - # Obtain compiler/linker options from server and required extensions --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto kbproto inputproto $REQUIRED_MODULES) -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto kbproto inputproto $REQUIRED_MODULES) - - # Define a configure option for an alternate input module directory - AC_ARG_WITH(xorg-module-dir, -diff --git a/src/acecad.c b/src/acecad.c -index d60b3b6..17e141f 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -90,6 +90,10 @@ - #endif - #define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 -+#error "XINPUT ABI 12 required." -+#endif -+ - /***************************************************************************** - * Local Headers - ****************************************************************************/ -@@ -331,66 +335,8 @@ ProbeFound: - - #endif - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 --static int NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr dev, int flags); -- --static InputInfoPtr --AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) --{ -- InputInfoPtr local = xf86AllocateInput(drv, 0); -- AceCadPrivatePtr priv = calloc (1, sizeof(AceCadPrivateRec)); -- -- if ((!local)) -- goto SetupProc_fail; -- -- local->name = dev->identifier; -- local->type_name = XI_TABLET; -- local->flags = XI86_SEND_DRAG_EVENTS; --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -- local->motion_history_proc = xf86GetMotionEvents; --#endif -- local->control_proc = NULL; -- local->switch_mode = NULL; -- local->conversion_proc = ConvertProc; -- local->reverse_conversion_proc = ReverseConvertProc; -- local->dev = NULL; -- local->private = priv; -- local->private_flags = 0; -- local->conf_idev = dev; -- /*local->always_core_feedback = 0;*/ -- -- xf86CollectInputOptions(local, default_options, NULL); -- -- xf86OptionListReport(local->options); -- -- if (NewAceCadPreInit(drv, local, flags) == Success) -- return local; -- --SetupProc_fail: -- return NULL; --} -- --static Bool --ReverseConvertProc (InputInfoPtr local, -- int x, int y, -- int *valuators) --{ -- AceCadPrivatePtr priv = (AceCadPrivatePtr)(local->private); -- -- // xf86Msg(X_INFO, "%s: reverse coordinate conversion in : %d, %d\n", local->name, x, y); -- valuators[0] = x * priv->acecadMaxX / screenInfo.screens[0]->width; -- valuators[1] = y * priv->acecadMaxY / screenInfo.screens[0]->height; -- // xf86Msg(X_INFO, "%s: reverse coordinate conversion out: %d, %d\n", local->name, valuators[0], valuators[1]); -- -- return TRUE; --} -- --static int --NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) --#else - static int - AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) --#endif - { - AceCadPrivatePtr priv = calloc (1, sizeof(AceCadPrivateRec)); - int speed; -@@ -500,10 +446,6 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - - xf86ProcessCommonOptions(local, local->options); - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 -- local->flags |= XI86_CONFIGURED; --#endif -- - if (local->fd != -1) - { - RemoveEnabledDevice (local->fd); -@@ -709,9 +651,6 @@ DeviceInit (DeviceIntPtr dev) - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axes_labels, - #endif --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 -- xf86GetMotionEvents, --#endif - history_size, - ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) - == FALSE) -@@ -818,9 +757,6 @@ ReadInput (InputInfoPtr local) - /*xf86Msg(X_INFO, "ACECAD Tablet Read Input\n");*/ - - is_absolute = (priv->flags & ABSOLUTE_FLAG); --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -- is_core_pointer = xf86IsCorePointer(local->dev); --#endif - - /* - * set blocking to -1 on the first call because we know there is data to -@@ -923,9 +859,6 @@ USBReadInput (InputInfoPtr local) - int prox = priv->acecadOldProximity; - int buttons = priv->acecadOldButtons; - int is_core_pointer = 0; --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -- is_core_pointer = xf86IsCorePointer(local->dev); --#endif - /* Is autodev active? */ - int autodev = priv->flags & AUTODEV_FLAG; - /* Was the device available last time we checked? */ -diff --git a/src/acecad.h b/src/acecad.h -index bd8e997..b9291c7 100644 ---- src/acecad.h -+++ src/acecad.h -@@ -105,12 +105,7 @@ static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, i - static Bool QueryHardware (AceCadPrivatePtr); - static void NewPacket (AceCadPrivatePtr priv); - static Bool AceCadGetPacket (AceCadPrivatePtr); --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 --static InputInfoPtr AceCadPreInit(InputDriverPtr, IDevPtr , int); --static Bool ReverseConvertProc(InputInfoPtr , int , int , int*); --#else - static int AceCadPreInit(InputDriverPtr, InputInfoPtr , int); --#endif - #ifdef HAVE_LINUX_INPUT_H - static void USBReadInput (InputInfoPtr); - static Bool USBQueryHardware (InputInfoPtr); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_05_21f7f17 b/x11-drivers/xf86-input-acecad/files/patch-git_05_21f7f17 deleted file mode 100644 index 269bceb62ed9..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_05_21f7f17 +++ /dev/null @@ -1,121 +0,0 @@ -From 21f7f1705d2c0b46ce19367d5ac8a4c225d755ef Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois -Date: Fri, 3 Jun 2011 15:59:15 +0200 -Subject: Remove checks on the ABI now that 12 or higher is required. - -Reviewed-by: Peter Hutterer -Reviewed-by: Daniel Stone -Signed-off-by: Cyril Brulebois - -diff --git a/src/acecad.c b/src/acecad.c -index 17e141f..de2577e 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -79,10 +79,8 @@ - #endif - #endif - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - #include - #include --#endif - - /* Previously found in xf86Xinput.h */ - #ifdef DBG -@@ -130,9 +128,7 @@ _X_EXPORT InputDriverRec ACECAD = - AceCadPreInit, - NULL, - NULL, --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 - default_options --#endif - }; - - static XF86ModuleVersionInfo VersionRec = -@@ -599,7 +595,6 @@ DeviceInit (DeviceIntPtr dev) - AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); - unsigned char map[] = {0, 1, 2, 3}; - int history_size; --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - Atom btn_labels[3]; - Atom axes_labels[3]; - -@@ -618,15 +613,12 @@ DeviceInit (DeviceIntPtr dev) - axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); - axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Z); - } --#endif - - xf86MsgVerb(X_INFO, 4, "%s Init\n", local->name); - - /* 3 boutons */ - if (InitButtonClassDeviceStruct (dev, 3, --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - btn_labels, --#endif - map) == FALSE) - { - xf86Msg(X_ERROR, "%s: unable to allocate ButtonClassDeviceStruct\n", local->name); -@@ -648,9 +640,7 @@ DeviceInit (DeviceIntPtr dev) - - /* 3 axes */ - if (InitValuatorClassDeviceStruct (dev, 3, --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axes_labels, --#endif - history_size, - ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) - == FALSE) -@@ -663,9 +653,7 @@ DeviceInit (DeviceIntPtr dev) - - InitValuatorAxisStruct(dev, - 0, --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axes_labels[0], --#endif - 0, /* min val */ - #if XORG_BOTCHED_INPUT - screenInfo.screens[0]->width, -@@ -675,15 +663,11 @@ DeviceInit (DeviceIntPtr dev) - 1000, /* resolution */ - 0, /* min_res */ - 1000 /* max_res */ --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 - , Absolute --#endif - ); - InitValuatorAxisStruct(dev, - 1, --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axes_labels[1], --#endif - 0, /* min val */ - #if XORG_BOTCHED_INPUT - screenInfo.screens[0]->height, -@@ -693,23 +677,17 @@ DeviceInit (DeviceIntPtr dev) - 1000, /* resolution */ - 0, /* min_res */ - 1000 /* max_res */ --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 - , Absolute --#endif - ); - InitValuatorAxisStruct(dev, - 2, --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axes_labels[2], --#endif - 0, /* min val */ - priv->acecadMaxZ, /* max val */ - 1000, /* resolution */ - 0, /* min_res */ - 1000 /* max_res */ --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 - , Absolute --#endif - ); - - } --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_06_9385ae9 b/x11-drivers/xf86-input-acecad/files/patch-git_06_9385ae9 deleted file mode 100644 index cb609dadcab1..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_06_9385ae9 +++ /dev/null @@ -1,97 +0,0 @@ -From 9385ae905aca9e679e698f0491e0bf7e30a35092 Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois -Date: Fri, 3 Jun 2011 15:59:16 +0200 -Subject: Remove pointless checks on is_core_pointer. - -Reviewed-by: Peter Hutterer -Reviewed-by: Daniel Stone -Signed-off-by: Cyril Brulebois - -diff --git a/src/acecad.c b/src/acecad.c -index de2577e..ad6d793 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -729,7 +729,7 @@ ReadInput (InputInfoPtr local) - { - int x, y, z; - int prox, buttons; -- int is_core_pointer = 0, is_absolute; -+ int is_absolute; - AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); - - /*xf86Msg(X_INFO, "ACECAD Tablet Read Input\n");*/ -@@ -772,11 +772,10 @@ ReadInput (InputInfoPtr local) - if (prox) - { - if (!(priv->acecadOldProximity)) -- if (!is_core_pointer) -- { -- /*xf86Msg(X_INFO, "ACECAD Tablet ProxIN %d %d %d\n",x, y, z);*/ -- xf86PostProximityEvent(local->dev, 1, 0, 3 , x, y, z); -- } -+ { -+ /*xf86Msg(X_INFO, "ACECAD Tablet ProxIN %d %d %d\n",x, y, z);*/ -+ xf86PostProximityEvent(local->dev, 1, 0, 3 , x, y, z); -+ } - - if ((is_absolute && ((priv->acecadOldX != x) || (priv->acecadOldY != y) || (priv->acecadOldZ != z))) - || (!is_absolute && (x || y))) -@@ -809,12 +808,11 @@ ReadInput (InputInfoPtr local) - } - else - { -- if (!is_core_pointer) -- if (priv->acecadOldProximity) -- { -- /*xf86Msg(X_INFO, "ACECAD Tablet ProxOUT %d %d %d\n",x, y, z);*/ -- xf86PostProximityEvent(local->dev, 0, 0, 3, x,y,z); -- } -+ if (priv->acecadOldProximity) -+ { -+ /*xf86Msg(X_INFO, "ACECAD Tablet ProxOUT %d %d %d\n",x, y, z);*/ -+ xf86PostProximityEvent(local->dev, 0, 0, 3, x,y,z); -+ } - priv->acecadOldProximity = 0; - } - } -@@ -836,7 +834,6 @@ USBReadInput (InputInfoPtr local) - int report_x = 0, report_y = 0; - int prox = priv->acecadOldProximity; - int buttons = priv->acecadOldButtons; -- int is_core_pointer = 0; - /* Is autodev active? */ - int autodev = priv->flags & AUTODEV_FLAG; - /* Was the device available last time we checked? */ -@@ -935,10 +932,9 @@ USBReadInput (InputInfoPtr local) - report_y = y; - #endif - if (!(priv->acecadOldProximity)) -- if (!is_core_pointer) -- { -- xf86PostProximityEvent(local->dev, 1, 0, 3 , report_x, report_y, z); -- } -+ { -+ xf86PostProximityEvent(local->dev, 1, 0, 3 , report_x, report_y, z); -+ } - - - xf86PostMotionEvent(local->dev, 1, 0, 3, report_x, report_y, z); -@@ -957,11 +953,10 @@ USBReadInput (InputInfoPtr local) - } - else - { -- if (!is_core_pointer) -- if (priv->acecadOldProximity) -- { -- xf86PostProximityEvent(local->dev, 0, 0, 3, report_x, report_y, z); -- } -+ if (priv->acecadOldProximity) -+ { -+ xf86PostProximityEvent(local->dev, 0, 0, 3, report_x, report_y, z); -+ } - priv->acecadOldProximity = 0; - } - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_07_ec2c4ea b/x11-drivers/xf86-input-acecad/files/patch-git_07_ec2c4ea deleted file mode 100644 index 32fa8ebd0e4a..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_07_ec2c4ea +++ /dev/null @@ -1,25 +0,0 @@ -From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 27 Jun 2011 13:13:54 +1000 -Subject: Assign local->private after allocating. - -It is detrimental to the user experience when the driver tries to derefernce -null pointers. - -Signed-off-by: Peter Hutterer - -diff --git a/src/acecad.c b/src/acecad.c -index ad6d793..604fe91 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - return BadAlloc; - - memset(priv, 0, sizeof(AceCadPrivateRec)); -+ local->private = priv; - - local->device_control = DeviceControl; - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_08_39b97cc b/x11-drivers/xf86-input-acecad/files/patch-git_08_39b97cc deleted file mode 100644 index ce0a5d04295e..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_08_39b97cc +++ /dev/null @@ -1,26 +0,0 @@ -From 39b97cc0138417141b245179fc8555bbb365e879 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 8 Jul 2011 12:24:16 +1000 -Subject: Always set the type name. - -The server assigns "UNKNOWN", override it with something more specific. - -Introduced in f85c4b580c074f7054eac98753d1f4e91f08305e. - -Signed-off-by: Peter Hutterer - -diff --git a/src/acecad.c b/src/acecad.c -index 604fe91..2b6aa45 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -346,6 +346,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - local->private = priv; - - local->device_control = DeviceControl; -+ local->type_name = XI_TABLET; - - priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 ); - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_09_e76e20d b/x11-drivers/xf86-input-acecad/files/patch-git_09_e76e20d deleted file mode 100644 index aa0bdb1aaefc..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_09_e76e20d +++ /dev/null @@ -1,26 +0,0 @@ -From e76e20d4d4a39e139a778411a2ed09ec35c2046e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 09:29:28 +1000 -Subject: Dont call xf86DeleteInput on PreInit failure. - -The server calls this for us once PreInit returns with an error, -calling it during PreInit means the server continues to use -already free'd memory. - -Signed-off-by: Peter Hutterer - -diff --git a/src/acecad.c b/src/acecad.c -index 2b6aa45..a3326a0 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -471,7 +471,6 @@ SetupProc_fail: - if (local) - local->private = NULL; - } -- xf86DeleteInput(local, 0); - return BadAlloc; - } - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-git_10_2f1a5b4 b/x11-drivers/xf86-input-acecad/files/patch-git_10_2f1a5b4 deleted file mode 100644 index 1c0aca9a700b..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-git_10_2f1a5b4 +++ /dev/null @@ -1,72 +0,0 @@ -From 2f1a5b44f62028f2608c0c94e58154df09e9ada3 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 14:13:33 +1000 -Subject: Don't free anything in PreInit, provide an UnInit instead. - -Also fixes: -- leaking priv->buffer -- fd closure bug - -Signed-off-by: Peter Hutterer - -diff --git a/src/acecad.c b/src/acecad.c -index a3326a0..6a0b347 100644 ---- src/acecad.c -+++ src/acecad.c -@@ -126,7 +126,7 @@ _X_EXPORT InputDriverRec ACECAD = - "acecad", - NULL, - AceCadPreInit, -- NULL, -+ AceCadUnInit, - NULL, - default_options - }; -@@ -462,16 +462,26 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - * If something went wrong, cleanup and return NULL - */ - SetupProc_fail: -- if ((local) && (local->fd)) -+ return BadAlloc; -+} -+ -+static void -+AceCadUnInit(InputDriverPtr drv, InputInfoPtr local, int flags) -+{ -+ AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); -+ -+ if (local->fd > -1) -+ { - xf86CloseSerial (local->fd); -- if ((priv) && (priv->buffer)) -- XisbFree (priv->buffer); -+ local->fd = -1; -+ } -+ - if (priv) { -+ if (priv->buffer) -+ XisbFree (priv->buffer); - free (priv); -- if (local) -- local->private = NULL; -+ local->private = NULL; - } -- return BadAlloc; - } - - static Bool -diff --git a/src/acecad.h b/src/acecad.h -index b9291c7..48fa38a 100644 ---- src/acecad.h -+++ src/acecad.h -@@ -106,6 +106,7 @@ static Bool QueryHardware (AceCadPrivatePtr); - static void NewPacket (AceCadPrivatePtr priv); - static Bool AceCadGetPacket (AceCadPrivatePtr); - static int AceCadPreInit(InputDriverPtr, InputInfoPtr , int); -+static void AceCadUnInit(InputDriverPtr, InputInfoPtr , int); - #ifdef HAVE_LINUX_INPUT_H - static void USBReadInput (InputInfoPtr); - static Bool USBQueryHardware (InputInfoPtr); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-acecad/files/patch-src_acecad.c b/x11-drivers/xf86-input-acecad/files/patch-src_acecad.c deleted file mode 100644 index 4c51f48b8b42..000000000000 --- a/x11-drivers/xf86-input-acecad/files/patch-src_acecad.c +++ /dev/null @@ -1,31 +0,0 @@ -# Finish converting RemoveEnabledDevice to xf86RemoveEnabledDevice -# ---- src/acecad.c.orig 2016-11-24 00:26:03 UTC -+++ src/acecad.c -@@ -491,7 +491,7 @@ AceCadPreInit(InputDriverPtr drv, InputI - - if (local->fd != -1) - { -- RemoveEnabledDevice (local->fd); -+ xf86RemoveEnabledDevice (local); - if (priv->buffer) - { - XisbFree(priv->buffer); -@@ -499,7 +499,7 @@ AceCadPreInit(InputDriverPtr drv, InputI - } - xf86CloseSerial(local->fd); - } -- RemoveEnabledDevice (local->fd); -+ xf86RemoveEnabledDevice (local); - local->fd = -1; - return Success; - -@@ -601,7 +601,7 @@ DeviceOff (DeviceIntPtr dev) - - if (local->fd != -1) - { -- RemoveEnabledDevice (local->fd); -+ xf86RemoveEnabledDevice (local); - if (priv->buffer) - { - XisbFree(priv->buffer); diff --git a/x11-drivers/xf86-input-acecad/pkg-descr b/x11-drivers/xf86-input-acecad/pkg-descr deleted file mode 100644 index 605bb37efdde..000000000000 --- a/x11-drivers/xf86-input-acecad/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the X.Org xf86-input-acecad driver. - -WWW: https://www.x.org/ diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist deleted file mode 100644 index 1ea1bfdc363b..000000000000 --- a/x11-drivers/xf86-input-acecad/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/input/acecad_drv.so -man/man4/acecad.4x.gz diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile deleted file mode 100644 index 6531d25d372a..000000000000 --- a/x11-drivers/xf86-input-fpit/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-input-fpit -PORTVERSION= 1.4.0 -PORTREVISION= 10 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org fpit input driver - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= driver -USE_XORG= xrandr - -.include diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo deleted file mode 100644 index 1e97d5e0d0a2..000000000000 --- a/x11-drivers/xf86-input-fpit/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a -SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 277843 diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_01_38fde65 b/x11-drivers/xf86-input-fpit/files/patch-git_01_38fde65 deleted file mode 100644 index c7fd79feb32a..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_01_38fde65 +++ /dev/null @@ -1,59 +0,0 @@ -From 38fde65f6c919350b2bf5d2b61b6e9f783ab2cf7 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 8 Jul 2011 14:12:53 +1000 -Subject: Fix type name and name - -Don't overwrite user-specified device name and set the right type_name. -If you're capable of setting the option DeviceName, you might as well set -the Identifier line. - -Signed-off-by: Peter Hutterer - -diff --git a/man/fpit.man b/man/fpit.man -index 097ff33..8bf31f0 100644 ---- man/fpit.man -+++ man/fpit.man -@@ -82,10 +82,6 @@ Manipulate the invert and swap options to match screen - rotations. (Will behave strangely if combined with invert or swap options.) - New users should consider the \fI"TrackRandR"\fP option instead. - .TP 4 --.B Option \fI"DeviceName"\fP \fI"name"\fP --.B Option \fI"DeviceName"\fP \fI"name"\fP --sets the name of the X device. --.TP 4 - .B Option \fI"AlwaysCore"\fP \fI"on"\fP - enables the sharing of the core pointer. When this feature is enabled, the - device will take control of the core pointer (and thus will emit core events) -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index fa4ace7..e7e4e1a 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -527,7 +527,6 @@ static int xf86FpitAllocate(InputDriverPtr drv, InputInfoPtr pInfo) - priv->fpitOldProximity = 0; - priv->fpitIndex = 0; - priv->fpitPassive = 0; -- pInfo->name = XI_TOUCHSCREEN; - pInfo->flags = 0 /* XI86_NO_OPEN_ON_INIT */ ; - pInfo->device_control = xf86FpitControl; - pInfo->read_input = xf86FpitReadInput; -@@ -536,7 +535,7 @@ static int xf86FpitAllocate(InputDriverPtr drv, InputInfoPtr pInfo) - pInfo->fd = -1; - pInfo->dev = NULL; - pInfo->private = priv; -- pInfo->type_name = "Fujitsu Stylistic"; -+ pInfo->type_name = XI_TOUCHSCREEN; - return Success; - } - -@@ -577,8 +576,6 @@ static int xf86FpitInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return BadValue; - } - priv->fpitDev = strdup(str); -- pInfo->name = xf86SetStrOption(pInfo->options, "DeviceName", XI_TOUCHSCREEN); -- xf86Msg(X_CONFIG, "FPIT device name: %s\n", pInfo->name); - priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0); - xf86Msg(X_CONFIG, "Fpit associated screen: %d\n", priv->screen_no); - priv->fpitMaxX = xf86SetIntOption(pInfo->options, "MaximumXPosition", FPIT_MAX_X); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_02_508d879 b/x11-drivers/xf86-input-fpit/files/patch-git_02_508d879 deleted file mode 100644 index 3670cde34aaf..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_02_508d879 +++ /dev/null @@ -1,25 +0,0 @@ -From 508d8793e5998fcac42a9dfd6f02235c3d82ab11 Mon Sep 17 00:00:00 2001 -From: Terry Lambert -Date: Fri, 15 Jul 2011 17:23:21 -0700 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert -Reviewed-by: Stephane Marchesin -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index e7e4e1a..78b44a2 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -495,7 +495,7 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) - return Success; - default: - ErrorF("unsupported mode=%d\n", mode); -- return !Success; -+ return BadValue; - } - } - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_03_4b47b4a b/x11-drivers/xf86-input-fpit/files/patch-git_03_4b47b4a deleted file mode 100644 index f34f159d18bb..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_03_4b47b4a +++ /dev/null @@ -1,29 +0,0 @@ -From 4b47b4a9cdce3bd0368aacb8164aa02e05670a88 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 11:42:12 +1000 -Subject: Don't free anything on PreInit failure, let UnInit take care of it - -Avoid double free's by the server when it calls UnInit. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index 78b44a2..2da34aa 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -567,12 +567,6 @@ static int xf86FpitInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - str = xf86FindOptionValue(pInfo->options, "Device"); - if (!str) { - xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", pInfo->name); -- if (priv) { -- if (priv->fpitDev) { -- free(priv->fpitDev); -- } -- free(priv); -- } - return BadValue; - } - priv->fpitDev = strdup(str); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_04_dc40c58 b/x11-drivers/xf86-input-fpit/files/patch-git_04_dc40c58 deleted file mode 100644 index 5859069c327a..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_04_dc40c58 +++ /dev/null @@ -1,29 +0,0 @@ -From dc40c58c70b785c102a27652569c3de30fc44a9b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 11:44:35 +1000 -Subject: Test opening the device in PreInit, fail if necessary - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index 2da34aa..8c9c830 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -568,6 +568,14 @@ static int xf86FpitInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - if (!str) { - xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", pInfo->name); - return BadValue; -+ } else { -+ pInfo->fd = xf86OpenSerial(pInfo->options); -+ if (pInfo->fd < 0) { -+ xf86Msg(X_ERROR, "%s: Unable to open Fpit touchscreen device '%s'", pInfo->name, str); -+ return BadValue; -+ } -+ xf86CloseSerial(pInfo->fd); -+ pInfo->fd = -1; - } - priv->fpitDev = strdup(str); - priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_05_7a1245d b/x11-drivers/xf86-input-fpit/files/patch-git_05_7a1245d deleted file mode 100644 index 01d209c0a890..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_05_7a1245d +++ /dev/null @@ -1,23 +0,0 @@ -From 7a1245defa41517786e9752ea4e588c4f88f7047 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 11:45:00 +1000 -Subject: Use xf86SetStrOption to print Option Device to the log - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index 8c9c830..9ab3bb0 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -564,7 +564,7 @@ static int xf86FpitInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return rc; - - priv = pInfo->private; -- str = xf86FindOptionValue(pInfo->options, "Device"); -+ str = xf86SetStrOption(pInfo->options, "Device", NULL); - if (!str) { - xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", pInfo->name); - return BadValue; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_06_270607a b/x11-drivers/xf86-input-fpit/files/patch-git_06_270607a deleted file mode 100644 index 2e18d3c704e0..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_06_270607a +++ /dev/null @@ -1,22 +0,0 @@ -From 270607ae055a21bdac44f905a791260c5b34089b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:32:50 +1000 -Subject: Don't call DEVICE_OFF in UnInit, the server does it for us - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index 9ab3bb0..eb85a2e 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -542,7 +542,6 @@ static int xf86FpitAllocate(InputDriverPtr drv, InputInfoPtr pInfo) - static void xf86FpitUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - { - FpitPrivatePtr priv = (FpitPrivatePtr) pInfo->private; -- xf86FpitControl(pInfo->dev, DEVICE_OFF); - free(priv->fpitDev); - free(priv); - pInfo->private = NULL; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_07_5772c7f b/x11-drivers/xf86-input-fpit/files/patch-git_07_5772c7f deleted file mode 100644 index 7317be843c7c..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_07_5772c7f +++ /dev/null @@ -1,26 +0,0 @@ -From 5772c7f58f24e259349ad048de096802184c7aa1 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 15:52:11 +1000 -Subject: Check for priv before dereferencing it. - -We can hit this path when the priv alloc fails. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index eb85a2e..3c70b4a 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -542,7 +542,8 @@ static int xf86FpitAllocate(InputDriverPtr drv, InputInfoPtr pInfo) - static void xf86FpitUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - { - FpitPrivatePtr priv = (FpitPrivatePtr) pInfo->private; -- free(priv->fpitDev); -+ if (priv) -+ free(priv->fpitDev); - free(priv); - pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-git_09_00742d9 b/x11-drivers/xf86-input-fpit/files/patch-git_09_00742d9 deleted file mode 100644 index 4174214e5710..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-git_09_00742d9 +++ /dev/null @@ -1,28 +0,0 @@ -From 00742d9a9bcd06800b2548007ea304c331875666 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 20 Aug 2012 10:00:57 +1000 -Subject: Don't force pInfo->flags to 0 (#40870) - -The server uses the flags to decide if a device comes up as attached or -floating slave. Overwriting the flag after the server has processed the -CorePointer/AlwaysCore/Floating/etc options results in the device always -coming up as floating slave. This again makes the device appear -unresponsive. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c -index 3c70b4a..8852d4d 100644 ---- src/xf86Fpit.c -+++ src/xf86Fpit.c -@@ -527,7 +527,6 @@ static int xf86FpitAllocate(InputDriverPtr drv, InputInfoPtr pInfo) - priv->fpitOldProximity = 0; - priv->fpitIndex = 0; - priv->fpitPassive = 0; -- pInfo->flags = 0 /* XI86_NO_OPEN_ON_INIT */ ; - pInfo->device_control = xf86FpitControl; - pInfo->read_input = xf86FpitReadInput; - pInfo->control_proc = NULL; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-fpit/files/patch-src_xf86Fpit.c b/x11-drivers/xf86-input-fpit/files/patch-src_xf86Fpit.c deleted file mode 100644 index fb94b6dc5439..000000000000 --- a/x11-drivers/xf86-input-fpit/files/patch-src_xf86Fpit.c +++ /dev/null @@ -1,52 +0,0 @@ -# Finish converting RemoveEnabledDevice to xf86RemoveEnabledDevice -# Finish converting use of Error to ErrorF -# Remove obsolete xf86InputSetScreen -# Correct type of default_options -# ---- src/xf86Fpit.c.orig 2011-06-13 23:24:05 UTC -+++ src/xf86Fpit.c -@@ -251,7 +251,7 @@ static void xf86FpitReadInput(InputInfoP - /* Read data into buffer */ - len = xf86ReadSerial(pInfo->fd, priv->fpitData+priv->fpitIndex, BUFFER_SIZE-priv->fpitIndex); - if (len <= 0) { -- Error("error reading FPIT device"); -+ ErrorF("error reading FPIT device\n"); - priv->fpitIndex = 0; - return; - } -@@ -324,7 +324,7 @@ static void xf86FpitReadInput(InputInfoP - device = pInfo->dev; - - xf86FpitConvert(pInfo, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y); -- xf86XInputSetScreen(pInfo, priv->screen_no, conv_x, conv_y); -+ //xf86XInputSetScreen(pInfo, priv->screen_no, conv_x, conv_y); - - /* coordinates are ready we can send events */ - -@@ -459,7 +459,7 @@ static Bool xf86FpitControl(DeviceIntPtr - if (pInfo->fd < 0) { - pInfo->fd = xf86OpenSerial(pInfo->options); - if (pInfo->fd < 0) { -- Error("Unable to open Fpit touchscreen device"); -+ ErrorF("Unable to open Fpit touchscreen device\n"); - return !Success; - } - -@@ -488,7 +488,7 @@ static Bool xf86FpitControl(DeviceIntPtr - case DEVICE_CLOSE: - dev->public.on = FALSE; - if (pInfo->fd >= 0) { -- RemoveEnabledDevice(pInfo->fd); -+ xf86RemoveEnabledDevice(pInfo); - } - xf86CloseSerial(pInfo->fd); - pInfo->fd = -1; -@@ -550,7 +550,7 @@ static void xf86FpitUninit(InputDriverPt - xf86DeleteInput(pInfo, 0); - } - --static char *default_options[] = { -+static const char *default_options[] = { - "BaudRate", "19200", "StopBits", "0", "DataBits", "8", "Parity", "None", "Vmin", "10", "Vtime", "1", "FlowControl", "None", NULL - }; - diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr deleted file mode 100644 index c743a5f7120c..000000000000 --- a/x11-drivers/xf86-input-fpit/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the X.Org xf86-input-fpit driver. - -WWW: https://www.x.org/ diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist deleted file mode 100644 index 977039d80a36..000000000000 --- a/x11-drivers/xf86-input-fpit/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/xorg/modules/input/fpit_drv.so -share/X11/xorg.conf.d/50-fpit.conf -man/man4/fpit.4x.gz diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile deleted file mode 100644 index 90c8f431b040..000000000000 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-input-hyperpen -PORTVERSION= 1.4.1 -PORTREVISION= 8 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org hyperpen input driver - -DEPRECATED=Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= driver - -.include diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo deleted file mode 100644 index 37edd2b8b967..000000000000 --- a/x11-drivers/xf86-input-hyperpen/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816 -SIZE (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 266891 diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-git_01_161f414 b/x11-drivers/xf86-input-hyperpen/files/patch-git_01_161f414 deleted file mode 100644 index 318353d239c5..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/patch-git_01_161f414 +++ /dev/null @@ -1,27 +0,0 @@ -From 161f41449bef339ce5bd1a3e87f6beac584c2074 Mon Sep 17 00:00:00 2001 -From: Terry Lambert -Date: Fri, 15 Jul 2011 17:23:21 -0700 -Subject: xf86-input-hyperpen: Return proper default for unknown values in - pInfo->device_control. - -Signed-off-by: Terry Lambert -Reviewed-by: Stephane Marchesin -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c -index 45ddfca..b0e5ac9 100644 ---- src/xf86HyperPen.c -+++ src/xf86HyperPen.c -@@ -729,8 +729,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) - - default: - ErrorF("unsupported mode=%d\n", what); -- return !Success; -- break; -+ return BadValue; - } - DBG(2, ErrorF("END xf86HypProc Success what=%d dev=%p priv=%p\n", - what, (void *)pHyp, (void *)priv)); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-git_02_b2ef09f b/x11-drivers/xf86-input-hyperpen/files/patch-git_02_b2ef09f deleted file mode 100644 index 70ac05c21a4f..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/patch-git_02_b2ef09f +++ /dev/null @@ -1,33 +0,0 @@ -From b2ef09f6c4034dec03898df7f8024fc58794b055 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:40:19 +1000 -Subject: Don't free anything in PreInit, let UnInit take care of it. - -The server calls UnInit, avoid double free's by letting the server free -everything. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c -index b0e5ac9..52a6e4f 100644 ---- src/xf86HyperPen.c -+++ src/xf86HyperPen.c -@@ -973,14 +973,9 @@ xf86HypInit(InputDriverPtr drv, - } - } - -- return rc; -- - SetupProc_fail: -- if (priv) -- free(priv); -- if (pInfo) -- free(pInfo); - return rc; -+ - } - - _X_EXPORT InputDriverRec HYPERPEN = { --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-git_03_02a74cf b/x11-drivers/xf86-input-hyperpen/files/patch-git_03_02a74cf deleted file mode 100644 index c66f8870b7a6..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/patch-git_03_02a74cf +++ /dev/null @@ -1,25 +0,0 @@ -From 02a74cfd0ba5ac0190307a63189ac643644b7574 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:41:24 +1000 -Subject: Use xf86SetStrOption for Option Device - -Let the device be printed in the logs - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c -index 52a6e4f..320add5 100644 ---- src/xf86HyperPen.c -+++ src/xf86HyperPen.c -@@ -827,7 +827,7 @@ xf86HypInit(InputDriverPtr drv, - } - - /* Serial Device is mandatory */ -- priv->hypDevice = xf86FindOptionValue(pInfo->options, "Device"); -+ priv->hypDevice = xf86SetStrOption(pInfo->options, "Device", NULL); - - if (!priv->hypDevice) { - xf86Msg (X_ERROR, "%s: No Device specified.\n", pInfo->name); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-git_04_6d660b0 b/x11-drivers/xf86-input-hyperpen/files/patch-git_04_6d660b0 deleted file mode 100644 index 76281f174a44..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/patch-git_04_6d660b0 +++ /dev/null @@ -1,29 +0,0 @@ -From 6d660b0439973d2ee0c550e3413d75bd57763243 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:42:43 +1000 -Subject: Test device in PreInit, fail if it cannot be opened. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c -index 320add5..8b9011e 100644 ---- src/xf86HyperPen.c -+++ src/xf86HyperPen.c -@@ -833,6 +833,14 @@ xf86HypInit(InputDriverPtr drv, - xf86Msg (X_ERROR, "%s: No Device specified.\n", pInfo->name); - rc = BadMatch; - goto SetupProc_fail; -+ } else { -+ pInfo->fd = xf86OpenSerial(pInfo->options); -+ if (pInfo->fd == -1) { -+ xf86Msg (X_ERROR, "%s: cannot open device '%s'\n", pInfo->name, priv->hypDevice); -+ return BadValue; -+ } -+ xf86CloseSerial(pInfo->fd); -+ pInfo->fd = -1; - } - - pInfo->private = priv; --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-git_06_2c03719 b/x11-drivers/xf86-input-hyperpen/files/patch-git_06_2c03719 deleted file mode 100644 index a6fbb6a20723..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/patch-git_06_2c03719 +++ /dev/null @@ -1,21 +0,0 @@ -From 2c037196bcc50cb299bc768124404b38cb67c087 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Sun, 20 May 2012 10:59:09 +0200 -Subject: src/Makefile.am: set AM_CFLAGS correctly. - - -diff --git a/src/Makefile.am b/src/Makefile.am -index dbb7ae0..e7fae3f 100644 ---- src/Makefile.am -+++ src/Makefile.am -@@ -24,6 +24,7 @@ - # -avoid-version prevents gratuitous .0.0.0 version numbers on the end - # _ladir passes a dummy rpath to libtool so the thing will actually link - # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -+AM_CFLAGS = $(XORG_CFLAGS) - @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la - @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version - @DRIVER_NAME@_drv_ladir = @inputdir@ --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c b/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c deleted file mode 100644 index 912ee4dcdc20..000000000000 --- a/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c +++ /dev/null @@ -1,85 +0,0 @@ -# Finish converting use of Error to ErrorF -# Correct a couple strings that should be const -# ---- src/xf86HyperPen.c.orig 2011-07-05 01:34:17 UTC -+++ src/xf86HyperPen.c -@@ -66,7 +66,7 @@ - * read a full packet before returning - */ - --static char *default_options[] = { -+static const char *default_options[] = { - "BaudRate", "9600", - "DataBits", "8", - "StopBits", "1", -@@ -212,7 +212,7 @@ xf86HypReadInput(InputInfoPtr pInfo) - SYSCALL(len = read(pInfo->fd, buffer, sizeof(buffer))); - - if (len <= 0) { -- Error("error reading HyperPen device"); -+ ErrorF("error reading HyperPen device\n"); - return; - } - -@@ -372,14 +372,14 @@ xf86HypWriteAndRead(int fd, char *data, - - SYSCALL(err = write(fd, data, strlen(data))); - if (err == -1) { -- Error("HyperPen write"); -+ ErrorF("HyperPen write\n"); - return NULL; - } - - while (numread < len) { - err = xf86WaitForInput(fd, 100000); - if (err == -1) { -- Error("HyperPen select"); -+ ErrorF("HyperPen select\n"); - return NULL; - } - if (!err) { -@@ -389,7 +389,7 @@ xf86HypWriteAndRead(int fd, char *data, - - SYSCALL(err = read(fd, buffer + numread++, 1)); - if (err == -1) { -- Error("HyperPen read"); -+ ErrorF("HyperPen read\n"); - return NULL; - } - if (!err) { -@@ -431,7 +431,7 @@ xf86HypOpen(InputInfoPtr pInfo) - - pInfo->fd = xf86OpenSerial(pInfo->options); - if (pInfo->fd == -1) { -- Error(priv->hypDevice); -+ ErrorF("failed to open %s\n", priv->hypDevice); - return !Success; - } - DBG(2, ErrorF("%s opened as fd %d\n", priv->hypDevice, pInfo->fd)); -@@ -449,7 +449,7 @@ xf86HypOpen(InputInfoPtr pInfo) - /* Put it in prompt mode so it doesn't say anything before we're ready */ - SYSCALL(err = write(pInfo->fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE))); - if (err == -1) { -- Error("HyperPen write"); -+ ErrorF("HyperPen write\n"); - return !Success; - } - /* Clear any pending input */ -@@ -578,7 +578,7 @@ xf86HypOpen(InputInfoPtr pInfo) - SYSCALL(err = write(pInfo->fd, buffer, idx)); - - if (err == -1) { -- Error("HyperPen write"); -+ ErrorF("HyperPen write\n"); - return !Success; - } - -@@ -819,7 +819,7 @@ xf86HypInit(InputDriverPtr drv, - int flags) - { - HyperPenDevicePtr priv = malloc(sizeof(HyperPenDeviceRec)); -- char *s; -+ const char *s; - int rc = Success; - - if (!priv) { diff --git a/x11-drivers/xf86-input-hyperpen/pkg-descr b/x11-drivers/xf86-input-hyperpen/pkg-descr deleted file mode 100644 index 34d150d694d6..000000000000 --- a/x11-drivers/xf86-input-hyperpen/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the X.Org xf86-input-hyperpen driver. - -WWW: https://www.x.org/ diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist deleted file mode 100644 index 7633c5494cbc..000000000000 --- a/x11-drivers/xf86-input-hyperpen/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/xorg/modules/input/hyperpen_drv.so diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile deleted file mode 100644 index 649ca917166d..000000000000 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-input-mutouch -PORTVERSION= 1.3.0 -PORTREVISION= 8 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org mutouch input driver - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= driver - -.include diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo deleted file mode 100644 index 1dceb72d17a2..000000000000 --- a/x11-drivers/xf86-input-mutouch/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = e28907ec71f010353550e897c7a1f161b59969c6ad84379fb5285e032448a43c -SIZE (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = 268865 diff --git a/x11-drivers/xf86-input-mutouch/files/patch-git_01_066b889 b/x11-drivers/xf86-input-mutouch/files/patch-git_01_066b889 deleted file mode 100644 index fa1c72972cf9..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-git_01_066b889 +++ /dev/null @@ -1,29 +0,0 @@ -From 066b889695316c2bf45c95ad80f793d72ec0db75 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 8 Jul 2011 15:01:26 +1000 -Subject: Remove option DeviceName. - -If you can set Option DeviceName, you should also be able to set Identifier -instead. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c -index 290fa11..a3fec4b 100644 ---- src/xf86MuTouch.c -+++ src/xf86MuTouch.c -@@ -1135,11 +1135,6 @@ xf86MuTInit(InputDriverPtr drv, - /* Process the common options. */ - xf86ProcessCommonOptions(pInfo, pInfo->options); - -- str = xf86FindOptionValue(pInfo->options, "DeviceName"); -- if (str) { -- pInfo->name = strdup(str); -- } -- xf86Msg(X_CONFIG, "MuTouch X device name: %s\n", pInfo->name); - priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0); - xf86Msg(X_CONFIG, "MuTouch associated screen: %d\n", priv->screen_no); - priv->max_x = xf86SetIntOption(pInfo->options, "MaxX", 3000); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-mutouch/files/patch-git_02_7b06397 b/x11-drivers/xf86-input-mutouch/files/patch-git_02_7b06397 deleted file mode 100644 index b5f9fe297ae5..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-git_02_7b06397 +++ /dev/null @@ -1,25 +0,0 @@ -From 7b063972e8ebbb244c8d92d8df194c5df9f015bc Mon Sep 17 00:00:00 2001 -From: Terry Lambert -Date: Fri, 15 Jul 2011 17:23:23 -0700 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert -Reviewed-by: Stephane Marchesin -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c -index a3fec4b..3b9b6b8 100644 ---- src/xf86MuTouch.c -+++ src/xf86MuTouch.c -@@ -944,7 +944,7 @@ xf86MuTControl(DeviceIntPtr dev, - - default: - ErrorF("unsupported mode=%d\n", mode); -- return !Success; -+ return BadValue; - } - } - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-mutouch/files/patch-git_03_7bf5e0d b/x11-drivers/xf86-input-mutouch/files/patch-git_03_7bf5e0d deleted file mode 100644 index 904c4db87065..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-git_03_7bf5e0d +++ /dev/null @@ -1,36 +0,0 @@ -From 7bf5e0d8c1863079330196dbe0efb230d74eeb70 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:57:00 +1000 -Subject: =?UTF-8?q?Use=20xf86SetStrOption=20for=20Type=20and=20Device=20?= - =?UTF-8?q?=E2=86=92=20prints=20to=20the=20log?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c -index 3b9b6b8..b35d1da 100644 ---- src/xf86MuTouch.c -+++ src/xf86MuTouch.c -@@ -1074,7 +1074,7 @@ xf86MuTInit(InputDriverPtr drv, - int portrait=0; - int rc = Success; - -- str = xf86FindOptionValue(pInfo->options, "Type"); -+ str = xf86SetStrOption(pInfo->options, "Type", NULL); - if (str && (xf86NameCmp(str, "finger") == 0)) { - rc = xf86MuTAllocateFinger(drv, pInfo); - } -@@ -1091,7 +1091,7 @@ xf86MuTInit(InputDriverPtr drv, - } - priv = pInfo->private; - -- str = xf86FindOptionValue(pInfo->options, "Device"); -+ str = xf86SetStrOption(pInfo->options, "Device", NULL); - if (!str) { - xf86Msg(X_ERROR, "%s: No Device specified in MuTouch module config.\n", - pInfo->name); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-mutouch/files/patch-git_04_ea858f9 b/x11-drivers/xf86-input-mutouch/files/patch-git_04_ea858f9 deleted file mode 100644 index 69b31a921c32..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-git_04_ea858f9 +++ /dev/null @@ -1,32 +0,0 @@ -From ea858f9e49c06b2728dc91c62616533a01ff484c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:57:32 +1000 -Subject: Don't free on PreInit failure, the server calls UnInit for us later - -DuSigned-off-by: Peter Hutterer - -diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c -index b35d1da..1d56efd 100644 ---- src/xf86MuTouch.c -+++ src/xf86MuTouch.c -@@ -1214,16 +1214,9 @@ xf86MuTInit(InputDriverPtr drv, - priv->swap_axes = (priv->swap_axes==0) ? 1 : 0; - } - -- return Success; -+ rc = Success; - - init_err: -- if (priv) { -- if (priv->input_dev) { -- free(priv->input_dev); -- } -- free(priv); -- pInfo->private = NULL; -- } - return rc; - } - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-mutouch/files/patch-git_05_7bd05fe b/x11-drivers/xf86-input-mutouch/files/patch-git_05_7bd05fe deleted file mode 100644 index 4ebb14da84bc..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-git_05_7bd05fe +++ /dev/null @@ -1,30 +0,0 @@ -From 7bd05fe5ed04be7abcccac2ce42d939f585ed41d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 12:59:31 +1000 -Subject: Test-open device in PreInit, fail if it doesn't work. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c -index 1d56efd..fd0b930 100644 ---- src/xf86MuTouch.c -+++ src/xf86MuTouch.c -@@ -1097,6 +1097,15 @@ xf86MuTInit(InputDriverPtr drv, - pInfo->name); - rc = BadValue; - goto init_err; -+ } else { -+ pInfo->fd = xf86OpenSerial(pInfo->options); -+ if (pInfo->fd < 0) { -+ xf86Msg(X_ERROR, "%s: Unable to open MuTouch touchscreen device '%s'\n", pInfo->name, str); -+ rc = BadValue; -+ goto init_err; -+ } -+ close(pInfo->fd); -+ pInfo->fd = -1; - } - priv->input_dev = strdup(str); - --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c b/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c deleted file mode 100644 index 0b9d11c4a247..000000000000 --- a/x11-drivers/xf86-input-mutouch/files/patch-src_xf86MuTouch.c +++ /dev/null @@ -1,60 +0,0 @@ -# Finish converting AddEnabledDevice to xf86AddEnabledDevice -# Finish converting use of Error to ErrorF -# Correct a couple strings that should be const -# ---- src/xf86MuTouch.c.orig 2011-06-28 01:31:38 UTC -+++ src/xf86MuTouch.c -@@ -267,7 +267,7 @@ xf86MuTReadInput(InputInfoPtr pInfo) - (char *) (priv->rec_buf + priv->num_old_bytes), - MuT_BUFFER_SIZE - priv->num_old_bytes)); - if (num_bytes < 0) { -- Error("System error while reading from MuTouch touchscreen."); -+ ErrorF("System error while reading from MuTouch touchscreen.\n"); - return; - } - -@@ -483,7 +483,7 @@ xf86MuTGetReply(unsigned char *buffer, - * Okay, give up. - */ - if (num_bytes < 0) { -- Error("System error while reading from MuTouch touchscreen."); -+ ErrorF("System error while reading from MuTouch touchscreen.\n"); - return !Success; - } - DBG(4, ErrorF("Read %d bytes of reply\n", num_bytes)); -@@ -789,7 +789,7 @@ xf86MuTControl(DeviceIntPtr dev, - DBG(2, ErrorF("MuTouch touchscreen opening : %s\n", priv->input_dev)); - pInfo->fd = xf86OpenSerial(pInfo->options); - if (pInfo->fd < 0) { -- Error("Unable to open MuTouch touchscreen device"); -+ ErrorF("Unable to open MuTouch touchscreen device\n"); - return !Success; - } - memset(req, 0, MuT_PACKET_SIZE); -@@ -845,7 +845,7 @@ xf86MuTControl(DeviceIntPtr dev, - goto not_success; - } - /* goto not_success;*/ -- AddEnabledDevice(pInfo->fd); -+ xf86AddEnabledDevice(pInfo); - } - - /* -@@ -1052,7 +1052,7 @@ xf86MuTUninit(InputDriverPtr drv, - xf86DeleteInput(pInfo, 0); - } - --static char *default_options[] = { -+static const char *default_options[] = { - "BaudRate", "9600", - "StopBits", "1", - "DataBits", "8", -@@ -1070,7 +1070,7 @@ xf86MuTInit(InputDriverPtr drv, - { - InputInfoPtr current; - MuTPrivatePtr priv=NULL; -- char *str; -+ const char *str; - int portrait=0; - int rc = Success; - diff --git a/x11-drivers/xf86-input-mutouch/pkg-descr b/x11-drivers/xf86-input-mutouch/pkg-descr deleted file mode 100644 index bfb8cd014371..000000000000 --- a/x11-drivers/xf86-input-mutouch/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the X.Org xf86-input-mutouch driver. - -WWW: https://www.x.org/ diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist deleted file mode 100644 index b578946222cb..000000000000 --- a/x11-drivers/xf86-input-mutouch/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/input/mutouch_drv.so -man/man4/mutouch.4x.gz diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile deleted file mode 100644 index b9bb0216a06b..000000000000 --- a/x11-drivers/xf86-input-penmount/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xf86-input-penmount -PORTVERSION= 1.5.0 -PORTREVISION= 8 -CATEGORIES= x11-drivers - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org penmount input driver - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= driver - -.include diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo deleted file mode 100644 index d8eaa47bf8ff..000000000000 --- a/x11-drivers/xf86-input-penmount/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7 -SIZE (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = 276864 diff --git a/x11-drivers/xf86-input-penmount/files/patch-git_01_f5aede2 b/x11-drivers/xf86-input-penmount/files/patch-git_01_f5aede2 deleted file mode 100644 index c7d9cac5ed5f..000000000000 --- a/x11-drivers/xf86-input-penmount/files/patch-git_01_f5aede2 +++ /dev/null @@ -1,28 +0,0 @@ -From f5aede2ed48f1cc7266e792b02f509f7b207e2d6 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 8 Jul 2011 14:26:16 +1000 -Subject: Don't override the device name. - -The device name comes from the xorg.conf (or the config backend). If you're -capable of setting the device name in the config, you can set it in the -Identifier line as well. - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86PM.c b/src/xf86PM.c -index edcf6f8..97e2134 100644 ---- src/xf86PM.c -+++ src/xf86PM.c -@@ -492,9 +492,6 @@ PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - goto SetupProc_fail; - } - -- /* this results in an xstrdup that must be freed later */ -- pInfo->name = xf86SetStrOption( pInfo->options, "DeviceName", "PenMount"); -- - return Success; - - SetupProc_fail: --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-penmount/files/patch-git_02_ff389f9 b/x11-drivers/xf86-input-penmount/files/patch-git_02_ff389f9 deleted file mode 100644 index f4bf5b22be4f..000000000000 --- a/x11-drivers/xf86-input-penmount/files/patch-git_02_ff389f9 +++ /dev/null @@ -1,82 +0,0 @@ -From ff389f91a2efec5184b56b8c717091d067f8fc46 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 19 Jul 2011 13:07:41 +1000 -Subject: Don't free anything in PreInit, let the server call UnInit instead - -Signed-off-by: Peter Hutterer - -diff --git a/src/xf86PM.c b/src/xf86PM.c -index 97e2134..ef73164 100644 ---- src/xf86PM.c -+++ src/xf86PM.c -@@ -79,7 +79,7 @@ _X_EXPORT InputDriverRec PENMOUNT = { - "penmount", - NULL, - PenMountPreInit, -- /*PenMountUnInit*/NULL, -+ PenMountUnInit, - NULL, - default_options - }; -@@ -275,6 +275,7 @@ ProcessDeviceClose(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo - priv->buffer = NULL; - } - xf86CloseSerial(pInfo->fd); -+ pInfo->fd = -1; - } - dev->public.on = FALSE; - return (Success); -@@ -454,6 +455,8 @@ PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - goto SetupProc_fail; - } - xf86CloseSerial(pInfo->fd); -+ pInfo->fd = -1; -+ - /* - * Process the options for your device like this - */ -@@ -495,16 +498,21 @@ PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return Success; - - SetupProc_fail: -- if ((pInfo) && (pInfo->fd)) -- xf86CloseSerial (pInfo->fd); -- if ((pInfo) && (pInfo->name)) -- free (pInfo->name); -+ return BadValue; -+} -+ -+static void -+PenMountUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) -+{ -+ PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private); - -- if ((priv) && (priv->buffer)) -- XisbFree (priv->buffer); - if (priv) -+ { -+ if (priv->buffer) -+ XisbFree (priv->buffer); - free (priv); -- return BadValue; -+ pInfo->private = NULL; -+ } - } - - static Bool -diff --git a/src/xf86PM.h b/src/xf86PM.h -index 5183f91..88da048 100644 ---- src/xf86PM.h -+++ src/xf86PM.h -@@ -93,6 +93,8 @@ static Bool PenMountSendPacket (PenMountPrivatePtr priv, unsigned char *buf, int - - static int - PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags); -+static void -+PenMountUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags); - - static void - PenMountPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl); --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-input-penmount/files/patch-src_xf86PM.c b/x11-drivers/xf86-input-penmount/files/patch-src_xf86PM.c deleted file mode 100644 index a3c419ddd5a5..000000000000 --- a/x11-drivers/xf86-input-penmount/files/patch-src_xf86PM.c +++ /dev/null @@ -1,69 +0,0 @@ -# Finish converting AddEnabledDefice to xf86AddEnabledDevice -# Correct a couple strings that should be const -# Remove use of obsolete xf86XInputSetScreen -# ---- src/xf86PM.c.orig 2011-06-28 00:37:48 UTC -+++ src/xf86PM.c -@@ -61,7 +61,7 @@ - * Be sure to set vmin appropriately for your device's protocol. You want to - * read a full packet before returning - */ --static char *default_options[] = -+static const char *default_options[] = - { - /* "Device", "/dev/ttyS1",*/ - "BaudRate", "19200", -@@ -258,7 +258,7 @@ DMC9000_ProcessDeviceOn(PenMountPrivateP - priv->lex_mode = PenMount_byte0; - - xf86FlushInput(pInfo->fd); -- AddEnabledDevice (pInfo->fd); -+ xf86AddEnabledDevice (pInfo); - dev->public.on = TRUE; - return (Success); - } -@@ -268,7 +268,7 @@ ProcessDeviceClose(PenMountPrivatePtr pr - { - if (pInfo->fd != -1) - { -- RemoveEnabledDevice (pInfo->fd); -+ xf86RemoveEnabledDevice (pInfo); - if (priv->buffer) - { - XisbFree(priv->buffer); -@@ -418,7 +418,7 @@ static int - PenMountPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - { - PenMountPrivatePtr priv = calloc (1, sizeof (PenMountPrivateRec)); -- char *s; -+ const char *s; - - if (!priv) - return BadAlloc; -@@ -603,7 +603,7 @@ DeviceControl (DeviceIntPtr dev, int mod - priv->lex_mode = PenMount_byte0; - - xf86FlushInput(pInfo->fd); -- AddEnabledDevice (pInfo->fd); -+ xf86AddEnabledDevice (pInfo); - dev->public.on = TRUE; - return (Success); - -@@ -696,7 +696,7 @@ ReadInput (InputInfoPtr pInfo) - priv->max_y); - } - -- xf86XInputSetScreen (pInfo, priv->screen_num, x, y); -+ //xf86XInputSetScreen (pInfo, priv->screen_num, x, y); - - if ((priv->proximity == FALSE) && (priv->packet[0] & 0x01)) - { -@@ -796,7 +796,7 @@ DMC9000_ReadInput (InputInfoPtr pInfo) - } - - -- xf86XInputSetScreen (pInfo, priv->screen_num, x, y); -+ //xf86XInputSetScreen (pInfo, priv->screen_num, x, y); - - if ((priv->proximity == FALSE) && (priv->packet[0] & 0x01)) - { diff --git a/x11-drivers/xf86-input-penmount/pkg-descr b/x11-drivers/xf86-input-penmount/pkg-descr deleted file mode 100644 index ea15a1e1b21f..000000000000 --- a/x11-drivers/xf86-input-penmount/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains the X.Org xf86-input-penmount driver. - -- Florent Thoumie -flz@FreeBSD.org diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist deleted file mode 100644 index d68df5d7b97c..000000000000 --- a/x11-drivers/xf86-input-penmount/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/xorg/modules/input/penmount_drv.so -man/man4/penmount.4x.gz diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile index 5a6b1ebc140c..9684cb23f744 100644 --- a/x11-fonts/Makefile +++ b/x11-fonts/Makefile @@ -69,7 +69,6 @@ SUBDIR += font-bh-type1 SUBDIR += font-bitstream-100dpi SUBDIR += font-bitstream-75dpi - SUBDIR += font-bitstream-speedo SUBDIR += font-bitstream-type1 SUBDIR += font-cronyx-cyrillic SUBDIR += font-cursor-misc @@ -136,7 +135,6 @@ SUBDIR += libFS SUBDIR += libXfont SUBDIR += libXfont2 - SUBDIR += libXfontcache SUBDIR += libXft SUBDIR += liberation-fonts-ttf SUBDIR += libfontenc diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile deleted file mode 100644 index d823c2a8861f..000000000000 --- a/x11-fonts/font-bitstream-speedo/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTNAME= font-bitstream-speedo -PORTVERSION= 1.0.2 -PORTREVISION= 4 -CATEGORIES= x11-fonts - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org Bitstream Vera Speedo font - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= font - -.include diff --git a/x11-fonts/font-bitstream-speedo/distinfo b/x11-fonts/font-bitstream-speedo/distinfo deleted file mode 100644 index d5b4092a986f..000000000000 --- a/x11-fonts/font-bitstream-speedo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/font/font-bitstream-speedo-1.0.2.tar.bz2) = 0708fe0046947b88c082b55844af8a861741dcdf087f0624bdf23fb773d76763 -SIZE (xorg/font/font-bitstream-speedo-1.0.2.tar.bz2) = 415776 diff --git a/x11-fonts/font-bitstream-speedo/pkg-descr b/x11-fonts/font-bitstream-speedo/pkg-descr deleted file mode 100644 index dfce9596d320..000000000000 --- a/x11-fonts/font-bitstream-speedo/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the X.Org Bitstream Vera Speedo font. - -WWW: https://www.x.org/ diff --git a/x11-fonts/font-bitstream-speedo/pkg-plist b/x11-fonts/font-bitstream-speedo/pkg-plist deleted file mode 100644 index f36cc423c14b..000000000000 --- a/x11-fonts/font-bitstream-speedo/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -%%FONTSDIR%%/font0419.spd -%%FONTSDIR%%/font0582.spd -%%FONTSDIR%%/font0583.spd -%%FONTSDIR%%/font0611.spd -%%FONTSDIR%%/font0648.spd -%%FONTSDIR%%/font0649.spd -%%FONTSDIR%%/font0709.spd -%%FONTSDIR%%/font0710.spd diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile deleted file mode 100644 index d58f90439926..000000000000 --- a/x11-fonts/libXfontcache/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PORTNAME= libXfontcache -PORTVERSION= 1.0.5 -PORTREVISION= 5 -CATEGORIES= x11-fonts - -MAINTAINER= x11@FreeBSD.org -COMMENT= The Xfontcache library - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= lib -USE_XORG= x11 xext xorgproto - -.include diff --git a/x11-fonts/libXfontcache/distinfo b/x11-fonts/libXfontcache/distinfo deleted file mode 100644 index c775f239202d..000000000000 --- a/x11-fonts/libXfontcache/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/lib/libXfontcache-1.0.5.tar.bz2) = 0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce -SIZE (xorg/lib/libXfontcache-1.0.5.tar.bz2) = 240293 diff --git a/x11-fonts/libXfontcache/pkg-descr b/x11-fonts/libXfontcache/pkg-descr deleted file mode 100644 index 54040317f9f2..000000000000 --- a/x11-fonts/libXfontcache/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains libXfontcache, the X.Org Xfontcache library. - -WWW: https://www.x.org/ diff --git a/x11-fonts/libXfontcache/pkg-plist b/x11-fonts/libXfontcache/pkg-plist deleted file mode 100644 index 5916438bc4d6..000000000000 --- a/x11-fonts/libXfontcache/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -lib/libXfontcache.a -lib/libXfontcache.so -lib/libXfontcache.so.1 -lib/libXfontcache.so.1.0.0 -libdata/pkgconfig/xfontcache.pc -man/man3/FontCacheChangeCacheSettings.3.gz -man/man3/FontCacheQueryExtension.3.gz -man/man3/FontCacheQueryVersion.3.gz -man/man3/FontCacheGetCacheSettings.3.gz -man/man3/FontCacheGetCacheStatistics.3.gz -man/man3/Xfontcache.3.gz diff --git a/x11/Makefile b/x11/Makefile index 33506c7bada5..fdbb150458b5 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -145,7 +145,6 @@ SUBDIR += libXcursor SUBDIR += libXdamage SUBDIR += libXdmcp - SUBDIR += libXevie SUBDIR += libXext SUBDIR += libXfixes SUBDIR += libXi @@ -174,7 +173,6 @@ SUBDIR += libgnomemm26 SUBDIR += libinput SUBDIR += libmatekbd - SUBDIR += liboldX SUBDIR += libsx SUBDIR += libsynaptics SUBDIR += libwacom @@ -184,7 +182,6 @@ SUBDIR += libxfce4util SUBDIR += libxkbcommon SUBDIR += libxkbfile - SUBDIR += libxkbui SUBDIR += libxklavier SUBDIR += libxshmfence SUBDIR += lightdm @@ -483,7 +480,6 @@ SUBDIR += xrootconsole SUBDIR += xrsh SUBDIR += xrsi - SUBDIR += xrx SUBDIR += xscope SUBDIR += xscreensaver SUBDIR += xscreensaver-gnome @@ -491,7 +487,6 @@ SUBDIR += xscreensaver.app SUBDIR += xsel-conrad SUBDIR += xset - SUBDIR += xsetmode SUBDIR += xsetpointer SUBDIR += xsetroot SUBDIR += xsettingsd diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile deleted file mode 100644 index 90d06a592811..000000000000 --- a/x11/libXevie/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $FreeBSD$ - -PORTNAME= libXevie -PORTVERSION= 1.0.3 -PORTREVISION= 5 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= The Xevie library - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -LICENSE= MIT - -XORG_CAT= lib -USE_XORG= x11 xext xorgproto - -.include diff --git a/x11/libXevie/distinfo b/x11/libXevie/distinfo deleted file mode 100644 index 9fb15fe4d192..000000000000 --- a/x11/libXevie/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/lib/libXevie-1.0.3.tar.bz2) = c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73 -SIZE (xorg/lib/libXevie-1.0.3.tar.bz2) = 253286 diff --git a/x11/libXevie/pkg-descr b/x11/libXevie/pkg-descr deleted file mode 100644 index 88bbdb3950da..000000000000 --- a/x11/libXevie/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains libXevie, the X.Org Xevie library. - -WWW: https://www.freedesktop.org/wiki/Software/xlibs/ diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist deleted file mode 100644 index c2e3a0a1885f..000000000000 --- a/x11/libXevie/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -include/X11/extensions/Xevie.h -lib/libXevie.a -lib/libXevie.so -lib/libXevie.so.1 -lib/libXevie.so.1.0.0 -libdata/pkgconfig/xevie.pc -man/man3/Xevie.3.gz -man/man3/XevieEnd.3.gz -man/man3/XevieQueryVersion.3.gz -man/man3/XevieSelectInput.3.gz -man/man3/XevieSendEvent.3.gz -man/man3/XevieStart.3.gz diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile deleted file mode 100644 index ddb40c13bcf5..000000000000 --- a/x11/liboldX/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PORTNAME= liboldX -PORTVERSION= 1.0.1 -PORTREVISION= 3 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Old X library - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= lib -USE_XORG= x11 - -.include diff --git a/x11/liboldX/distinfo b/x11/liboldX/distinfo deleted file mode 100644 index 73a384c70b7d..000000000000 --- a/x11/liboldX/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/lib/liboldX-1.0.1.tar.bz2) = 1091d301f5e28f84e5d755a5cde9d2f7edb82b799d051522751874571e10340f -SIZE (xorg/lib/liboldX-1.0.1.tar.bz2) = 215694 diff --git a/x11/liboldX/pkg-descr b/x11/liboldX/pkg-descr deleted file mode 100644 index 5db771e85328..000000000000 --- a/x11/liboldX/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the old X library. - -WWW: http://www.freedesktop.org/Software/xlibs diff --git a/x11/liboldX/pkg-plist b/x11/liboldX/pkg-plist deleted file mode 100644 index 0d45ec9b9b54..000000000000 --- a/x11/liboldX/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -include/X11/X10.h -lib/liboldX.a -lib/liboldX.so -lib/liboldX.so.6 -lib/liboldX.so.6.0.0 -libdata/pkgconfig/oldx.pc diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile deleted file mode 100644 index fd573fea73e8..000000000000 --- a/x11/libxkbui/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Eric Anholt -# $FreeBSD$ - -PORTNAME= libxkbui -PORTVERSION= 1.0.2 -PORTREVISION= 6 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= The xkbui library - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= lib -USE_XORG= x11 xt xkbfile xorgproto -.include diff --git a/x11/libxkbui/distinfo b/x11/libxkbui/distinfo deleted file mode 100644 index e1ac833ef3ee..000000000000 --- a/x11/libxkbui/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/lib/libxkbui-1.0.2.tar.bz2) = 20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214 -SIZE (xorg/lib/libxkbui-1.0.2.tar.bz2) = 221435 diff --git a/x11/libxkbui/pkg-descr b/x11/libxkbui/pkg-descr deleted file mode 100644 index 17905a8f40b7..000000000000 --- a/x11/libxkbui/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains the xkbui library. - -WWW: http://www.freedesktop.org/Software/xorg diff --git a/x11/libxkbui/pkg-plist b/x11/libxkbui/pkg-plist deleted file mode 100644 index 63af4b9e70ba..000000000000 --- a/x11/libxkbui/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -include/X11/extensions/XKBui.h -lib/libxkbui.a -lib/libxkbui.so -lib/libxkbui.so.1 -lib/libxkbui.so.1.0.0 -libdata/pkgconfig/xkbui.pc diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile deleted file mode 100644 index 3f6059ca102f..000000000000 --- a/x11/xrx/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xrx -PORTVERSION= 1.0.4 -PORTREVISION= 5 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= RX helper program - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= app -USE_XORG= x11 xt xext xtrans xorgproto xau xaw ice -USES= libtool -USE_LDCONFIG= yes - -post-patch: - @${REINPLACE_CMD} -e 's|mozilla-plugin|disabled-libxul-plugin|g' \ - ${WRKSRC}/configure - -.include diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo deleted file mode 100644 index 35a2505605e1..000000000000 --- a/x11/xrx/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/app/xrx-1.0.4.tar.bz2) = b5eb5ecae105ed4d3b2c91193a1c2ef9fe51b1145190541a59f92645899763a4 -SIZE (xorg/app/xrx-1.0.4.tar.bz2) = 338140 diff --git a/x11/xrx/pkg-descr b/x11/xrx/pkg-descr deleted file mode 100644 index 20fe836aa763..000000000000 --- a/x11/xrx/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains xrx, an RX helper program which can be used with -any web browser to interpret documents in the RX MIME type format and -start remote applications. diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist deleted file mode 100644 index 9e87b41db22e..000000000000 --- a/x11/xrx/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/xrx -lib/libxrx.a -lib/libxrx.so -lib/libxrxnest.a -lib/libxrxnest.so -man/man1/xrx.1.gz -man/man1/libxrx.1.gz diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile deleted file mode 100644 index 368421b3bede..000000000000 --- a/x11/xsetmode/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xsetmode -PORTVERSION= 1.0.0 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Set the mode for an X Input Device - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= app -USE_XORG= xi x11 - -PLIST_FILES= bin/xsetmode man/man1/xsetmode.1.gz - -.include diff --git a/x11/xsetmode/distinfo b/x11/xsetmode/distinfo deleted file mode 100644 index 1dae93f2eb87..000000000000 --- a/x11/xsetmode/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/app/xsetmode-1.0.0.tar.bz2) = 988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa -SIZE (xorg/app/xsetmode-1.0.0.tar.bz2) = 73757 diff --git a/x11/xsetmode/pkg-descr b/x11/xsetmode/pkg-descr deleted file mode 100644 index ae58f8837d0c..000000000000 --- a/x11/xsetmode/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This package contains xsetmode, which is a program for setting the mode -of an X Input device to either absolute och relative. diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile deleted file mode 100644 index 592fd6dca77b..000000000000 --- a/x11/xsetpointer/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ - -PORTNAME= xsetpointer -PORTVERSION= 1.0.1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Set an X Input device as the main pointer - -DEPRECATED= Deprecated upstream -EXPIRATION_DATE=2019-10-15 - -XORG_CAT= app -USE_XORG= xi x11 - -PLIST_FILES= bin/xsetpointer man/man1/xsetpointer.1.gz - -.include diff --git a/x11/xsetpointer/distinfo b/x11/xsetpointer/distinfo deleted file mode 100644 index 14641c1f2b87..000000000000 --- a/x11/xsetpointer/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xorg/app/xsetpointer-1.0.1.tar.bz2) = 495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571 -SIZE (xorg/app/xsetpointer-1.0.1.tar.bz2) = 83260 diff --git a/x11/xsetpointer/pkg-descr b/x11/xsetpointer/pkg-descr deleted file mode 100644 index ebcd3e9f3a1e..000000000000 --- a/x11/xsetpointer/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This package contains xsetpointer, which sets an X Input device -as the main pointer.