4 files changed, 3 insertions, 425 deletions

diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 6fa638cd5f91..982be5353c92 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzvbi
-PORTVERSION=	0.2.34
+PORTVERSION=	0.2.35
 CATEGORIES=	devel
 MASTER_SITES=	SF/zapping/zvbi/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/lib//}-${PORTVERSION}
diff --git a/devel/libzvbi/distinfo b/devel/libzvbi/distinfo
index c2f4b667e45f..5780291ab4fd 100644
--- a/devel/libzvbi/distinfo
+++ b/devel/libzvbi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zvbi-0.2.34.tar.bz2) = 29cfbb7ee1981e4553670d0dc4e079d192fd5f5d85f07e49795be55a600c6dab
-SIZE (zvbi-0.2.34.tar.bz2) = 1046741
+SHA256 (zvbi-0.2.35.tar.bz2) = fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318
+SIZE (zvbi-0.2.35.tar.bz2) = 1047761
diff --git a/devel/libzvbi/files/patch-src-packet.c b/devel/libzvbi/files/patch-src-packet.c
deleted file mode 100644
index 3e3b11b814ce..000000000000
--- a/devel/libzvbi/files/patch-src-packet.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/packet.c.orig	2011-12-14 22:00:49.000000000 +0100
-+++ src/packet.c	2011-12-14 22:00:53.000000000 +0100
-@@ -1747,24 +1747,22 @@
- 	int i, j, err = 0;
- 
- 	/* XXX nested function not portable, to be removed */
--	int
--	bits(int count)
--	{
--		int r, n;
--
--		r = buf;
--
--		if ((n = count - left) > 0) {
--			r |= (buf = *triplet++) << left;
--			left = 18;
--		} else
--			n = count;
--
--		buf >>= n;
--		left -= n;
--
--		return r & ((1UL << count) - 1);
--	}
-+#define  bits(count) 	({               \
-+		int r, n;               \
-+                                        \
-+		r = buf;                \
-+                                        \
-+		if ((n = count - left) > 0) {   \
-+			r |= (buf = *triplet++) << left;        \
-+			left = 18;      \
-+		} else                  \
-+			n = count;      \
-+                                        \
-+		buf >>= n;              \
-+		left -= n;              \
-+                                        \
-+		(r & ((1UL << count) - 1)); \
-+	})
- 
- 	if ((designation = vbi_unham8 (*p)) < 0)
- 		return FALSE;
diff --git a/devel/libzvbi/files/patch-src-teletext.c b/devel/libzvbi/files/patch-src-teletext.c
deleted file mode 100644
index 689811cadf38..000000000000
--- a/devel/libzvbi/files/patch-src-teletext.c
+++ /dev/null
@@ -1,379 +0,0 @@
---- src/teletext.c.orig	2013-07-02 06:03:54.000000000 +0200
-+++ src/teletext.c	2013-08-07 20:24:40.000000000 +0200
-@@ -1258,180 +1258,177 @@
- 	int pdc_hr;
- 
- 	/* XXX nested function not portable, to be removed */
--	void
--	flush(int column)
--	{
--		int row = inv_row + active_row;
--		int i;
--
--		if (row >= ROWS)
--			return;
--
--		if (type == OBJECT_TYPE_PASSIVE && !mac.unicode) {
--			active_column = column;
--			return;
--		}
--
--		printv("flush [%04x%c,F%d%c,B%d%c,S%d%c,O%d%c,H%d%c] %d ... %d\n",
--			ac.unicode, mac.unicode ? '*' : ' ',
--			ac.foreground, mac.foreground ? '*' : ' ',
--			ac.background, mac.background ? '*' : ' ',
--			ac.size, mac.size ? '*' : ' ',
--			ac.opacity, mac.opacity ? '*' : ' ',
--			ac.flash, mac.flash ? '*' : ' ',
--			active_column, column - 1);
--
--		for (i = inv_column + active_column; i < inv_column + column;) {
--			vbi_char c;
--
--			if (i > 39)
--				break;
--
--			c = acp[i];
--
--			if (mac.underline) {
--				int u = ac.underline;
--
--				if (!mac.unicode)
--					ac.unicode = c.unicode;
--
--				if (vbi_is_gfx(ac.unicode)) {
--					if (u)
--						ac.unicode &= ~0x20; /* separated */
--					else
--						ac.unicode |= 0x20; /* contiguous */
--					mac.unicode = ~0;
--					u = 0;
--				}
--
--				c.underline = u;
--			}
--			if (mac.foreground)
--				c.foreground = (ac.foreground != VBI_TRANSPARENT_BLACK) ?
--					ac.foreground : (row_color_transparent) ?
--					VBI_TRANSPARENT_BLACK : row_color;
--			if (mac.background)
--				c.background = (ac.background != VBI_TRANSPARENT_BLACK) ?
--					ac.background : (row_color_transparent) ?
--					VBI_TRANSPARENT_BLACK : row_color;
--			if (invert) {
--				int t = c.foreground;
--
--				c.foreground = c.background;
--				c.background = t;
--			}
--			if (mac.opacity)
--				c.opacity = ac.opacity;
--			if (mac.flash)
--				c.flash = ac.flash;
--			if (mac.conceal)
--				c.conceal = ac.conceal;
--			if (mac.unicode) {
--				c.unicode = ac.unicode;
--				mac.unicode = 0;
--
--				if (mac.size)
--					c.size = ac.size;
--				else if (c.size > VBI_DOUBLE_SIZE)
--					c.size = VBI_NORMAL_SIZE;
--			}
--
--			acp[i] = c;
--
--			if (type == OBJECT_TYPE_PASSIVE)
--				break;
--
--			i++;
--
--			if (type != OBJECT_TYPE_PASSIVE
--			    && type != OBJECT_TYPE_ADAPTIVE) {
--				int raw;
--
--				raw = (row == 0 && i < 9) ?
--					0x20 : vbi_unpar8 (vtp->data.lop.raw[row][i - 1]);
--
--				/* set-after spacing attributes cancelling non-spacing */
--
--				switch (raw) {
--				case 0x00 ... 0x07:	/* alpha + foreground color */
--				case 0x10 ... 0x17:	/* mosaic + foreground color */
--					printv("... fg term %d %02x\n", i, raw);
--					mac.foreground = 0;
--					mac.conceal = 0;
--					break;
--
--				case 0x08:		/* flash */
--					mac.flash = 0;
--					break;
--
--				case 0x0A:		/* end box */
--				case 0x0B:		/* start box */
--					if (i < COLUMNS && vbi_unpar8 (vtp->data.lop.raw[row][i]) == raw) {
--						printv("... boxed term %d %02x\n", i, raw);
--						mac.opacity = 0;
--					}
--
--					break;
--
--				case 0x0D:		/* double height */
--				case 0x0E:		/* double width */
--				case 0x0F:		/* double size */
--					printv("... size term %d %02x\n", i, raw);
--					mac.size = 0;
--					break;
--				}
--
--				if (i > 39)
--					break;
--
--				raw = (row == 0 && i < 8) ?
--					0x20 : vbi_unpar8 (vtp->data.lop.raw[row][i]);
--
--				/* set-at spacing attributes cancelling non-spacing */
--
--				switch (raw) {
--				case 0x09:		/* steady */
--					mac.flash = 0;
--					break;
--
--				case 0x0C:		/* normal size */
--					printv("... size term %d %02x\n", i, raw);
--					mac.size = 0;
--					break;
--
--				case 0x18:		/* conceal */
--					mac.conceal = 0;
--					break;
--
--					/*
--					 *  Non-spacing underlined/separated display attribute
--					 *  cannot be cancelled by a subsequent spacing attribute.
--					 */
--
--				case 0x1C:		/* black background */
--				case 0x1D:		/* new background */
--					printv("... bg term %d %02x\n", i, raw);
--					mac.background = 0;
--					break;
--				}
--			}
--		}
--
--		active_column = column;
--	}
-+#define flush(column)   \
-+	({       \
-+		int row = inv_row + active_row; \
-+		int i;  \
-+        \
-+		if (row >= ROWS)        \
-+			break; \
-+        \
-+		if (type == OBJECT_TYPE_PASSIVE && !mac.unicode) {      \
-+			active_column = column; \
-+			break; \
-+		}       \
-+        \
-+		printv("flush [%04x%c,F%d%c,B%d%c,S%d%c,O%d%c,H%d%c] %d ... %d\n",      \
-+			ac.unicode, mac.unicode ? '*' : ' ',    \
-+			ac.foreground, mac.foreground ? '*' : ' ',      \
-+			ac.background, mac.background ? '*' : ' ',      \
-+			ac.size, mac.size ? '*' : ' ',  \
-+			ac.opacity, mac.opacity ? '*' : ' ',    \
-+			ac.flash, mac.flash ? '*' : ' ',        \
-+			active_column, column - 1);     \
-+        \
-+		for (i = inv_column + active_column; i < inv_column + column;) {        \
-+			vbi_char c;     \
-+        \
-+			if (i > 39)     \
-+				break;  \
-+        \
-+			c = acp[i];     \
-+        \
-+			if (mac.underline) {    \
-+				int u = ac.underline;   \
-+        \
-+				if (!mac.unicode)       \
-+					ac.unicode = c.unicode; \
-+        \
-+				if (vbi_is_gfx(ac.unicode)) {   \
-+					if (u)  \
-+						ac.unicode &= ~0x20; /* separated */    \
-+					else    \
-+						ac.unicode |= 0x20; /* contiguous */    \
-+					mac.unicode = ~0;       \
-+					u = 0;  \
-+				}       \
-+        \
-+				c.underline = u;        \
-+			}       \
-+			if (mac.foreground)     \
-+				c.foreground = (ac.foreground != VBI_TRANSPARENT_BLACK) ?       \
-+					ac.foreground : (row_color_transparent) ?       \
-+					VBI_TRANSPARENT_BLACK : row_color;      \
-+			if (mac.background)     \
-+				c.background = (ac.background != VBI_TRANSPARENT_BLACK) ?       \
-+					ac.background : (row_color_transparent) ?       \
-+					VBI_TRANSPARENT_BLACK : row_color;      \
-+			if (invert) {   \
-+				int t = c.foreground;   \
-+        \
-+				c.foreground = c.background;    \
-+				c.background = t;       \
-+			}       \
-+			if (mac.opacity)        \
-+				c.opacity = ac.opacity; \
-+			if (mac.flash)  \
-+				c.flash = ac.flash;     \
-+			if (mac.conceal)        \
-+				c.conceal = ac.conceal; \
-+			if (mac.unicode) {      \
-+				c.unicode = ac.unicode; \
-+				mac.unicode = 0;        \
-+        \
-+				if (mac.size)   \
-+					c.size = ac.size;       \
-+				else if (c.size > VBI_DOUBLE_SIZE)      \
-+					c.size = VBI_NORMAL_SIZE;       \
-+			}       \
-+        \
-+			acp[i] = c;     \
-+        \
-+			if (type == OBJECT_TYPE_PASSIVE)        \
-+				break;  \
-+        \
-+			i++;    \
-+        \
-+			if (type != OBJECT_TYPE_PASSIVE \
-+			    && type != OBJECT_TYPE_ADAPTIVE) {  \
-+				int raw;        \
-+        \
-+				raw = (row == 0 && i < 9) ?     \
-+					0x20 : vbi_unpar8 (vtp->data.lop.raw[row][i - 1]);      \
-+        \
-+				/* set-after spacing attributes cancelling non-spacing */       \
-+        \
-+				switch (raw) {  \
-+				case 0x00 ... 0x07:	/* alpha + foreground color */  \
-+				case 0x10 ... 0x17:	/* mosaic + foreground color */ \
-+					printv("... fg term %d %02x\n", i, raw);        \
-+					mac.foreground = 0;     \
-+					mac.conceal = 0;        \
-+					break;  \
-+        \
-+				case 0x08:		/* flash */     \
-+					mac.flash = 0;  \
-+					break;  \
-+        \
-+				case 0x0A:		/* end box */   \
-+				case 0x0B:		/* start box */ \
-+					if (i < COLUMNS && vbi_unpar8 (vtp->data.lop.raw[row][i]) == raw) {     \
-+						printv("... boxed term %d %02x\n", i, raw);     \
-+						mac.opacity = 0;        \
-+					}       \
-+        \
-+					break;  \
-+        \
-+				case 0x0D:		/* double height */     \
-+				case 0x0E:		/* double width */      \
-+				case 0x0F:		/* double size */       \
-+					printv("... size term %d %02x\n", i, raw);      \
-+					mac.size = 0;   \
-+					break;  \
-+				}       \
-+        \
-+				if (i > 39)     \
-+					break;  \
-+        \
-+				raw = (row == 0 && i < 8) ?     \
-+					0x20 : vbi_unpar8 (vtp->data.lop.raw[row][i]);  \
-+        \
-+				/* set-at spacing attributes cancelling non-spacing */  \
-+        \
-+				switch (raw) {  \
-+				case 0x09:		/* steady */    \
-+					mac.flash = 0;  \
-+					break;  \
-+        \
-+				case 0x0C:		/* normal size */       \
-+					printv("... size term %d %02x\n", i, raw);      \
-+					mac.size = 0;   \
-+					break;  \
-+        \
-+				case 0x18:		/* conceal */   \
-+					mac.conceal = 0;        \
-+					break;  \
-+        \
-+					/*      \
-+					 *  Non-spacing underlined/separated display attribute  \
-+					 *  cannot be cancelled by a subsequent spacing attribute.      \
-+					 */     \
-+        \
-+				case 0x1C:		/* black background */  \
-+				case 0x1D:		/* new background */    \
-+					printv("... bg term %d %02x\n", i, raw);        \
-+					mac.background = 0;     \
-+					break;  \
-+				}       \
-+			}       \
-+		}       \
-+        \
-+		active_column = column; \
-+	})
- 
- 	/* XXX nested function not portable, to be removed */
--	void
--	flush_row(void)
--	{
--		if (type == OBJECT_TYPE_PASSIVE || type == OBJECT_TYPE_ADAPTIVE)
--			flush(active_column + 1);
--		else
--			flush(COLUMNS);
--
--		if (type != OBJECT_TYPE_PASSIVE)
--			memset(&mac, 0, sizeof(mac));
--	}
-+#define flush_row       do {\
-+		if (type == OBJECT_TYPE_PASSIVE || type == OBJECT_TYPE_ADAPTIVE)        \
-+			flush(active_column + 1);       \
-+		else    \
-+			flush(COLUMNS); \
-+\
-+		if (type != OBJECT_TYPE_PASSIVE)        \
-+			memset(&mac, 0, sizeof(mac));   \
-+	} while (0)
- 
- 	active_column = 0;
- 	active_row = 0;
-@@ -1554,7 +1551,7 @@
- 				printv("enh set_active row %d col %d\n", row, column);
- 
- 				if (row > active_row)
--					flush_row();
-+					flush_row;
- 				else
- 					flush(active_column + 1);
- 
-@@ -1752,7 +1749,7 @@
- 				break;
- 
- 			case 0x15 ... 0x17:	/* object definition */
--				flush_row();
-+				flush_row;
- 				printv("enh obj definition 0x%02x 0x%02x\n", p->mode, p->data);
- 				printv("enh terminated\n");
- 				goto swedish;
-@@ -1768,7 +1765,7 @@
- 			case 0x1F:		/* termination marker */
- 			default:
- 	                terminate:
--				flush_row();
-+				flush_row;
- 				printv("enh terminated %02x\n", p->mode);
- 				goto swedish;
- 			}