From su_paul@everlund.homeip.net  Wed Oct 30 15:00:48 2002
Return-Path: <su_paul@everlund.homeip.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6FD7637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2002 15:00:48 -0800 (PST)
Received: from everlund.homeip.net (h96n1c1o1023.bredband.skanova.com [213.64.164.96])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5023E43E75
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2002 15:00:47 -0800 (PST)
	(envelope-from su_paul@everlund.homeip.net)
Received: from everlund.homeip.net (localhost [127.0.0.1])
	by everlund.homeip.net (8.12.6/8.12.6) with ESMTP id g9UN0jTI031487
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 31 Oct 2002 00:00:45 +0100 (CET)
	(envelope-from su_paul@everlund.homeip.net)
Received: (from root@localhost)
	by everlund.homeip.net (8.12.6/8.12.6/Submit) id g9UN0jFb031486;
	Thu, 31 Oct 2002 00:00:45 +0100 (CET)
	(envelope-from su_paul)
Message-Id: <200210302300.g9UN0jFb031486@everlund.homeip.net>
Date: Thu, 31 Oct 2002 00:00:45 +0100 (CET)
From: Paul Everlund <tdv94ped@cs.umu.se>
Reply-To: Paul Everlund <tdv94ped@cs.umu.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Port Fix]: games/xblackjack-2.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44768
>Category:       ports
>Synopsis:       [Port Fix]: games/xblackjack-2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 30 15:10:00 PST 2002
>Closed-Date:    Tue May 13 11:59:24 PDT 2003
>Last-Modified:  Tue May 13 11:59:24 PDT 2003
>Originator:     Paul Everlund
>Release:        FreeBSD 4.7-RELEASE i386
>Organization:
>Environment:
	System: FreeBSD freebsd.everlund.homeip.net 4.7-RELEASE
		FreeBSD 4.7-RELEASE #1: Sun Oct 13 07:35:27 CEST 2002
		su_paul@freebsd.everlund.homeip.net:/usr/obj/usr/src/sys/I686_CPU_KERNEL i386

>Description:
	Fix of games/xblackjack-2.2

>How-To-Repeat:
	
>Fix:
--- xblackjack.shar begins here ---
# 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:
#
#	xblackjack
#	xblackjack/files
#	xblackjack/files/patch-.::Draw.c
#	xblackjack/files/patch-.::Table.c
#	xblackjack/files/patch-.::Strategy.c
#	xblackjack/files/patch-.::Imakefile
#	xblackjack/Makefile
#	xblackjack/distinfo
#	xblackjack/pkg-comment
#	xblackjack/pkg-descr
#	xblackjack/pkg-plist
#
echo c - xblackjack
mkdir -p xblackjack > /dev/null 2>&1
echo c - xblackjack/files
mkdir -p xblackjack/files > /dev/null 2>&1
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-.::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
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-.::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/Makefile
sed 's/^X//' >xblackjack/Makefile << 'END-of-xblackjack/Makefile'
X# New ports collection makefile for:    xblackjack
X# Date created:         8/16/1996
X# Whom:                 erich@FreeBSD.org
X#
X# $FreeBSD: ports/games/xblackjack/Makefile,v 1.12 2000/11/07 23:28:08 asami Exp $
X#
X
XPORTNAME=	xblackjack
XPORTVERSION=	2.2
XCATEGORIES=	games
XMASTER_SITES=	${MASTER_SITE_XCONTRIB}
XMASTER_SITE_SUBDIR=	games
XEXTRACT_SUFX=	.tar.Z
X
XMAINTAINER=	ports@FreeBSD.org
X
XUSE_MOTIF=	yes
XUSE_IMAKE=	yes
XMAN1=		xblackjack.1
X
X.include <bsd.port.mk>
END-of-xblackjack/Makefile
echo x - xblackjack/distinfo
sed 's/^X//' >xblackjack/distinfo << 'END-of-xblackjack/distinfo'
XMD5 (xblackjack-2.2.tar.Z) = 1486664e6e22a9c6d9c0f0c95226e874
END-of-xblackjack/distinfo
echo x - xblackjack/pkg-comment
sed 's/^X//' >xblackjack/pkg-comment << 'END-of-xblackjack/pkg-comment'
XAn X11/Motif blackjack game
END-of-xblackjack/pkg-comment
echo x - xblackjack/pkg-descr
sed 's/^X//' >xblackjack/pkg-descr << 'END-of-xblackjack/pkg-descr'
XFrom The README:
X
X  Xblackjack is a MOTIF/OLIT based tool constructed to get you ready for the
X  casino.  It was inspired by a book called "Beat the Dealer" by Edward O.
X  Thorp, Ph.D. of UCLA.  A number of important statistics are maintained for
X  display, and used by the program to implement Thorp's "Complete Point System"
X  (high-low system).
X
X  Beginners can learn a basic strategy which doesn't require counting.  The
X  best strategy employs a simple card counting technique which can be used to
X  distinguish favorable situations.  Avid players can learn to compute Thorp's
X  high-low index, which takes the number of unseen cards into account.
X
X  The index is used by the program to suggest a bet, indicate when you should
X  buy insurance, and whether you should stand or hit, etc.  You can test the
X  strategy using a slider to control "autoplay mode".  Pressing the message
X  button below the playing area provides hints; the current count, index
X  and strategy table are revealed.
X
Xeric.
Xerich@FreeBSD.org
END-of-xblackjack/pkg-descr
echo x - xblackjack/pkg-plist
sed 's/^X//' >xblackjack/pkg-plist << 'END-of-xblackjack/pkg-plist'
Xbin/xblackjack
Xlib/X11/app-defaults/XBlackjack
Xlib/X11/doc/html/xblackjack.1.html
END-of-xblackjack/pkg-plist
exit
--- xblackjack.shar ends here ---
>Release-Note:
>Audit-Trail:

From: Christian Weisgerber <naddy@mips.inka.de>
To: tdv94ped@cs.umu.se
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/44768: [Port Fix]: games/xblackjack-2.2
Date: Tue, 12 Nov 2002 01:29:23 +0100 (CET)

 Please send as a diff against the port in the tree.
 
 -- 
 Christian "naddy" Weisgerber                          naddy@mips.inka.de
State-Changed-From-To: open->feedback 
State-Changed-By: ijliao 
State-Changed-When: Fri Jan 3 04:08:15 PST 2003 
State-Changed-Why:  
plz submit again in "diff" format, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44768 

From: Tilman Linneweh <arved@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, tdv94ped@cs.umu.se
Cc:  
Subject: Re: ports/44768: [Port Fix]: games/xblackjack-2.2
Date: Wed, 8 Jan 2003 16:17:05 +0100

 Also the Fix, does not seem to be complete:
 
 cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro       -I/usr/X11R6/include    
 -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DVERSION="\"2.2\""  -c Table.c
 Table.c:133: `_XmManagerEnter' undeclared here (not in a function)
 Table.c:133: initializer element is not constant
 Table.c:133: (near initialization for `actionsList[0].proc')
 Table.c:133: initializer element is not constant
 Table.c:133: (near initialization for `actionsList[0]')
 [..]

From: Paul Everlund <tdv94ped@cs.umu.se>
To: Tilman Linneweh <arved@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/44768: [Port Fix]: games/xblackjack-2.2
Date: Wed, 8 Jan 2003 16:42:21 +0100 (MET)

 On Wed, 8 Jan 2003, Tilman Linneweh wrote:
 
 > Also the Fix, does not seem to be complete:
 >
 > cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro       -I/usr/X11R6/include
 > -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DVERSION="\"2.2\""  -c Table.c
 > Table.c:133: `_XmManagerEnter' undeclared here (not in a function)
 > Table.c:133: initializer element is not constant
 > Table.c:133: (near initialization for `actionsList[0].proc')
 > Table.c:133: initializer element is not constant
 > Table.c:133: (near initialization for `actionsList[0]')
 > [..]
 
 Very strange. I did too try to compile it just after I got your mail,
 with the same result as you got. I know though that the fix did work a
 long time ago, as I did compile it and played the game. No one did
 however commit it and much later I saw the port marked as broken due
 to an OpenMotif upgrade.
 
 Maybe OpenMotif has changed and hence it does not work? Anyway I'll
 take a look at it once more (and hopefully someone will commit it
 before it renders useless due to the fact that other applications are
 updated :-)
 
 Best regards,
 Paul
 

From: Paul Everlund <tdv94ped@cs.umu.se>
To: Tilman Linneweh <arved@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/44768: [Port Fix]: games/xblackjack-2.2
Date: Mon, 13 Jan 2003 17:09:40 +0100 (MET)

 On Wed, 8 Jan 2003, Tilman Linneweh wrote:
 
 > Also the Fix, does not seem to be complete:
 >
 > cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro       -I/usr/X11R6/include
 > -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DVERSION="\"2.2\""  -c Table.c
 > Table.c:133: `_XmManagerEnter' undeclared here (not in a function)
 > Table.c:133: initializer element is not constant
 > Table.c:133: (near initialization for `actionsList[0].proc')
 > Table.c:133: initializer element is not constant
 > Table.c:133: (near initialization for `actionsList[0]')
 > [..]
 
 Please apply this diff to the Makefile...
 
 freebsd# diff -ruNd Makefile.orig Makefile
 --- Makefile.orig       Mon Jan 13 17:05:15 2003
 +++ Makefile    Mon Jan 13 17:05:27 2003
 @@ -14,7 +14,7 @@
 
  MAINTAINER=    ports@FreeBSD.org
 
 -USE_MOTIF=     yes
 +LIB_DEPENDS+=  Xm.1:${PORTSDIR}/x11-toolkits/lesstif
  USE_IMAKE=     yes
  MAN1=          xblackjack.1
 
 Best regards,
 Paul
 

From: Mark Linimon <linimon@lonesome.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/44768: [Port Fix]: games/xblackjack-2.2
Date: Fri, 4 Apr 2003 18:27:55 -0600

 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@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
 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: anholt 
State-Changed-When: Tue May 13 11:58:29 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44768 
>Unformatted:
