cleanup: Remove expired ports:

2022-09-04 x11-drivers/xf86-video-trident: Broken with recent xorg, no fixes upstream
2022-09-04 x11-drivers/xf86-video-s3: Broken with recent xorg, no fixes upstream
2022-09-04 x11-drivers/xf86-video-glint: Broken with recent xorg, no fixes upstream

18 files changed, 3 insertions, 139 deletions

diff --git a/MOVED b/MOVED
index 2172f0596f52..99a8d0ea4dab 100644
--- a/MOVED
+++ b/MOVED
@@ -17547,3 +17547,6 @@ java/openjdk7||2022-09-03|Has expired: EOLed since 31 July 2022
 java/openjdk7-jre||2022-09-03|Has expired: EOLed since 31 July 2022
 devel/py-logfury0|devel/py-logfury|2022-09-04|Remove obsoleted port. Use devel/py-logfury instead
 www/py-beautifulsoup449|www/py-beautifulsoup|2022-09-04|Remove obsoleted port. Use www/py-beautifulsoup instead
+x11-drivers/xf86-video-trident||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
+x11-drivers/xf86-video-s3||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
+x11-drivers/xf86-video-glint||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
index 892b9bb50625..24e668fc50d8 100644
--- a/x11-drivers/Makefile
+++ b/x11-drivers/Makefile
@@ -20,7 +20,6 @@
     SUBDIR += xf86-video-cirrus
     SUBDIR += xf86-video-dummy
     SUBDIR += xf86-video-geode
-    SUBDIR += xf86-video-glint
     SUBDIR += xf86-video-i128
     SUBDIR += xf86-video-i740
     SUBDIR += xf86-video-intel
@@ -31,14 +30,12 @@
     SUBDIR += xf86-video-openchrome
     SUBDIR += xf86-video-r128
     SUBDIR += xf86-video-rendition
-    SUBDIR += xf86-video-s3
     SUBDIR += xf86-video-savage
     SUBDIR += xf86-video-scfb
     SUBDIR += xf86-video-siliconmotion
     SUBDIR += xf86-video-sis
     SUBDIR += xf86-video-sunffb
     SUBDIR += xf86-video-tdfx
-    SUBDIR += xf86-video-trident
     SUBDIR += xf86-video-vesa
     SUBDIR += xf86-video-vmware
     SUBDIR += xf86-video-voodoo
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
deleted file mode 100644
index bfc1545c894f..000000000000
--- a/x11-drivers/xf86-video-glint/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.9
-PORTREVISION=	7
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org glint display driver
-
-USES=		gl xorg-cat:driver
-USE_GL=		gl
-
-BROKEN=		Does not work with recent xorg
-DEPRECATED=	Broken with recent xorg, no fixes upstream
-EXPIRATION_DATE=	2022-09-04
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
deleted file mode 100644
index 0c26611aea19..000000000000
--- a/x11-drivers/xf86-video-glint/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1484715946
-SHA256 (xorg/driver/xf86-video-glint-1.2.9.tar.bz2) = 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2
-SIZE (xorg/driver/xf86-video-glint-1.2.9.tar.bz2) = 419524
diff --git a/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c b/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
deleted file mode 100644
index cea382aec998..000000000000
--- a/x11-drivers/xf86-video-glint/files/patch-src_glint__driver.c
+++ /dev/null
@@ -1,15 +0,0 @@
-# Correct the type of a few variables
-#
---- src/glint_driver.c.orig	2017-01-17 22:34:15 UTC
-+++ src/glint_driver.c
-@@ -1326,8 +1326,8 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flag
- 		    int basecopro = 
- 			PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
- 		    int basedelta = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM)  & 0xFFFFC000;
--		    int dummy;
--		    int base3copro, offset;
-+		    uint32_t dummy;
-+		    uint32_t base3copro, offset;
- 
-     		    if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
-  			if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) ||
diff --git a/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c b/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
deleted file mode 100644
index 73e6e93adb91..000000000000
--- a/x11-drivers/xf86-video-glint/files/patch-src_pm2__video.c
+++ /dev/null
@@ -1,22 +0,0 @@
-# Correct a couple strings that should be const
-#
---- src/pm2_video.c.orig	2013-02-07 07:55:44 UTC
-+++ src/pm2_video.c
-@@ -2593,7 +2593,7 @@ Permedia2ReadInput(int fd, pointer unuse
- }
- 
- static Bool
--xvipcOpen(char *name, ScrnInfoPtr pScrn)
-+xvipcOpen(const char *name, ScrnInfoPtr pScrn)
- {
-     const char *osname;
- 
-@@ -3170,7 +3170,7 @@ Permedia2VideoInit(ScreenPtr pScreen)
- 
-     if (VideoIO ? xf86XVScreenInit(pScreen, &VARPtrs[0], 3) :
- 		  xf86XVScreenInit(pScreen, &VARPtrs[2], 1)) {
--	char *s;
-+	const char *s;
- 
- 	xvEncoding	= MAKE_ATOM(XV_ENCODING);
- 	xvHue		= MAKE_ATOM(XV_HUE);
diff --git a/x11-drivers/xf86-video-glint/pkg-descr b/x11-drivers/xf86-video-glint/pkg-descr
deleted file mode 100644
index 66b8ea46293d..000000000000
--- a/x11-drivers/xf86-video-glint/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-glint driver.
-
-WWW: https://www.x.org/
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
deleted file mode 100644
index 2c29551cd132..000000000000
--- a/x11-drivers/xf86-video-glint/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/xorg/modules/drivers/glint_drv.so
-man/man4/glint.4x.gz
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
deleted file mode 100644
index 1ae31f34d3ec..000000000000
--- a/x11-drivers/xf86-video-s3/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PORTNAME=	xf86-video-s3
-PORTVERSION=	0.7.0
-PORTREVISION=	2
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org s3 display driver
-
-BROKEN=		Does not work with recent xorg
-DEPRECATED=	Broken with recent xorg, no fixes upstream
-EXPIRATION_DATE=	2022-09-04
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		xorg-cat:driver
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
deleted file mode 100644
index d804d03db506..000000000000
--- a/x11-drivers/xf86-video-s3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1566063488
-SHA256 (xorg/driver/xf86-video-s3-0.7.0.tar.bz2) = cf12541557d88107364895273e384f97836b428eeb1e54ed66511d69639562c8
-SIZE (xorg/driver/xf86-video-s3-0.7.0.tar.bz2) = 348923
diff --git a/x11-drivers/xf86-video-s3/pkg-descr b/x11-drivers/xf86-video-s3/pkg-descr
deleted file mode 100644
index 0dd29a4bd98d..000000000000
--- a/x11-drivers/xf86-video-s3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-s3 driver.
-
-WWW: https://www.x.org/
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
deleted file mode 100644
index 05f8563dfeaa..000000000000
--- a/x11-drivers/xf86-video-s3/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/xorg/modules/drivers/s3_drv.so
-man/man4/s3.4x.gz
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
deleted file mode 100644
index b93afb8b6568..000000000000
--- a/x11-drivers/xf86-video-trident/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-PORTNAME=	xf86-video-trident
-PORTVERSION=	1.3.8
-PORTREVISION=	5
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org trident display driver
-
-USES=		xorg-cat:driver
-
-BROKEN=		Does not work with recent xorg
-DEPRECATED=	Broken with recent xorg, no fixes upstream
-EXPIRATION_DATE=	2022-09-04
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
deleted file mode 100644
index 1175cb79cce7..000000000000
--- a/x11-drivers/xf86-video-trident/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1484716004
-SHA256 (xorg/driver/xf86-video-trident-1.3.8.tar.bz2) = 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f
-SIZE (xorg/driver/xf86-video-trident-1.3.8.tar.bz2) = 387742
diff --git a/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c b/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c
deleted file mode 100644
index a371871244be..000000000000
--- a/x11-drivers/xf86-video-trident/files/patch-src_trident__dac.c
+++ /dev/null
@@ -1,15 +0,0 @@
-# Fix a style warning
-#
---- src/trident_dac.c.orig	2013-02-07 07:56:43 UTC
-+++ src/trident_dac.c
-@@ -1226,8 +1226,8 @@ Tridentddc1Read(ScrnInfoPtr pScrn)
-     OUTW(0x3C4, (temp << 8) | NewMode1);
- 
-     /* Wait until vertical retrace is in progress. */
--    while (INB(vgaIOBase + 0xA) & 0x08);
--    while (!(INB(vgaIOBase + 0xA) & 0x08));
-+    while (INB(vgaIOBase + 0xA) & 0x08) {}
-+    while (!(INB(vgaIOBase + 0xA) & 0x08)) {}
- 
-     /* Get the result */
-     OUTB(vgaIOBase + 4, I2C);
diff --git a/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c b/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
deleted file mode 100644
index 08ff59985dcf..000000000000
--- a/x11-drivers/xf86-video-trident/files/patch-src_trident__driver.c
+++ /dev/null
@@ -1,13 +0,0 @@
-# Correct a string that should be const
-#
---- src/trident_driver.c.orig	2015-03-30 17:05:53 UTC
-+++ src/trident_driver.c
-@@ -1010,7 +1010,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int fl
-     ClockRangePtr clockRanges;
-     Bool ddcLoaded = FALSE;
-     xf86MonPtr pMon = NULL;
--    char *s;
-+    const char *s;
-     Bool tmp_bool;
- 
-     /* Allocate the TRIDENTRec driverPrivate */
diff --git a/x11-drivers/xf86-video-trident/pkg-descr b/x11-drivers/xf86-video-trident/pkg-descr
deleted file mode 100644
index b8727f46a8a0..000000000000
--- a/x11-drivers/xf86-video-trident/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-trident driver.
diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
deleted file mode 100644
index a2455c3fede6..000000000000
--- a/x11-drivers/xf86-video-trident/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/xorg/modules/drivers/trident_drv.so
-man/man4/trident.4x.gz