4 files changed, 10 insertions, 26 deletions

diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 97e2fd1e54a3..8209b377b8c4 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libzvbi
-PORTVERSION=	0.2.33
-PORTREVISION=	4
+PORTVERSION=	0.2.34
 CATEGORIES=	devel
 MASTER_SITES=	SF/zapping/zvbi/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/lib//}-${PORTVERSION}
@@ -32,6 +31,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|#cpu (\([^)]*\))|defined(__\1__)|g' \
 		${WRKSRC}/src/misc.h \
 		${WRKSRC}/src/exp-gfx.c
+	@${REINPLACE_CMD} -e 's|, ts|, \&ts|' ${WRKSRC}/test/date.c
 	@${REINPLACE_CMD} -e 's|zvbi-atsc-cc$$(EXEEXT)||g; \
 		s|zvbi-atsc-cc\.1||g' ${WRKSRC}/contrib/Makefile.in
 
diff --git a/devel/libzvbi/distinfo b/devel/libzvbi/distinfo
index 1bea35660031..c2f4b667e45f 100644
--- a/devel/libzvbi/distinfo
+++ b/devel/libzvbi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zvbi-0.2.33.tar.bz2) = 09a709f6de5f42e7039cca2732a6ea211a397bb666b9110ee52658603be4fb7e
-SIZE (zvbi-0.2.33.tar.bz2) = 935601
+SHA256 (zvbi-0.2.34.tar.bz2) = 29cfbb7ee1981e4553670d0dc4e079d192fd5f5d85f07e49795be55a600c6dab
+SIZE (zvbi-0.2.34.tar.bz2) = 1046741
diff --git a/devel/libzvbi/files/patch-src-exp-gfx.c b/devel/libzvbi/files/patch-src-exp-gfx.c
deleted file mode 100644
index 5091955a012c..000000000000
--- a/devel/libzvbi/files/patch-src-exp-gfx.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/exp-gfx.c.orig	2008-02-24 15:17:47.000000000 +0100
-+++ src/exp-gfx.c	2012-05-26 12:49:12.000000000 +0200
-@@ -1672,11 +1672,11 @@
- 	char title[80];
- 	unsigned int i;
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_ptr)))
- 		return FALSE;
- 
- 	png_set_write_fn (png_ptr,
--			  (voidp) gfx,
-+			  gfx,
- 			  write_data,
- 			  flush_data);
- 
diff --git a/devel/libzvbi/files/patch-src-teletext.c b/devel/libzvbi/files/patch-src-teletext.c
index 74e69fb6bb09..689811cadf38 100644
--- a/devel/libzvbi/files/patch-src-teletext.c
+++ b/devel/libzvbi/files/patch-src-teletext.c
@@ -1,5 +1,5 @@
---- src/teletext.c.orig	2011-12-14 22:01:23.000000000 +0100
-+++ src/teletext.c	2011-12-14 22:01:30.000000000 +0100
+--- 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;
  
@@ -356,10 +356,10 @@
  				if (row > active_row)
 -					flush_row();
 +					flush_row;
+ 				else
+ 					flush(active_column + 1);
  
- 				active_row = row;
- 				active_column = column;
-@@ -1750,7 +1747,7 @@
+@@ -1752,7 +1749,7 @@
  				break;
  
  			case 0x15 ... 0x17:	/* object definition */
@@ -368,7 +368,7 @@
  				printv("enh obj definition 0x%02x 0x%02x\n", p->mode, p->data);
  				printv("enh terminated\n");
  				goto swedish;
-@@ -1766,7 +1763,7 @@
+@@ -1768,7 +1765,7 @@
  			case 0x1F:		/* termination marker */
  			default:
  	                terminate: