Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/rdesktop/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	2007/03/25 19:38:39	1.23
+++ Makefile	2007/04/24 19:32:45
@@ -2,7 +2,7 @@
 
 COMMENT=	"open source client for Windows Terminal Server"
 DISTNAME=	rdesktop-1.5.0
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
Index: patches/patch-xwin_c
===================================================================
RCS file: patch-xwin_c
diff -N patch-xwin_c
--- /dev/null	Sat Aug 30 18:16:59 1997
+++ patches/patch-xwin_c	Tue Apr 24 19:32:45 2007
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- xwin.c.orig	Tue Apr 24 11:43:50 2007
++++ xwin.c	Tue Apr 24 13:04:57 2007
+@@ -2413,7 +2413,7 @@ ui_create_glyph(int width, int height, uint8 * data)
+ 		g_create_glyph_gc = XCreateGC(g_display, bitmap, 0, NULL);
+ 
+ 	image = XCreateImage(g_display, g_visual, 1, ZPixmap, 0, (char *) data,
+-			     width, height, 8, scanline);
++			     width, height, 8, 0);
+ 	image->byte_order = MSBFirst;
+ 	image->bitmap_bit_order = MSBFirst;
+ 	XInitImage(image);
+@@ -3219,7 +3219,7 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx
+ 		return;
+ 
+ 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
+-			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
++			     (char *) data, cx, cy, BitmapPad(g_display), 0);
+ 
+ 	if (g_ownbackstore)
+ 	{