From owner-svn-ports-all@FreeBSD.ORG  Thu May 30 11:45:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1EA25530;
 Thu, 30 May 2013 11:45:15 +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 002557CF;
 Thu, 30 May 2013 11:45:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4UBjESN058391;
 Thu, 30 May 2013 11:45:14 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4UBjEtq058388;
 Thu, 30 May 2013 11:45:14 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201305301145.r4UBjEtq058388@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 30 May 2013 11:45:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319414 - in head/games/seabattle: . 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: Thu, 30 May 2013 11:45:15 -0000

Author: antoine
Date: Thu May 30 11:45:14 2013
New Revision: 319414
URL: http://svnweb.freebsd.org/changeset/ports/319414

Log:
  - Unbreak with clang
  - Use PORTDOCS, PORT_OPTIONS, DATADIR
  - Trim Makefile header
  
  Approved by:	miwi (mentor)

Added:
  head/games/seabattle/files/patch-batt.c   (contents, props changed)
Modified:
  head/games/seabattle/Makefile
  head/games/seabattle/pkg-plist

Modified: head/games/seabattle/Makefile
==============================================================================
--- head/games/seabattle/Makefile	Thu May 30 11:28:53 2013	(r319413)
+++ head/games/seabattle/Makefile	Thu May 30 11:45:14 2013	(r319414)
@@ -1,28 +1,28 @@
-# New ports collection makefile for:	seabattle
-# Date created:				6 June 1997
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	seabattle
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	SUNSITE \
 		http://www.deater.net/weave/vmwprod/
 MASTER_SITE_SUBDIR=	games/strategy
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A curses based battleship type game
+COMMENT=	Curses based battleship type game
+
+PORTDOCS=	readme.txt
+
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/seabattle ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/seabattle
-	${INSTALL_DATA} ${WRKSRC}/*.au ${PREFIX}/share/seabattle
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/seabattle
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/seabattle
+	${INSTALL_DATA} ${WRKSRC}/*.au ${DATADIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Added: head/games/seabattle/files/patch-batt.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/seabattle/files/patch-batt.c	Thu May 30 11:45:14 2013	(r319414)
@@ -0,0 +1,11 @@
+--- ./batt.c.orig	1997-05-13 15:45:51.000000000 +0000
++++ ./batt.c	2013-05-28 08:46:50.000000000 +0000
+@@ -13,7 +13,7 @@
+ int salvo_play=0;                                 /* paramaters uncluttered*/
+ int first_time=0;
+ 
+-int main(int argc, char *argv)
++int main(int argc, char **argv)
+ {  
+    MAIN_THINGY *main_thing;
+    

Modified: head/games/seabattle/pkg-plist
==============================================================================
--- head/games/seabattle/pkg-plist	Thu May 30 11:28:53 2013	(r319413)
+++ head/games/seabattle/pkg-plist	Thu May 30 11:45:14 2013	(r319414)
@@ -1,10 +1,8 @@
 bin/seabattle
-%%PORTDOCS%%share/doc/seabattle/readme.txt
-share/seabattle/hit1.au
-share/seabattle/hit2.au
-share/seabattle/miss1.au
-share/seabattle/miss2.au
-share/seabattle/opening.au
-share/seabattle/sunkit.au
-@dirrm share/seabattle
-%%PORTDOCS%%@dirrm share/doc/seabattle
+%%DATADIR%%/hit1.au
+%%DATADIR%%/hit2.au
+%%DATADIR%%/miss1.au
+%%DATADIR%%/miss2.au
+%%DATADIR%%/opening.au
+%%DATADIR%%/sunkit.au
+@dirrm %%DATADIR%%