Date: Wed, 2 Feb 2011 19:12:06 GMT From: kilian <kilian.klimek@googlemail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/154470: [patch] fix games/xpipeman on amd64 Message-ID: <201102021912.p12JC6As067835@red.freebsd.org> Resent-Message-ID: <201102021920.p12JK9YV087120@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154470
>Category: ports
>Synopsis: [patch] fix games/xpipeman on amd64
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 02 19:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: kilian
>Release:
>Organization:
>Environment:
>Description:
games/xpipeman currently is ONLY_FOR_ARCHS=i386. The attached patch fixes the port at least on amd64 (thats the only architecture i can test this on).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -r -u -N xpipeman.orig/Makefile xpipeman/Makefile
--- xpipeman.orig/Makefile 2011-02-02 20:01:28.193551917 +0100
+++ xpipeman/Makefile 2011-02-02 19:54:15.966914453 +0100
@@ -18,7 +18,7 @@
COMMENT= Connect the pipes to stop the leaks
# LP64 issues
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 amd64
USE_IMAKE= yes
USE_XORG= x11 xaw xext xmu xt sm ice
diff -r -u -N xpipeman.orig/files/patch-aa xpipeman/files/patch-aa
--- xpipeman.orig/files/patch-aa 2011-02-02 19:59:48.101998381 +0100
+++ xpipeman/files/patch-aa 2011-02-02 19:35:53.809873824 +0100
@@ -1,53 +1,31 @@
-*** score.c.orig Fri Sep 13 16:32:12 1991
---- score.c Sun Apr 12 12:33:16 1998
-***************
-*** 50,56 ****
- #include <X11/Xaw/Label.h>
- #endif
-
-! #include <X11/Xos.h> /* brings in <sys/file.h> */
- #include <stdio.h>
- #include "xpipeman.h"
-
---- 50,56 ----
- #include <X11/Xaw/Label.h>
- #endif
-
-! #include <sys/file.h>
- #include <stdio.h>
- #include "xpipeman.h"
-
-***************
-*** 64,70 ****
-
- static SCORE scores[MAXSCORES];
-
-! void show_scores(),
- new_high_score(),
- load_scores(),
- write_out_scores();
---- 64,70 ----
-
- static SCORE scores[MAXSCORES];
-
-! static void show_scores(),
- new_high_score(),
- load_scores(),
- write_out_scores();
-***************
-*** 198,204 ****
-
-
- /*ARGSUSED*/
-! static XtCallbackProc
- popdown_callback(w, closure, call_data)
- Widget w;
- caddr_t closure;
---- 198,204 ----
-
-
- /*ARGSUSED*/
-! static void
- popdown_callback(w, closure, call_data)
- Widget w;
- caddr_t closure;
+--- score.c.orig 1991-09-13 22:32:12.000000000 +0200
++++ score.c 2011-02-02 19:34:46.908945354 +0100
+@@ -50,8 +50,9 @@
+ #include <X11/Xaw/Label.h>
+ #endif
+
+-#include <X11/Xos.h> /* brings in <sys/file.h> */
++#include <sys/file.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "xpipeman.h"
+
+ /*----------------------------------------------------------------------*/
+@@ -64,7 +65,7 @@
+
+ static SCORE scores[MAXSCORES];
+
+-void show_scores(),
++static void show_scores(),
+ new_high_score(),
+ load_scores(),
+ write_out_scores();
+@@ -198,7 +199,7 @@
+
+
+ /*ARGSUSED*/
+-static XtCallbackProc
++static void
+ popdown_callback(w, closure, call_data)
+ Widget w;
+ caddr_t closure;
diff -r -u -N xpipeman.orig/files/patch-ab xpipeman/files/patch-ab
--- xpipeman.orig/files/patch-ab 2011-02-02 19:59:48.101998381 +0100
+++ xpipeman/files/patch-ab 2011-02-02 19:58:16.690609783 +0100
@@ -15,7 +15,7 @@
SYS_LIBRARIES = -lm
+ MANSUFFIX = 6
-+ INSTPGMFLAGS = -g games
++ INSTPGMFLAGS = -g games -m 2755
+
all:: xpipeman
diff -r -u -N xpipeman.orig/files/patch-ac xpipeman/files/patch-ac
--- xpipeman.orig/files/patch-ac 1970-01-01 01:00:00.000000000 +0100
+++ xpipeman/files/patch-ac 2011-02-02 19:16:11.601816654 +0100
@@ -0,0 +1,37 @@
+--- main.c.orig 2011-02-02 19:11:34.000000000 +0100
++++ main.c 2011-01-24 17:44:29.000000000 +0100
+@@ -146,16 +146,6 @@
+ {"-scorefile","scorefile",XrmoptionSepArg, NULL },
+ };
+
+-static XtResource application_resources[] = {
+- {"foreground", "Foreground", XtRPixel, sizeof(Pixel),
+- (Cardinal)&fg, XtRString, (caddr_t) "Black"},
+- {"background", "Background", XtRPixel, sizeof(Pixel),
+- (Cardinal)&bg, XtRString, (caddr_t) "White"},
+- {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations),
+- (Cardinal)&translations, XtRString, (caddr_t)translations_str},
+- {"scorefile","Scorefile", XtRString, sizeof(String),
+- (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE},
+-};
+
+ /*----------------------------------------------------------------------*/
+
+@@ -168,6 +158,17 @@
+ Widget quit_command,
+ new_game_command;
+
++XtResource application_resources[] = {
++ {"foreground", "Foreground", XtRPixel, sizeof(Pixel),
++ (Cardinal)&fg, XtRString, (caddr_t) "Black"},
++ {"background", "Background", XtRPixel, sizeof(Pixel),
++ (Cardinal)&bg, XtRString, (caddr_t) "White"},
++ {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations),
++ (Cardinal)&translations, XtRString, (caddr_t)translations_str},
++ {"scorefile","Scorefile", XtRString, sizeof(String),
++ (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE},
++};
++
+ srandom(getpid());
+ current_block = 0;
+ current_callback = NULL;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102021912.p12JC6As067835>