ports/44768: [Port Fix]: games/xblackjack-2.2

[Mark Linimon]

An updated shar file that incorporates all the above changes is
attached.  The diff.out file patches the Makefile; the rest of the
files live in files/.  Note that the existing files/patch-aa should
be cvs rm'ed.

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	diff.out
#	xblackjack/files/patch-.::Draw.c
#	xblackjack/files/patch-.::Imakefile
#	xblackjack/files/patch-.::Strategy.c
#	xblackjack/files/patch-.::Table.c
#
echo x - diff.out
sed 's/^X//' >diff.out << 'END-of-diff.out'
X--- xblackjack/Makefile.dist	Fri Feb 21 07:15:42 2003
X+++ xblackjack/Makefile	Fri Apr  4 18:18:48 2003
X@@ -15,10 +15,8 @@
X MAINTAINER=	ports at FreeBSD.org
X COMMENT=	An X11/Motif blackjack game
X 
X-BROKEN=		"Broken by open-motif upgrade"
X-
X-USE_MOTIF=	yes
X USE_IMAKE=	yes
X+LIB_DEPENDS+=	Xm.1:${PORTSDIR}/x11-toolkits/lesstif
X MAN1=		xblackjack.1
X 
X .include <bsd.port.mk>
END-of-diff.out
echo x - xblackjack/files/patch-.::Draw.c
sed 's/^X//' >xblackjack/files/patch-.::Draw.c << 
'END-of-xblackjack/files/patch-.::Draw.c'
X--- Draw.c.orig	Wed Oct 30 22:16:05 2002
X+++ Draw.c	Wed Oct 30 22:34:05 2002
X@@ -84,7 +84,7 @@
X #include <Xol/OpenLook.h>
X #else
X #include <X11/Xutil.h>
X-#include <X11/Xm/Xm.h>
X+#include <Xm/Xm.h>
X #endif
X #include "Assert.h"
X #include "Bitmaps.h"
END-of-xblackjack/files/patch-.::Draw.c
echo x - xblackjack/files/patch-.::Imakefile
sed 's/^X//' >xblackjack/files/patch-.::Imakefile << 
'END-of-xblackjack/files/patch-.::Imakefile'
X--- Imakefile.orig	Wed Oct 30 22:39:10 2002
X+++ Imakefile	Wed Oct 30 22:39:40 2002
X@@ -54,7 +54,7 @@
X /*
X  *  You may need to remove -lbsd.
X  */
X-  EXTRA_LIBRARIES = -lXm $(DEPLIBS) -lbsd
X+  EXTRA_LIBRARIES = ${MOTIFLIB} -lXt -lXmu -lXext -lX11
X #endif
X 
X /*
END-of-xblackjack/files/patch-.::Imakefile
echo x - xblackjack/files/patch-.::Strategy.c
sed 's/^X//' >xblackjack/files/patch-.::Strategy.c << 
'END-of-xblackjack/files/patch-.::Strategy.c'
X--- Strategy.c.orig	Wed Oct 30 22:23:48 2002
X+++ Strategy.c	Wed Oct 30 22:24:07 2002
X@@ -95,8 +95,8 @@
X #include <Xol/OpenLook.h>
X #include <Xol/StaticText.h>
X #else
X-#include <X11/Xm/Xm.h>
X-#include <X11/Xm/Label.h>
X+#include <Xm/Xm.h>
X+#include <Xm/Label.h>
X #include "Table.h"
X #endif
X #include "Assert.h"
END-of-xblackjack/files/patch-.::Strategy.c
echo x - xblackjack/files/patch-.::Table.c
sed 's/^X//' >xblackjack/files/patch-.::Table.c << 
'END-of-xblackjack/files/patch-.::Table.c'
X--- Table.c.orig	Wed Oct 30 22:35:52 2002
X+++ Table.c	Wed Oct 30 23:11:30 2002
X@@ -229,7 +229,7 @@
X     /* always_install_accelerators */	False,
X #if XmVersion > 1000
X     /* geo_matrix_create */	NULL,
X-    /* focus_moved_proc */	XtInheritFocusMovedProc,
X+    /* focus_moved_proc */	/*XtInheritFocusMovedProc,*/
X #endif
X     /* extension	*/  NULL,
X   },
X@@ -967,7 +967,7 @@
X     
X /*    XtMoveWidget(w, rx, ry);*/
X #if 1
X-    _XmMoveObject((RectObj) w, rx, ry);
X+    _XmMoveObject( w, rx, ry);
X #else
X     _XmMoveObject( w, rx, ry);
X #endif
X@@ -1020,7 +1020,7 @@
X 		w, nw, nh,
X 		w->core.border_width);
X #endif
X-	    _XmResizeObject((RectObj) managed->locs[i].w, nw, nh,
X+	    _XmResizeObject( managed->locs[i].w, nw, nh,
X 			    managed->locs[i].w->core.border_width);
X 	}
X     
END-of-xblackjack/files/patch-.::Table.c
exit