- Update to 5.3a and unmark BROKEN

PR:		ports/74768
Submitted by:	Diane Bruce <db@db.net> (maintainer)

5 files changed, 14 insertions, 504 deletions

diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index b333a9a2f1eb..0748c384908a 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	qsstv
-PORTVERSION=	5.2e
+PORTVERSION=	5.3a
 CATEGORIES=	comms
-MASTER_SITES=	http://users.pandora.be/on1mh/download/
+MASTER_SITES=	http://users.telenet.be/on4qz/download/
 
 MAINTAINER=	db@db.net
 COMMENT=	Amateur Radio SSTV/FAX reception program for unix
@@ -16,8 +16,6 @@ COMMENT=	Amateur Radio SSTV/FAX reception program for unix
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png:${PORTSDIR}/graphics/png
 
-BROKEN=		Unfetchable
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -30,10 +28,6 @@ do-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/qsstv/docs/en/*.png ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/qsstv/docs/en/*.html ${DOCSDIR}
-#	@cd ${WRKSRC}/qsstv/docs/en; \
-#		${INSTALL_DATA} *.png ${DOCSDIR};
-#	@cd ${WRKSRC}/qsstv/docs/en; \
-#		${INSTALL_DATA} *.html ${DOCSDIR};
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/qsstv/distinfo b/comms/qsstv/distinfo
index 6567d889b99b..5c71c7b235b1 100644
--- a/comms/qsstv/distinfo
+++ b/comms/qsstv/distinfo
@@ -1,2 +1,2 @@
-MD5 (qsstv-5.2e.tar.gz) = 56b9f7bc2e2b9a087c37252ed5ba1761
-SIZE (qsstv-5.2e.tar.gz) = 1113865
+MD5 (qsstv-5.3a.tar.gz) = fcbde3b771640d3de14a291057cb04cc
+SIZE (qsstv-5.3a.tar.gz) = 1192395
diff --git a/comms/qsstv/files/patch-qsstv_Makefile.in b/comms/qsstv/files/patch-qsstv_Makefile.in
deleted file mode 100644
index cb2b1513ac41..000000000000
--- a/comms/qsstv/files/patch-qsstv_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- qsstv/Makefile.in.orig	Sat Aug 28 22:26:03 2004
-+++ qsstv/Makefile.in	Sun Aug 29 12:51:51 2004
-@@ -250,7 +250,7 @@
- INTERFACES = zoomform.ui textselect.ui recform.ui posform.ui ftpform.ui freqform.ui configform.ui
- TRANSLATIONS =
- KDE_OPTIONS = qtonly
--qsstv_LDADD = $(LIB_QPE) $(LIB_QT) $(LIBSOCKET)
-+qsstv_LDADD = $(LIB_QPE) $(LIB_QT) $(USER_LDFLAGS) $(LIBSOCKET)
-
- SUBDIRS = docs icons
-
-@@ -358,7 +358,6 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CXXFLAGS = @CXXFLAGS@
- DIST_SOURCES = $(qsstv_SOURCES)
-
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
diff --git a/comms/qsstv/files/patch-qsstv_configfile.cpp b/comms/qsstv/files/patch-qsstv_configfile.cpp
new file mode 100644
index 000000000000..869bd7f82b9f
--- /dev/null
+++ b/comms/qsstv/files/patch-qsstv_configfile.cpp
@@ -0,0 +1,10 @@
+--- qsstv/configfile.cpp.orig	Sun Feb  8 19:18:32 2004
++++ qsstv/configfile.cpp	Thu Dec  9 01:42:36 2004
+@@ -17,6 +17,7 @@
+ #include "configfile.h"
+ #include "config.h"
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <qtextstream.h>
+ #include "localtypes.h"
+ 
diff --git a/comms/qsstv/files/patch-qsstv_sstvparam.cpp b/comms/qsstv/files/patch-qsstv_sstvparam.cpp
deleted file mode 100644
index e207824ee858..000000000000
--- a/comms/qsstv/files/patch-qsstv_sstvparam.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
---- qsstv/sstvparam.cpp.orig	Sat Jul  6 17:37:37 2002
-+++ qsstv/sstvparam.cpp	Fri Oct 29 00:11:50 2004
-@@ -198,24 +198,24 @@
-    0xAC,
-    GBR,
-    {
--     {PHASET1},             // PHASET0  start new line
--     {PHASET2},             // PHASET1  get sync
--     {PHASET4},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASET9},             // PHASET6  get green line
--     {PHASETA},             // PHASET7  get blue line
--     {PHASETE},             // PHASET8  get red  line
--     {PHASET5},             // PHASET9  F1500
--     {PHASET3},             // PHASETA  F1900A
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {NEXTRGB},             // PHASETE  frontporch
--     {PHASET0},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  start new line
-+     PHASET2,             // PHASET1  get sync
-+     PHASET4,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASET9,             // PHASET6  get green line
-+     PHASETA,             // PHASET7  get blue line
-+     PHASETE,             // PHASET8  get red  line
-+     PHASET5,             // PHASET9  F1500
-+     PHASET3,             // PHASETA  F1900A
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     NEXTRGB,             // PHASETE  frontporch
-+     PHASET0,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }
-   },
- 
-@@ -234,24 +234,24 @@
-    0x28,
-    GBR,
-    {
--     {PHASET1},             // PHASET0  start new line
--     {PHASET2},             // PHASET1  get sync
--     {PHASET4},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASET9},             // PHASET6  get green line
--     {PHASETA},             // PHASET7  get blue line
--     {PHASETE},             // PHASET8  get red  line
--     {PHASET5},             // PHASET9  F1500
--     {PHASET3},             // PHASETA  F1900A
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {NEXTRGB},             // PHASETE  frontporch
--     {PHASET0},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  start new line
-+     PHASET2,             // PHASET1  get sync
-+     PHASET4,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASET9,             // PHASET6  get green line
-+     PHASETA,             // PHASET7  get blue line
-+     PHASETE,             // PHASET8  get red  line
-+     PHASET5,             // PHASET9  F1500
-+     PHASET3,             // PHASETA  F1900A
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     NEXTRGB,             // PHASETE  frontporch
-+     PHASET0,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }
-   },
-   
-@@ -270,24 +270,24 @@
-    0x3c,
-    GBR2,
-    {
--     {PHASET9},             // PHASET0  start new line
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {PHASETE},             // PHASET7  get blue line
--     {NEXTRGB},             // PHASET8  get red  line
--     {PHASET4},             // PHASET9  f1
--     {PHASET5},             // PHASETA  f2
--     {PHASET1},             // PHASETB  f3
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {PHASET1},             // PHASETE  frontporch
--     {PHASET0},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET9,             // PHASET0  start new line
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     PHASETE,             // PHASET7  get blue line
-+     NEXTRGB,             // PHASET8  get red  line
-+     PHASET4,             // PHASET9  f1
-+     PHASET5,             // PHASETA  f2
-+     PHASET1,             // PHASETB  f3
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     PHASET1,             // PHASETE  frontporch
-+     PHASET0,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }  
-   },
-   
-@@ -306,24 +306,24 @@
-    0xb8,
-    GBR2,
-    {
--     {PHASET9},             // PHASET0  start new line
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {PHASETE},             // PHASET7  get blue line
--     {NEXTRGB},             // PHASET8  get red  line
--     {PHASET4},             // PHASET9  blanking1
--     {PHASET5},             // PHASETA  blanking2
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {PHASET1},             // PHASETE  frontporch
--     {PHASET0},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET9,             // PHASET0  start new line
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     PHASETE,             // PHASET7  get blue line
-+     NEXTRGB,             // PHASET8  get red  line
-+     PHASET4,             // PHASET9  blanking1
-+     PHASET5,             // PHASETA  blanking2
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     PHASET1,             // PHASETE  frontporch
-+     PHASET0,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }  
-   },
-   
-@@ -342,24 +342,24 @@
-    0xcc,
-    GBR2,
-    {
--     {PHASET9},             // PHASET0  start new line
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {PHASET1},             // PHASET7  get blue line
--     {NEXTRGB},             // PHASET8  get red  line
--     {PHASET4},             // PHASET9  blanking1
--     {PHASET5},             // PHASETA  blanking2
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {PHASET1},             // PHASETE  frontporch
--     {PHASET0},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET9,             // PHASET0  start new line
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     PHASET1,             // PHASET7  get blue line
-+     NEXTRGB,             // PHASET8  get red  line
-+     PHASET4,             // PHASET9  blanking1
-+     PHASET5,             // PHASETA  blanking2
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     PHASET1,             // PHASETE  frontporch
-+     PHASET0,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }
-   },
- 
-@@ -378,24 +378,24 @@
-    0xB7,
-    RGB,
-    {
--     {PHASET1},             // PHASET0  start new line
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASET5},             // PHASET6  get green line
--     {PHASETE},             // PHASET7  get blue line
--     {PHASET4},             // PHASET8  get red  line
--     {PHASET1},             // PHASET9  F1500
--     {PHASET1},             // PHASETA  F1900A
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {NEXTRGB},             // PHASETE  frontporch
--     {PHASET0},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  start new line
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASET5,             // PHASET6  get green line
-+     PHASETE,             // PHASET7  get blue line
-+     PHASET4,             // PHASET8  get red  line
-+     PHASET1,             // PHASET9  F1500
-+     PHASET1,             // PHASETA  F1900A
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     NEXTRGB,             // PHASETE  frontporch
-+     PHASET0,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }
-   },
-   
-@@ -414,24 +414,24 @@
-    0x88,
-    XYZOE,
-    {
--     {PHASET1},             // PHASET0  detect end of viscode
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETE},             // PHASET6  get green line
--     {PHASET3},             // PHASET7  get blue line
--     {PHASET9},             // PHASET8  get red  line
--     {PHASETB},             // PHASET9  blanking 1 /F1500
--     {PHASET1},             // PHASETA  blanking 2
--     {PHASET4},             // PHASETB
--     {PHASET1},             // PHASETC
--     {PHASET1},             // PHASETD  future
--     {NEXTXYZOE},         	// PHASETE  frontporch
--     {PHASET1},             // NEXTRGB
--     {PHASET0},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  detect end of viscode
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETE,             // PHASET6  get green line
-+     PHASET3,             // PHASET7  get blue line
-+     PHASET9,             // PHASET8  get red  line
-+     PHASETB,             // PHASET9  blanking 1 /F1500
-+     PHASET1,             // PHASETA  blanking 2
-+     PHASET4,             // PHASETB
-+     PHASET1,             // PHASETC
-+     PHASET1,             // PHASETD  future
-+     NEXTXYZOE,         	// PHASETE  frontporch
-+     PHASET1,             // NEXTRGB
-+     PHASET0,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }
-   },  
- 
-@@ -450,24 +450,24 @@
-    0x0C,
-    XYZOE2,
-   {
--     {PHASET1},             // PHASET0  detect end of viscode
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {PHASETE},             // PHASET7  get blue line
--     {PHASET9},             // PHASET8  get red  line
--     {PHASETB},             // PHASET9  F1500
--     {PHASETC},             // PHASETA  F2300
--     {PHASET4},             // PHASETB  F1900A
--     {PHASET5},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {NEXTXYZOE2},       // PHASETE  frontporch
--     {PHASET1},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET0}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  detect end of viscode
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     PHASETE,             // PHASET7  get blue line
-+     PHASET9,             // PHASET8  get red  line
-+     PHASETB,             // PHASET9  F1500
-+     PHASETC,             // PHASETA  F2300
-+     PHASET4,             // PHASETB  F1900A
-+     PHASET5,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     NEXTXYZOE2,       // PHASETE  frontporch
-+     PHASET1,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET0              // NEXTXYZOE2
-    }
-   },
-   {"P3",     "P3"   ,
-@@ -485,24 +485,24 @@
-    0x71,
-    RGB,
-   {
--     {PHASET1},             // PHASET0  detect end of viscode
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {NEXTRGB},             // PHASET7  get blue line
--     {PHASET9},             // PHASET8  get red  line
--     {PHASET4},             // PHASET9  F1500
--     {PHASET5},             // PHASETA  F1900A
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {PHASET0},             // PHASETE  frontporch
--     {PHASETE},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  detect end of viscode
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     NEXTRGB,             // PHASET7  get blue line
-+     PHASET9,             // PHASET8  get red  line
-+     PHASET4,             // PHASET9  F1500
-+     PHASET5,             // PHASETA  F1900A
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     PHASET0,             // PHASETE  frontporch
-+     PHASETE,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }  
-   }
- 
-@@ -522,24 +522,24 @@
-    0x72,
-    RGB,
-   {
--     {PHASET1},             // PHASET0  detect end of viscode
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {NEXTRGB},             // PHASET7  get blue line
--     {PHASET9},             // PHASET8  get red  line
--     {PHASET4},             // PHASET9  F1500
--     {PHASET5},             // PHASETA  F1900A
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {PHASET0},             // PHASETE  frontporch
--     {PHASETE},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  detect end of viscode
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     NEXTRGB,             // PHASET7  get blue line
-+     PHASET9,             // PHASET8  get red  line
-+     PHASET4,             // PHASET9  F1500
-+     PHASET5,             // PHASETA  F1900A
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     PHASET0,             // PHASETE  frontporch
-+     PHASETE,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }  
-   }
- ,
-@@ -558,24 +558,24 @@
-    0xF3,
-    RGB,
-   {
--     {PHASET1},             // PHASET0  detect end of viscode
--     {PHASET2},             // PHASET1  get sync
--     {PHASET3},             // PHASET2  get backporch
--     {PHASET8},             // PHASET3  set red line
--     {PHASET6},             // PHASET4  set green line
--     {PHASET7},             // PHASET5  set  blue line
--     {PHASETA},             // PHASET6  get green line
--     {NEXTRGB},             // PHASET7  get blue line
--     {PHASET9},             // PHASET8  get red  line
--     {PHASET4},             // PHASET9  F1500
--     {PHASET5},             // PHASETA  F1900A
--     {PHASET1},             // PHASETB  F2300
--     {PHASET1},             // PHASETC  F1900B
--     {PHASET1},             // PHASETD  future
--     {PHASET0},             // PHASETE  frontporch
--     {PHASETE},             // NEXTRGB
--     {PHASET1},             // NEXTXYZOE
--     {PHASET1}              // NEXTXYZOE2
-+     PHASET1,             // PHASET0  detect end of viscode
-+     PHASET2,             // PHASET1  get sync
-+     PHASET3,             // PHASET2  get backporch
-+     PHASET8,             // PHASET3  set red line
-+     PHASET6,             // PHASET4  set green line
-+     PHASET7,             // PHASET5  set  blue line
-+     PHASETA,             // PHASET6  get green line
-+     NEXTRGB,             // PHASET7  get blue line
-+     PHASET9,             // PHASET8  get red  line
-+     PHASET4,             // PHASET9  F1500
-+     PHASET5,             // PHASETA  F1900A
-+     PHASET1,             // PHASETB  F2300
-+     PHASET1,             // PHASETC  F1900B
-+     PHASET1,             // PHASETD  future
-+     PHASET0,             // PHASETE  frontporch
-+     PHASETE,             // NEXTRGB
-+     PHASET1,             // NEXTXYZOE
-+     PHASET1              // NEXTXYZOE2
-    }  
-   }
-