Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jan 2003 13:34:00 +0100 (MET)
From:      Paul Everlund <tdv94ped@cs.umu.se>
To:        Ying-Chieh Liao <ijliao@FreeBSD.org>
Cc:        freebsd-ports@FreeBSD.org
Subject:   Re: ports/44768: [Port Fix]: games/xblackjack-2.2
Message-ID:  <Pine.GSO.4.44.0301031329070.26671-100000@kvist.cs.umu.se>
In-Reply-To: <200301031208.h03C8YXP094876@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 3 Jan 2003, Ying-Chieh Liao wrote:

> Synopsis: [Port Fix]: games/xblackjack-2.2
>
> 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

Hard to make diffs of non-existing files in the port tree...
But here we go (please also read my note at the end):

freebsd# diff -ruNd pkg-plist.orig pkg-plist
--- pkg-plist.orig      Fri Jan  3 13:17:18 2003
+++ pkg-plist   Fri Jan  3 13:14:23 2003
@@ -1,2 +1,3 @@
 bin/xblackjack
 lib/X11/app-defaults/XBlackjack
+lib/X11/doc/html/xblackjack.1.html


Remove files/patch-aa


Add non-existing new file: files/patch-.::Draw.c
--- Draw.c.orig Wed Oct 30 22:16:05 2002
+++ Draw.c      Wed Oct 30 22:34:05 2002
@@ -84,7 +84,7 @@
 #include <Xol/OpenLook.h>
 #else
 #include <X11/Xutil.h>
-#include <X11/Xm/Xm.h>
+#include <Xm/Xm.h>
 #endif
 #include "Assert.h"
 #include "Bitmaps.h"


Add non-existing new file: files/patch-.::Imakefile
--- Imakefile.orig      Wed Oct 30 22:39:10 2002
+++ Imakefile   Wed Oct 30 22:39:40 2002
@@ -54,7 +54,7 @@
 /*
  *  You may need to remove -lbsd.
  */
-  EXTRA_LIBRARIES = -lXm $(DEPLIBS) -lbsd
+  EXTRA_LIBRARIES = ${MOTIFLIB} -lXt -lXmu -lXext -lX11
 #endif

 /*


Add non-existing new file: files/patch-.::Strategy.c
--- Strategy.c.orig     Wed Oct 30 22:23:48 2002
+++ Strategy.c  Wed Oct 30 22:24:07 2002
@@ -95,8 +95,8 @@
 #include <Xol/OpenLook.h>
 #include <Xol/StaticText.h>
 #else
-#include <X11/Xm/Xm.h>
-#include <X11/Xm/Label.h>
+#include <Xm/Xm.h>
+#include <Xm/Label.h>
 #include "Table.h"
 #endif
 #include "Assert.h"


Add non-existing new file: files/patch-.::Table.c
--- Table.c.orig        Wed Oct 30 22:35:52 2002
+++ Table.c     Wed Oct 30 23:11:30 2002
@@ -229,7 +229,7 @@
     /* always_install_accelerators */  False,
 #if XmVersion > 1000
     /* geo_matrix_create */    NULL,
-    /* focus_moved_proc */     XtInheritFocusMovedProc,
+    /* focus_moved_proc */     /*XtInheritFocusMovedProc,*/
 #endif
     /* extension       */  NULL,
   },
@@ -967,7 +967,7 @@

 /*    XtMoveWidget(w, rx, ry);*/
 #if 1
-    _XmMoveObject((RectObj) w, rx, ry);
+    _XmMoveObject( w, rx, ry);
 #else
     _XmMoveObject( w, rx, ry);
 #endif
@@ -1020,7 +1020,7 @@
                w, nw, nh,
                w->core.border_width);
 #endif
-           _XmResizeObject((RectObj) managed->locs[i].w, nw, nh,
+           _XmResizeObject( managed->locs[i].w, nw, nh,
                            managed->locs[i].w->core.border_width);
        }


Observe that this fix was made long ago before pat marked the port
as broken due to a Motif upgrade.


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.GSO.4.44.0301031329070.26671-100000>