Bug 175592 - games/xataxx: Update MASTER_SITES
Summary: games/xataxx: Update MASTER_SITES
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-25 21:10 UTC by tkato432
Modified: 2013-02-04 14:30 UTC (History)
0 users

See Also:


Attachments
file.diff (7.06 KB, patch)
2013-01-25 21:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-01-25 21:10:07 UTC
- Update MASTER_SITES
- Fix build with clang
- Add MAKE_JOBS_SAFE
- Reformat pkg-descr

New file:
files/patch-bits.c
files/patch-board.c
files/patch-demo.c
files/patch-display.c
files/patch-main.c
files/patch-nubot.c
files/patch-parse.c
files/patch-zot.c

Remove file:
files/pach-ab
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-25 21:12:42 UTC
Responsible Changed
From-To: freebsd-ports-bugs->araujo

araujo@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-02-04 14:27:01 UTC
Author: miwi
Date: Mon Feb  4 14:26:51 2013
New Revision: 311619
URL: http://svnweb.freebsd.org/changeset/ports/311619

Log:
  - Update MASTER_SITES
  - Fix build with clang
  - Add MAKE_JOBS_SAFE
  - Reformat pkg-descr
  
  PR:		175592
  Submitted by:	Ports Fury

Added:
  head/games/xataxx/files/patch-bits.c   (contents, props changed)
  head/games/xataxx/files/patch-board.c   (contents, props changed)
  head/games/xataxx/files/patch-demo.c   (contents, props changed)
  head/games/xataxx/files/patch-display.c   (contents, props changed)
  head/games/xataxx/files/patch-main.c   (contents, props changed)
  head/games/xataxx/files/patch-nubot.c   (contents, props changed)
  head/games/xataxx/files/patch-parse.c   (contents, props changed)
  head/games/xataxx/files/patch-zot.c   (contents, props changed)
Deleted:
  head/games/xataxx/files/patch-ab
Modified:
  head/games/xataxx/Makefile   (contents, props changed)
  head/games/xataxx/pkg-descr   (contents, props changed)

Modified: head/games/xataxx/Makefile
==============================================================================
--- head/games/xataxx/Makefile	Mon Feb  4 14:25:07 2013	(r311618)
+++ head/games/xataxx/Makefile	Mon Feb  4 14:26:51 2013	(r311619)
@@ -1,30 +1,33 @@
-# New ports collection makefile for:	xataxx
-# Date created:				4 July 1998
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	xataxx
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+MASTER_SITES=	XCONTRIB/../R5contrib
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Strategy game of position and movement for X Window System
 
-USE_IMAKE=	yes
+OPTIONS_DEFINE=	DOCS
+
 USE_XORG=	x11 xext
+USE_IMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
 MAN6=		xataxx.6
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/xataxx
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xataxx
-	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/xataxx
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in README TODO
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 .endif
 
 .include <bsd.port.mk>

Added: head/games/xataxx/files/patch-bits.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-bits.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,22 @@
+--- bits.c.orig
++++ bits.c
+@@ -1,7 +1,10 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <math.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include "struct.h"
+@@ -16,7 +19,7 @@
+ #define NFDSHIFT 5				/* Shift based on above */
+ #ifndef howmany
+ #define	howmany(x, y)	(((x)+((y)-1))/(y))
+-#endif howmany
++#endif
+ 
+ #define	NBBY	8		/* number of bits in a byte */
+ 

Added: head/games/xataxx/files/patch-board.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-board.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,16 @@
+--- board.c.orig
++++ board.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include "struct.h"
+ 
+@@ -461,7 +462,7 @@
+       }
+     }
+   if (best_count==-1)
+-    return;
++    return(0);
+   move_piece(best.ox,best.oy,best.nx,best.ny,player);
+ }
+ 

Added: head/games/xataxx/files/patch-demo.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-demo.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,8 @@
+--- demo.c.orig
++++ demo.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ #include "struct.h"
+ 

Added: head/games/xataxx/files/patch-display.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-display.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,27 @@
+--- display.c.orig
++++ display.c
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <math.h>
+@@ -145,7 +147,7 @@
+   int occ,x,y;
+ 
+   if (currdpy != dpy && !botmode)
+-    return;
++    return(0);
+   wipemap(currdpy, currbamp, currgc, currscr, currwin);
+   for (y=0;y!=ysize;y++)
+     for (x=0;x!=xsize;x++)
+@@ -386,7 +388,7 @@
+       XFlush(currdpy);
+     }
+     XNextEvent(dpy,&event);
+-    return;
++    return(0);
+   }
+ }
+ 

Added: head/games/xataxx/files/patch-main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-main.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,19 @@
+--- main.c.orig
++++ main.c
+@@ -1,4 +1,7 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include <X11/Xlib.h>
+ #include <math.h>
+ #include "struct.h"
+@@ -160,7 +163,7 @@
+ int x;
+ {     
+   int z1, z2, z3, z4, z=0;
+-  char nn[6];
++  static char nn[6];
+ 
+   z1 = (int) (x)/1000;
+   z2 = (int) (x)/100-(10*z1);

Added: head/games/xataxx/files/patch-nubot.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-nubot.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,27 @@
+--- nubot.c.orig
++++ nubot.c
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <strings.h>
+ #include <X11/Xlib.h>
+ #include "struct.h"
+ 
+@@ -172,7 +174,7 @@
+ 
+     list_moves(player, board, movel);
+ 
+-    if (movel[0].ox==(-1)) return; /* there are no legal moves */
++    if (movel[0].ox==(-1)) return(0); /* there are no legal moves */
+ 
+     if (botlevel==0) {
+ 	for (ix=0; movel[ix].ox!=(-1); ix++);
+@@ -180,7 +182,7 @@
+ 	best = &(movel[ix]);
+ 	
+ 	move_piece(best->ox,best->oy,best->nx,best->ny,player);
+-	return;
++	return(0);
+     };
+     
+     for (ix=0; movel[ix].ox!=(-1); ix++) {

Added: head/games/xataxx/files/patch-parse.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-parse.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,9 @@
+--- parse.c.orig
++++ parse.c
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <strings.h>
+ #include "struct.h"
+ 

Added: head/games/xataxx/files/patch-zot.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xataxx/files/patch-zot.c	Mon Feb  4 14:26:51 2013	(r311619)
@@ -0,0 +1,11 @@
+--- zot.c.orig
++++ zot.c
+@@ -23,7 +23,7 @@
+ 	GC bgc;
+ 
+ 	if (!wflump)
+-		return;
++		return(0);
+ 	zot(dx, dy, cmaps, cdpy, cscr, cgc, cwin, cmap);
+ }
+ 

Modified: head/games/xataxx/pkg-descr
==============================================================================
--- head/games/xataxx/pkg-descr	Mon Feb  4 14:25:07 2013	(r311618)
+++ head/games/xataxx/pkg-descr	Mon Feb  4 14:26:51 2013	(r311619)
@@ -1,4 +1,3 @@
-XAtaxx is a strategy game based on Ataxx, a popular arcade
-video  game.   It is a game of position and movement.  The
-object is to have the most pieces of  your  color  on  the
-board at the end of the game.
+XAtaxx is a strategy game based on Ataxx, a popular arcade video game.
+It is a game of position and movement. The object is to have the most
+pieces of your color on the board at the end of the game.
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2013-02-04 14:27:07 UTC
Responsible Changed
From-To: araujo->miwi

I'll take it.
Comment 4 Martin Wilke freebsd_committer freebsd_triage 2013-02-04 14:27:15 UTC
State Changed
From-To: open->closed

Committed. Thanks!