From owner-svn-ports-all@FreeBSD.ORG  Mon May 27 17:49:45 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8C7BC295;
 Mon, 27 May 2013 17:49:45 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6583F121;
 Mon, 27 May 2013 17:49:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RHnikV092289;
 Mon, 27 May 2013 17:49:44 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RHniCV092287;
 Mon, 27 May 2013 17:49:44 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201305271749.r4RHniCV092287@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 27 May 2013 17:49:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319277 - in head/games/xmille: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 17:49:45 -0000

Author: antoine
Date: Mon May 27 17:49:44 2013
New Revision: 319277
URL: http://svnweb.freebsd.org/changeset/ports/319277

Log:
  - Randomize starting player [1]
  - Trim Makefile header
  - Unbreak with clang using -Wno-error=return-type  (this is early K&R code)
  - Respect PREFIX
  
  PR:		ports/171792 [1]
  Submitted by:	David Wolfskill [1]
  Approved by:	eadler (mentor)

Modified:
  head/games/xmille/Makefile
  head/games/xmille/files/patch-mille.c

Modified: head/games/xmille/Makefile
==============================================================================
--- head/games/xmille/Makefile	Mon May 27 17:18:29 2013	(r319276)
+++ head/games/xmille/Makefile	Mon May 27 17:49:44 2013	(r319277)
@@ -1,15 +1,11 @@
-# New ports collection makefile for:    xmille
-# Date created:         30 Dec 1994
-# Whom:                 swallace
-#
+# Created by: swallace
 # $FreeBSD$
-#
 
 PORTNAME=	xmille
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITES=	XCONTRIB
 MASTER_SITE_SUBDIR=	games
 DISTNAME=	${PORTNAME}
 
@@ -21,10 +17,16 @@ WRKSRC=		${WRKDIR}/Mille
 USE_IMAKE=	yes
 USE_XORG=	x11 xext
 MAN1=		xmille.1
+MANCOMPRESSED=	no
 PLIST_FILES=	bin/xmille
 MAKE_JOBS_UNSAFE=	yes
+CFLAGS+=	-Wno-error=return-type
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.[ao]' -delete
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xmille ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xmille.man ${MANPREFIX}/man/man1/xmille.1
+
 .include <bsd.port.mk>

Modified: head/games/xmille/files/patch-mille.c
==============================================================================
--- head/games/xmille/files/patch-mille.c	Mon May 27 17:18:29 2013	(r319276)
+++ head/games/xmille/files/patch-mille.c	Mon May 27 17:49:44 2013	(r319277)
@@ -1,5 +1,5 @@
---- mille.c.orig	Thu Mar 28 14:29:31 1996
-+++ mille.c	Fri Jun 15 02:27:49 2007
+--- ./mille.c.orig	1996-03-28 06:29:31.000000000 +0100
++++ ./mille.c	2013-05-26 18:05:50.000000000 +0200
 @@ -1,16 +1,17 @@
  # include	"mille.h"
  # include	<signal.h>
@@ -21,6 +21,33 @@
  
  main(ac, av)
  reg int		ac;
+@@ -49,8 +50,6 @@
+ 		/* NOTREACHED */
+ 	}
+ 	setbuf(stdout, _sobuf);
+-	Play = PLAYER;
+-	init_ui ();
+ # ifndef PROF
+ #ifdef sun
+ 	srandom(getpid());
+@@ -60,6 +59,8 @@
+ # else
+ 	srand(0);
+ # endif
++	Play = random()&01 ? COMP : PLAYER;
++	init_ui();
+ 	signal(SIGINT, rub);
+ 	for (;;) {
+ 		if (!restore || (Player[PLAYER].total >= 5000
+@@ -73,7 +74,7 @@
+ 		}
+ 		do {
+ 			if (!restore)
+-				Handstart = Play = other(Handstart);
++				Handstart = other(Handstart);
+ 			if (!restore || On_exit) {
+ 				shuffle();
+ 				init();
 @@ -123,9 +124,9 @@
   *	Routine to trap rubouts, and make sure they really want to
   * quit.