From nobody@FreeBSD.org  Wed Feb  2 19:12:06 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A15EE106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  2 Feb 2011 19:12:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 838E18FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  2 Feb 2011 19:12:06 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p12JC6fN067836
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 2 Feb 2011 19:12:06 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p12JC6As067835;
	Wed, 2 Feb 2011 19:12:06 GMT
	(envelope-from nobody)
Message-Id: <201102021912.p12JC6As067835@red.freebsd.org>
Date: Wed, 2 Feb 2011 19:12:06 GMT
From: kilian <kilian.klimek@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] fix games/xpipeman on amd64
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         154470
>Category:       ports
>Synopsis:       [patch] fix games/xpipeman on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 02 19:20:09 UTC 2011
>Closed-Date:    Thu Feb 03 00:52:29 UTC 2011
>Last-Modified:  Thu Feb  3 01:00:20 UTC 2011
>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:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Feb 3 00:52:28 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154470: commit references a PR
Date: Thu,  3 Feb 2011 00:52:16 +0000 (UTC)

 miwi        2011-02-03 00:52:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/xpipeman       Makefile distinfo 
     games/xpipeman/files patch-aa patch-ab 
   Added files:
     games/xpipeman/files patch-ac 
   Log:
   - Fix build on amd64
   - Drop MD5
   
   PR:             154470
   Submitted by:   kilian <kilian.klimek@googlemail.com>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.26      +2 -2      ports/games/xpipeman/Makefile
   1.5       +0 -1      ports/games/xpipeman/distinfo
   1.3       +31 -53    ports/games/xpipeman/files/patch-aa
   1.5       +1 -1      ports/games/xpipeman/files/patch-ab
   1.1       +37 -0     ports/games/xpipeman/files/patch-ac (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
