5 files changed, 14 insertions, 37 deletions

diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 3c60f7c82f9b..48aee38fb326 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.9
-PORTREVISION=	3
+PORTVERSION=	0.11.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org sis display driver
 
-USE_GL=		gl
+LICENSE=	BSD3CLAUSE MIT
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 XORG_CAT=	driver
 
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index 8fbcfe32bbbd..ed1f290c1cd1 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484715280
-SHA256 (xorg/driver/xf86-video-sis-0.10.9.tar.bz2) = 5226b7407c601afa32d6cbf155f9182da95d92cdc89c1f83471e1927e552c10d
-SIZE (xorg/driver/xf86-video-sis-0.10.9.tar.bz2) = 736272
+TIMESTAMP = 1566064121
+SHA256 (xorg/driver/xf86-video-sis-0.11.0.tar.bz2) = 2177901a21a980552f8be429f063388e4c5d5f2e24e8b0ce72d65bd93ccc3b6b
+SIZE (xorg/driver/xf86-video-sis-0.11.0.tar.bz2) = 735940
diff --git a/x11-drivers/xf86-video-sis/files/patch-src_initextx.c b/x11-drivers/xf86-video-sis/files/patch-src_initextx.c
index 24028baf3f01..ca312ba83b5f 100644
--- a/x11-drivers/xf86-video-sis/files/patch-src_initextx.c
+++ b/x11-drivers/xf86-video-sis/files/patch-src_initextx.c
@@ -1,19 +1,17 @@
 # Cast away warnings filling const strings
 #
---- src/initextx.c.orig	2015-08-29 23:34:25 UTC
+--- src/initextx.c.orig	2019-07-26 23:38:52 UTC
 +++ src/initextx.c
-@@ -252,8 +252,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+@@ -252,7 +252,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc
  
        current = new;
  
--      sprintf(current->name, "%dx%d", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
--				      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
-+      sprintf((char *)current->name, "%dx%d", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
-+					      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
+-      sprintf(current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
++      sprintf((char *)current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
+ 				      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
  
        current->status = MODE_OK;
- 
-@@ -402,7 +402,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+@@ -402,7 +402,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc
  
  		  pSiS->AddedPlasmaModes = TRUE;
  
@@ -22,7 +20,7 @@
  
  		  current->status = MODE_OK;
  
-@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+@@ -485,8 +485,8 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN inc
  
  	    current = new;
  
diff --git a/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
index 68990d2c4305..a52b5421b443 100644
--- a/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
+++ b/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
@@ -3,15 +3,6 @@
 #
 --- src/sis_driver.c.orig	2017-01-17 22:45:12 UTC
 +++ src/sis_driver.c
-@@ -1305,7 +1305,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, Disp
-  * (Code base taken from mga driver)
-  */
- static DisplayModePtr
--SiSGetModeFromName(char* str, DisplayModePtr i)
-+SiSGetModeFromName(const char* str, DisplayModePtr i)
- {
-     DisplayModePtr c = i;
-     if(!i) return NULL;
 @@ -6065,7 +6065,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
  	        free(newm);
  		break;
diff --git a/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c b/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c
deleted file mode 100644
index 2abc943a366a..000000000000
--- a/x11-drivers/xf86-video-sis/files/patch-src_sis__utility.c
+++ /dev/null
@@ -1,13 +0,0 @@
-# Correct a string that should be const
-#
---- src/sis_utility.c.orig	2015-08-29 23:34:25 UTC
-+++ src/sis_utility.c
-@@ -850,7 +850,7 @@ SISGetMergedModeDetails(ScrnInfoPtr pScr
-  ***********************************/
- 
- static void
--sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, char *mystring)
-+sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, const char *mystring)
- {
-    int slen = 0;
-    sdcbuf->sdc_buffer[0] = 0;