From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 4 16:30:17 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D65937B401 for ; Fri, 4 Apr 2003 16:30:17 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2307A43F75 for ; Fri, 4 Apr 2003 16:30:17 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h350UGUp002089 for ; Fri, 4 Apr 2003 16:30:16 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h350UGg6002088; Fri, 4 Apr 2003 16:30:16 -0800 (PST) Date: Fri, 4 Apr 2003 16:30:16 -0800 (PST) Message-Id: <200304050030.h350UGg6002088@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Mark Linimon Subject: Re: ports/44768: [Port Fix]: games/xblackjack-2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Mark Linimon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2003 00:30:17 -0000 The following reply was made to PR ports/44768; it has been noted by GNATS. From: Mark Linimon 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 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 X #else X #include X-#include X+#include 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 X #include X #else X-#include X-#include X+#include X+#include 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