5 files changed, 18 insertions, 30 deletions

diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index b4bf646d0a9c..d3fa034d2ad1 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xv
-PORTVERSION=	5.2.0
+PORTVERSION=	6.0.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	0
 CATEGORIES+=	graphics
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index b78b158e3fdf..b805771c131d 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719760817
-SHA256 (xv/jasper-software-xv-v5.2.0_GH0.tar.gz) = 6eaaf726e89d519fcfa49a4195d09f542efaec38d6659d6887e3ba6f1ff0cbae
-SIZE (xv/jasper-software-xv-v5.2.0_GH0.tar.gz) = 4785784
+TIMESTAMP = 1723749811
+SHA256 (xv/jasper-software-xv-v6.0.0_GH0.tar.gz) = 4adcc73d7472daab434b596b4c14588df89ad216a8857bca2d5f22722cb7df1b
+SIZE (xv/jasper-software-xv-v6.0.0_GH0.tar.gz) = 5051786
diff --git a/graphics/xv/files/patch-xvjpeg.c b/graphics/xv/files/patch-xvjpeg.c
index 44fcd6566080..9def7d7f9cdb 100644
--- a/graphics/xv/files/patch-xvjpeg.c
+++ b/graphics/xv/files/patch-xvjpeg.c
@@ -1,18 +1,18 @@
---- src/xvjpeg.c.orig	2023-07-17 01:25:42 UTC
+--- src/xvjpeg.c.orig	2024-08-12 21:10:49 UTC
 +++ src/xvjpeg.c
 @@ -699,7 +699,7 @@ L2:
-         if ((cmy = *q++ - k) < 0) cmy = 0; *p++ = cmy; /* R */
-         if ((cmy = *q++ - k) < 0) cmy = 0; *p++ = cmy; /* G */
-         if ((cmy = *q++ - k) < 0) cmy = 0; *p++ = cmy; /* B */
+         if ((cmy = *q++ - k) < 0) { cmy = 0; } *p++ = cmy; /* R */
+         if ((cmy = *q++ - k) < 0) { cmy = 0; } *p++ = cmy; /* G */
+         if ((cmy = *q++ - k) < 0) { cmy = 0; } *p++ = cmy; /* B */
 -      } while (++q <= pic_end);
 +      } while (++q < pic_end);
      }
      else { /* assume normal data */
        register byte *q = pic;
 @@ -710,7 +710,7 @@ L2:
-         if ((cmy = k - *q++) < 0) cmy = 0; *p++ = cmy; /* R */
-         if ((cmy = k - *q++) < 0) cmy = 0; *p++ = cmy; /* G */
-         if ((cmy = k - *q++) < 0) cmy = 0; *p++ = cmy; /* B */
+         if ((cmy = k - *q++) < 0) { cmy = 0; } *p++ = cmy; /* R */
+         if ((cmy = k - *q++) < 0) { cmy = 0; } *p++ = cmy; /* G */
+         if ((cmy = k - *q++) < 0) { cmy = 0; } *p++ = cmy; /* B */
 -      } while (++q <= pic_end);
 +      } while (++q < pic_end);
      }
diff --git a/graphics/xv/files/patch-xvtext.c b/graphics/xv/files/patch-xvtext.c
deleted file mode 100644
index ce8254f3aa29..000000000000
--- a/graphics/xv/files/patch-xvtext.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xvtext.c.orig	2023-07-17 01:25:42 UTC
-+++ src/xvtext.c
-@@ -181,7 +181,7 @@ static int  selectCodeset         PARM((TVINFO *));
- #endif
- #ifdef TV_MULTILINGUAL
- static void setCodingSpec   PARM((TVINFO *, struct coding_spec *));
--static void createCsWins    PARM((char *));
-+static void createCsWins    PARM((const char *));
- static void openCsWin       PARM((TVINFO *));
- static void closeCsWin      PARM((TVINFO *));
- #endif
diff --git a/graphics/xv/files/patch-xvvd.c b/graphics/xv/files/patch-xvvd.c
index d0343720adf8..0afa536d2674 100644
--- a/graphics/xv/files/patch-xvvd.c
+++ b/graphics/xv/files/patch-xvvd.c
@@ -1,7 +1,7 @@
---- src/xvvd.c.orig	2023-07-17 01:25:42 UTC
+--- src/xvvd.c.orig	2024-08-12 21:10:49 UTC
 +++ src/xvvd.c
-@@ -1072,6 +1072,8 @@ static void HUPhandler(XtPointer dummy, XtSignalId* Id
- #endif
+@@ -1157,6 +1157,8 @@ static void HUPhandler(XtPointer dummy, XtSignalId* Id
+     unblock_signal(SIGHUP, mask);
  }
  
 +int InSignal = 0;
@@ -9,11 +9,10 @@
  static void vd_handler(int sig)
  {
      UsedSignal = sig;
-@@ -1085,7 +1087,7 @@ static void INThandler(XtPointer dummy, XtSignalId* Id
- #else
-     sigblock(sigmask(UsedSignal));
- #endif
--
+@@ -1170,6 +1172,7 @@ static void INThandler(XtPointer dummy, XtSignalId* Id
+ 
+     block_signal(UsedSignal);
+ 
 +    InSignal = 1;
      Quit(1); /*exit(1);*/
  }